lint

eslint.config.mjs

@@ -24,6 +24,7 @@ export default tseslint.config(
   ...tseslint.configs.strict,
   {
     plugins: {
+      '@typescript-eslint': tseslint.plugin,
       'unused-imports': unusedImports,
       import: importPlugin,
       'sort-exports': sortExports,
@@ -74,6 +75,15 @@ export default tseslint.config(
           sortExportKindFirst: 'value',
         },
       ],
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          argsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+        },
+      ],
     },
   },
 )

package/src/internal/goparam.ts

@@ -43,6 +43,7 @@ export const verifyMac = async (
   try {
     return await verify(baseParam.toString(), mac, trustedPubkey)
   } catch (e) {
+    console.error(e)
     return false
   }
 }

package/src/internal/handleCallback.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import { parse as parseCookie, serialize as serializeCookie } from 'cookie'
 
 import { AUTH_PUBKEY } from './const'
@@ -207,8 +209,8 @@ export const handleCallback = async (
 
   if (
     !(await verify(
-      param.get('authdata')!,
-      param.get('signature')!,
+      param.get('authdata') as string,
+      param.get('signature') as string,
       authPubkey,
     )) ||
     !(await verify(param.get('iv')!, param.get('signatureIv')!, authPubkey))

package/src/internal/tokengen.ts

@@ -36,6 +36,7 @@ export const verifyToken = async (
   try {
     decrypted = await decrypt(token, key, iv)
   } catch (e) {
+    console.error(e)
     return [false, 'invalid token']
   }
   const tokenData = atob(decrypted)

package/src/userinfo.ts

@@ -116,6 +116,7 @@ const getUserInfo = async (
 
   if (await checkLoggedIn(request, publicKey)) {
     // checkLoggedIn で Cookie があることを前提としている
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const cookie = parseCookie(request.headers.get('Cookie')!)
 
     const postData = {

package/src/validate.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'

package/test/internal/cookieUtil.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 // Memo: Cloudflare Types で型推論されてしまうが、テスト時は jsdom なので Web Standard に従う
 const cookieParser = (cookieString: string) => {
   const mp = new Map<string, [string, Map<string, string>]>()

package/test/internal/goparam.test.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import { describe, expect, it } from 'vitest'
 
 import { generateGoParam, verifyMac } from '../../src/internal/goparam'

package/test/internal/handleCallback.test.ts

@@ -1,4 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
+
 import { describe, expect, it, vi } from 'vitest'
 
 import { handleCallback } from '../../src/internal/handleCallback'
@@ -12,7 +13,6 @@ import {
 import { cookieParser, removesCookie } from './cookieUtil'
 
 vi.mock('../../src/internal/const', async importOriginal => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const mod = await importOriginal<typeof import('../../src/internal/const')>()
   return {
     ...mod,

package/test/internal/handleLogin.test.ts

@@ -1,4 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
+
 import type { MockInstance } from 'vitest'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 

package/test/internal/handleLogout.test.ts

@@ -1,4 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import { describe, expect, it } from 'vitest'
 
 import { handleLogout } from '../../src/internal/handleLogout'

package/test/internal/handleMe.test.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'

package/test/middleware.test.ts

@@ -1,4 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'

package/test/userinfo.test.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'

package/test/validate.test.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'
@@ -12,7 +11,6 @@ dayjs.extend(timezone)
 dayjs.tz.setDefault('Asia/Tokyo')
 
 vi.mock('../src/internal', async importOriginal => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const mod = await importOriginal<typeof import('../src/internal')>()
   return {
     ...mod,

webapp/app/routes/cb.tsx

@@ -75,7 +75,7 @@ export const loader: LoaderFunction = async ({ context, request }) => {
       },
     )
     isMember = (checkIsOrgMemberRes.status as number) === 204
-  } catch (e) {
+  } catch (_) {
     isMember = false
   }
   session.set('id', String(user.id))

webapp/app/routes/continue/route.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import type {
   ActionFunction,
   LoaderFunction,

webapp/app/routes/go.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import type { LoaderFunction, ActionFunction } from '@remix-run/cloudflare'
 import { redirect } from '@remix-run/cloudflare'
 
@@ -54,7 +56,7 @@ export const loader: LoaderFunction = async ({ context, request }) => {
   let theirPubkey: CryptoKey
   try {
     theirPubkey = await importKey(registeredData.pubkey, 'publicKey')
-  } catch (e) {
+  } catch (_) {
     throw new Response('invalid pubkey', { status: 400 })
   }
   if (!theirPubkey.usages.includes('verify'))

webapp/app/routes/user.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
 import type { ActionFunction, LoaderFunction } from '@remix-run/cloudflare'
 
 import {

webapp/eslint.config.mjs

@@ -15,8 +15,6 @@ export default tseslint.config(
   },
   eslint.configs.recommended,
   ...rootConfig,
-  react.configs.flat.recommended,
-  react.configs.flat['jsx-runtime'],
   {
     languageOptions: {
       globals: {
@@ -48,6 +46,8 @@ export default tseslint.config(
       ],
       'import/resolver': { typescript: {} },
     },
+    ...react.configs.flat.recommended,
+    ...react.configs.flat['jsx-runtime'],
   },
   {
     // typescript

worker/src/index.ts

@@ -24,8 +24,7 @@ export default {
   async fetch(
     request: Request,
     env: Env,
-    // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
-    ctx: ExecutionContext,
+    _ctx: ExecutionContext,
   ): Promise<Response> {
     for (const key of ['PRIVKEY', 'AUTH_DOMAIN', 'AUTH_PUBKEY'] as const) {
       if (!env[key]) {

worker/test/index.test.ts

@@ -1,4 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
+
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'