From 8092ba09038d63b1fc5d7c752f6796ab80f30b74 Mon Sep 17 00:00:00 2001 From: Yasuaki Uechi Date: Wed, 9 Mar 2022 15:16:54 +0900 Subject: [PATCH] fix: type errors --- api/list/domain/[query].ts | 8 ++++---- api/services/appstore/[query].ts | 8 ++++---- api/services/archlinux/[query].ts | 8 ++++---- api/services/debian/[query].ts | 8 ++++---- api/services/dns/[query].ts | 8 ++++---- api/services/domain/[query].ts | 8 ++++---- api/services/existence/[query].ts | 4 ++-- api/services/gitlab/[query].ts | 8 ++++---- api/services/jsorg/[query].ts | 4 ++-- api/services/launchpad/[query].ts | 8 ++++---- api/services/npm-org/[query].ts | 8 ++++---- api/services/npm/[query].ts | 2 +- api/services/nta/[query].ts | 2 +- api/services/playstore/[query].ts | 8 ++++---- api/services/slack/[query].ts | 8 ++++---- api/services/spectrum/[query].ts | 8 ++++---- api/services/subreddit/[query].ts | 13 +++++-------- api/services/twitter/[query].ts | 8 ++++---- src/setupTests.ts | 8 ++++++-- src/util/analytics.ts | 2 +- 20 files changed, 70 insertions(+), 69 deletions(-) diff --git a/api/list/domain/[query].ts b/api/list/domain/[query].ts index 87f5de2..b4b9f35 100644 --- a/api/list/domain/[query].ts +++ b/api/list/domain/[query].ts @@ -1,11 +1,11 @@ -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; import assert from 'assert'; import fetch from 'cross-fetch'; import { send, sendError } from '../../../util/http'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -27,7 +27,7 @@ export default async function handler( } ).then((res) => res.json()); send(res, response); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/appstore/[query].ts b/api/services/appstore/[query].ts index 44f184b..b9a2f80 100644 --- a/api/services/appstore/[query].ts +++ b/api/services/appstore/[query].ts @@ -1,5 +1,5 @@ import { send, sendError, fetch } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; interface App { trackId: string; @@ -15,8 +15,8 @@ interface AppStoreResponse { } export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query, country } = req.query; @@ -43,7 +43,7 @@ export default async function handler( viewURL: app.trackViewUrl, })); send(res, { result: apps }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/archlinux/[query].ts b/api/services/archlinux/[query].ts index aa7759b..c9db448 100644 --- a/api/services/archlinux/[query].ts +++ b/api/services/archlinux/[query].ts @@ -1,9 +1,9 @@ import { send, sendError, fetch } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -22,7 +22,7 @@ export default async function handler( ).then((res) => res.text()); const availability = !/
{ const { query } = req.query; @@ -23,7 +23,7 @@ export default async function handler( const body = await response.text(); const availability = body.includes('No such package'); send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/dns/[query].ts b/api/services/dns/[query].ts index 32c7af8..03f3a54 100644 --- a/api/services/dns/[query].ts +++ b/api/services/dns/[query].ts @@ -1,6 +1,6 @@ import dns from 'dns'; import { send, sendError } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; function resolvePromise(hostname: string): Promise { return new Promise((resolve, reject) => { @@ -12,8 +12,8 @@ function resolvePromise(hostname: string): Promise { } export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -25,7 +25,7 @@ export default async function handler( const response = await resolvePromise(query); const availability = response && response.length > 0 ? false : true; send(res, { availability }); - } catch (err) { + } catch (err: any) { if (err.code === 'ENODATA' || err.code === 'ENOTFOUND') { return send(res, { availability: true }); } diff --git a/api/services/domain/[query].ts b/api/services/domain/[query].ts index 59204db..6d078a8 100644 --- a/api/services/domain/[query].ts +++ b/api/services/domain/[query].ts @@ -1,11 +1,11 @@ -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; import 'cross-fetch'; import whois from 'whois-json'; import { send, sendError } from '../../../util/http'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -17,7 +17,7 @@ export default async function handler( const response = await whois(query, { follow: 3, verbose: true }); const availability = response[0].data.domainName ? false : true; send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/existence/[query].ts b/api/services/existence/[query].ts index 811753c..62ce2ac 100644 --- a/api/services/existence/[query].ts +++ b/api/services/existence/[query].ts @@ -20,10 +20,10 @@ export default async function handler( const response = await fetch(`https://${query}`); const availability = response.status === 404; send(res, { availability }); - } catch (err) { + } catch (err: any) { if ((err as any).code === 'ENOTFOUND') { return send(res, { availability: true }); } - sendError(res, err as any); + sendError(res, err); } } diff --git a/api/services/gitlab/[query].ts b/api/services/gitlab/[query].ts index 518b813..459349c 100644 --- a/api/services/gitlab/[query].ts +++ b/api/services/gitlab/[query].ts @@ -1,10 +1,10 @@ -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; import nodeFetch from 'cross-fetch'; import { send, sendError } from '../../../util/http'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -22,7 +22,7 @@ export default async function handler( }); const availability = response.status === 302; send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/jsorg/[query].ts b/api/services/jsorg/[query].ts index f9fa7c6..9ff0610 100644 --- a/api/services/jsorg/[query].ts +++ b/api/services/jsorg/[query].ts @@ -33,7 +33,7 @@ export default async function handler( } else { send(res, { availability: true }); } - } catch (err) { - sendError(res, err as any); + } catch (err: any) { + sendError(res, err); } } diff --git a/api/services/launchpad/[query].ts b/api/services/launchpad/[query].ts index 51c0a73..f9c440c 100644 --- a/api/services/launchpad/[query].ts +++ b/api/services/launchpad/[query].ts @@ -1,9 +1,9 @@ import { send, sendError, fetch } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -24,7 +24,7 @@ export default async function handler( ); const availability = response.status !== 200; send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/npm-org/[query].ts b/api/services/npm-org/[query].ts index 426de9d..08fc387 100644 --- a/api/services/npm-org/[query].ts +++ b/api/services/npm-org/[query].ts @@ -1,10 +1,10 @@ import npmName from 'npm-name'; import { send, sendError } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -15,7 +15,7 @@ export default async function handler( try { const availability = await npmName(`@${query}`); send(res, { availability }); - } catch (err) { + } catch (err: any) { if (err.code === 'ENOTFOUND') { return send(res, { availability: true }); } diff --git a/api/services/npm/[query].ts b/api/services/npm/[query].ts index 60f2088..2e9d66c 100644 --- a/api/services/npm/[query].ts +++ b/api/services/npm/[query].ts @@ -15,7 +15,7 @@ export default async function handler( try { const availability = await npmName(query); send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/nta/[query].ts b/api/services/nta/[query].ts index f8f5264..104c074 100644 --- a/api/services/nta/[query].ts +++ b/api/services/nta/[query].ts @@ -92,7 +92,7 @@ export default async function handler( })) .slice(0, 10) || [], }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/playstore/[query].ts b/api/services/playstore/[query].ts index 445be83..33f6915 100644 --- a/api/services/playstore/[query].ts +++ b/api/services/playstore/[query].ts @@ -1,10 +1,10 @@ -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; import 'cross-fetch'; import { fetch, send, sendError } from '../../../util/http'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -34,7 +34,7 @@ export default async function handler( url: 'https://play.google.com' + entry[9][4][2], })); send(res, { result: apps.slice(0, 10) }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/slack/[query].ts b/api/services/slack/[query].ts index 5599da5..3060ec1 100644 --- a/api/services/slack/[query].ts +++ b/api/services/slack/[query].ts @@ -1,9 +1,9 @@ import { send, sendError, fetch } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -21,7 +21,7 @@ export default async function handler( ); const availability = response.status !== 200; send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/spectrum/[query].ts b/api/services/spectrum/[query].ts index 2c19029..978caaf 100644 --- a/api/services/spectrum/[query].ts +++ b/api/services/spectrum/[query].ts @@ -1,9 +1,9 @@ import { send, sendError, fetch } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -25,7 +25,7 @@ export default async function handler( 'You may be trying to view something that is deleted' ); send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/subreddit/[query].ts b/api/services/subreddit/[query].ts index 706d6ab..1f37873 100644 --- a/api/services/subreddit/[query].ts +++ b/api/services/subreddit/[query].ts @@ -1,9 +1,9 @@ import { send, sendError, fetch } from '../../../util/http'; -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -16,16 +16,13 @@ export default async function handler( } try { - const response = await fetch( - `https://reddit.com/r/${query}`, - 'GET' - ); + const response = await fetch(`https://reddit.com/r/${query}`, 'GET'); const body = await response.text(); const availability = body.includes( 'Sorry, there aren’t any communities on Reddit with that name.' ); send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/api/services/twitter/[query].ts b/api/services/twitter/[query].ts index 48fbbc9..0324319 100644 --- a/api/services/twitter/[query].ts +++ b/api/services/twitter/[query].ts @@ -1,9 +1,9 @@ -import { NowRequest, NowResponse } from '@vercel/node'; +import { VercelRequest, VercelResponse } from '@vercel/node'; import { fetch, send, sendError } from '../../../util/http'; export default async function handler( - req: NowRequest, - res: NowResponse + req: VercelRequest, + res: VercelResponse ): Promise { const { query } = req.query; @@ -22,7 +22,7 @@ export default async function handler( ).then((res) => res.json()); const availability = response.valid; send(res, { availability }); - } catch (err) { + } catch (err: any) { sendError(res, err); } } diff --git a/src/setupTests.ts b/src/setupTests.ts index 1f112c0..171bf6c 100644 --- a/src/setupTests.ts +++ b/src/setupTests.ts @@ -4,7 +4,8 @@ import '@testing-library/jest-dom/extend-expect'; // i18next import { join } from 'path'; import i18n from 'i18next'; -import Backend from 'i18next-node-fs-backend'; +import Backend from 'i18next-chained-backend'; +import NodeFs from 'i18next-node-fs-backend'; import LanguageDetector from 'i18next-browser-languagedetector'; import { initReactI18next } from 'react-i18next'; @@ -14,7 +15,10 @@ i18n .use(initReactI18next) .init({ backend: { - loadPath: join(__dirname, '../public/locales/{{lng}}/{{ns}}.json'), + backends: [NodeFs], + backendOptions: [ + { loadPath: join(__dirname, '../public/locales/{{lng}}/{{ns}}.json') }, + ], }, fallbackLng: 'en', ns: ['translation'], diff --git a/src/util/analytics.ts b/src/util/analytics.ts index c7423db..c14f93c 100644 --- a/src/util/analytics.ts +++ b/src/util/analytics.ts @@ -21,7 +21,7 @@ export function trackEvent({ if (isProduction) { try { umami && umami.trackEvent(value, type); - } catch (err) {} + } catch (err: any) {} } }