@slashnephy/eslint-config 3.0.113 → 3.0.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slashnephy/eslint-config",
-  "version": "3.0.113",
+  "version": "3.0.115",
   "keywords": [
     "eslint",
     "eslintconfig"

package/src/base/javascript.js

@@ -218,24 +218,15 @@ export const javaScript = defineConfig({
     rules: {
         // 不要 import 文を禁止
         'unused-imports/no-unused-imports': 'error',
-        // 不要な変数を禁止
-        'no-unused-vars': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        'unused-imports/no-unused-vars': [
-            'warn',
-            // '_' で始まる変数を許可
-            {
-                vars: 'all',
-                varsIgnorePattern: '^_',
-                args: 'after-used',
-                argsIgnorePattern: '^_',
-            },
-        ],
+        'unused-imports/no-unused-vars': 'off',
     },
 }, {
     name: 'eslint-plugin-promise',
     files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
     extends: [promisePlugin.configs['flat/recommended']],
+    rules: {
+        'promise/always-return': ['error', { ignoreLastCallback: true }],
+    },
 }, {
     name: 'eslint-plugin-xss',
     files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],

package/src/base/javascript.ts

@@ -227,25 +227,16 @@ export const javaScript = defineConfig(
     rules: {
       // 不要 import 文を禁止
       'unused-imports/no-unused-imports': 'error',
-      // 不要な変数を禁止
-      'no-unused-vars': 'off',
-      '@typescript-eslint/no-unused-vars': 'off',
-      'unused-imports/no-unused-vars': [
-        'warn',
-        // '_' で始まる変数を許可
-        {
-          vars: 'all',
-          varsIgnorePattern: '^_',
-          args: 'after-used',
-          argsIgnorePattern: '^_',
-        },
-      ],
+      'unused-imports/no-unused-vars': 'off',
     },
   },
   {
     name: 'eslint-plugin-promise',
     files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
     extends: [promisePlugin.configs['flat/recommended']],
+    rules: {
+      'promise/always-return': ['error', { ignoreLastCallback: true }],
+    },
   },
   {
     name: 'eslint-plugin-xss',

package/src/base/typescript.js

@@ -1,7 +1,7 @@
 import safeTypeScriptPlugin from '@susisu/eslint-plugin-safe-typescript';
-import { defineConfig } from 'eslint/config';
 import { importX } from 'eslint-plugin-import-x';
 import tsdocPlugin from 'eslint-plugin-tsdoc';
+import { defineConfig } from 'eslint/config';
 import tseslint from 'typescript-eslint';
 export const typeScript = defineConfig({
     files: ['**/*.cts'],
@@ -193,7 +193,25 @@ export const typeScript = defineConfig({
         '@typescript-eslint/no-deprecated': 'error',
         // 関数の返り値としての void 以外を禁止
         '@typescript-eslint/no-invalid-void-type': 'error',
+        // 不要な変数を禁止
+        'no-unused-vars': 'off',
+        '@typescript-eslint/no-unused-vars': [
+            'warn', {
+                // '_' で始まる変数を許可
+                args: 'all',
+                argsIgnorePattern: '^_',
+                caughtErrors: 'all',
+                caughtErrorsIgnorePattern: '^_',
+                destructuredArrayIgnorePattern: '^_',
+                varsIgnorePattern: '^_',
+                ignoreRestSiblings: true,
+            },
+        ],
     },
+}, {
+    name: 'typescript-eslint (JavaScript)',
+    files: ['**/*.{js,cjs,mjs,jsx}'],
+    extends: [tseslint.configs.disableTypeChecked],
 }, {
     name: 'eslint-plugin-import-x',
     files: ['**/*.{ts,cts,mts,tsx}'],

package/src/base/typescript.ts

@@ -1,7 +1,7 @@
 import safeTypeScriptPlugin from '@susisu/eslint-plugin-safe-typescript'
-import { defineConfig } from 'eslint/config'
 import { importX } from 'eslint-plugin-import-x'
 import tsdocPlugin from 'eslint-plugin-tsdoc'
+import { defineConfig } from 'eslint/config'
 import tseslint from 'typescript-eslint'
 
 export const typeScript = defineConfig(
@@ -198,8 +198,28 @@ export const typeScript = defineConfig(
       '@typescript-eslint/no-deprecated': 'error',
       // 関数の返り値としての void 以外を禁止
       '@typescript-eslint/no-invalid-void-type': 'error',
+      // 不要な変数を禁止
+      'no-unused-vars': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'warn', {
+        // '_' で始まる変数を許可
+          args: 'all',
+          argsIgnorePattern: '^_',
+          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          ignoreRestSiblings: true,
+        },
+      ],
     },
   },
+  {
+    name: 'typescript-eslint (JavaScript)',
+    files: ['**/*.{js,cjs,mjs,jsx}'],
+    extends: [tseslint.configs.disableTypeChecked],
+  },
+
   {
     name: 'eslint-plugin-import-x',
     files: ['**/*.{ts,cts,mts,tsx}'],

package/src/frameworks/next.js.js

@@ -1,5 +1,6 @@
 import nextPlugin from '@next/eslint-plugin-next';
 import { defineConfig } from 'eslint/config';
+import reactRefreshPlugin from 'eslint-plugin-react-refresh';
 export const nextJs = defineConfig({
     name: '@next/eslint-plugin-next',
     files: [
@@ -14,7 +15,15 @@ export const nextJs = defineConfig({
     ],
     rules: {
         'import-x/no-default-export': 'off',
-        'react-refresh/only-export-components': 'off',
     },
     ignores: ['**/.next/**'],
+}, {
+    name: 'eslint-plugin-react-refresh',
+    files: [
+        // Pages Router
+        '**/pages/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
+        // App Router
+        '**/app/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
+    ],
+    extends: [reactRefreshPlugin.configs.next],
 });

package/src/frameworks/next.js.ts

@@ -1,21 +1,33 @@
 import nextPlugin from '@next/eslint-plugin-next'
 import { defineConfig } from 'eslint/config'
+import reactRefreshPlugin from 'eslint-plugin-react-refresh'
 
-export const nextJs = defineConfig({
-  name: '@next/eslint-plugin-next',
-  files: [
+export const nextJs = defineConfig(
+  {
+    name: '@next/eslint-plugin-next',
+    files: [
     // Pages Router
-    '**/pages/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
-    // App Router
-    '**/app/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
-  ],
-  extends: [
-    nextPlugin.configs.recommended,
-    nextPlugin.configs['core-web-vitals'],
-  ],
-  rules: {
-    'import-x/no-default-export': 'off',
-    'react-refresh/only-export-components': 'off',
+      '**/pages/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
+      // App Router
+      '**/app/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
+    ],
+    extends: [
+      nextPlugin.configs.recommended,
+      nextPlugin.configs['core-web-vitals'],
+    ],
+    rules: {
+      'import-x/no-default-export': 'off',
+    },
+    ignores: ['**/.next/**'],
   },
-  ignores: ['**/.next/**'],
-})
+  {
+    name: 'eslint-plugin-react-refresh',
+    files: [
+    // Pages Router
+      '**/pages/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
+      // App Router
+      '**/app/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
+    ],
+    extends: [reactRefreshPlugin.configs.next],
+  },
+)

package/src/frameworks/react.js

@@ -3,7 +3,6 @@ import { defineConfig } from 'eslint/config';
 import jsxA11y from 'eslint-plugin-jsx-a11y';
 import reactPlugin from 'eslint-plugin-react';
 import reactHooksPlugin from 'eslint-plugin-react-hooks';
-import reactRefreshPlugin from 'eslint-plugin-react-refresh';
 import globals from 'globals';
 export const react = defineConfig([
     {
@@ -121,8 +120,4 @@ export const react = defineConfig([
             },
         ],
     },
-}, {
-    name: 'eslint-plugin-react-refresh',
-    files: ['**/*.{jsx,tsx}'],
-    extends: [reactRefreshPlugin.configs.recommended],
 });

package/src/frameworks/react.ts

@@ -3,7 +3,6 @@ import { defineConfig } from 'eslint/config'
 import jsxA11y from 'eslint-plugin-jsx-a11y'
 import reactPlugin from 'eslint-plugin-react'
 import reactHooksPlugin from 'eslint-plugin-react-hooks'
-import reactRefreshPlugin from 'eslint-plugin-react-refresh'
 import globals from 'globals'
 
 export const react = defineConfig(
@@ -126,9 +125,4 @@ export const react = defineConfig(
       ],
     },
   },
-  {
-    name: 'eslint-plugin-react-refresh',
-    files: ['**/*.{jsx,tsx}'],
-    extends: [reactRefreshPlugin.configs.recommended],
-  },
 )

package/src/index.js

@@ -1,4 +1,4 @@
-import { defineConfig } from 'eslint/config';
+import { defineConfig, globalIgnores } from 'eslint/config';
 import { common } from './base/common.js';
 import { graphql } from './base/graphql.js';
 import { javaScript } from './base/javascript.js';
@@ -16,7 +16,7 @@ import { storybook } from './frameworks/storybook.js';
 import { vite } from './frameworks/vite.js';
 import { vitest } from './frameworks/vitest.js';
 export function config(options, ...overrides) {
-    return defineConfig(
+    return defineConfig(globalIgnores(options?.ignores ?? []), 
     // ベース
     [
         common,
@@ -35,10 +35,10 @@ export function config(options, ...overrides) {
     [
         // React
         react,
-        // Next.js
-        nextJs,
         // Vite
         vite,
+        // Next.js
+        nextJs,
         // Relay
         relay,
         // Storybook

package/src/index.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from 'eslint/config'
+import { defineConfig, globalIgnores } from 'eslint/config'
 
 import { common } from './base/common.js'
 import { graphql } from './base/graphql.js'
@@ -19,11 +19,14 @@ import { vitest } from './frameworks/vitest.js'
 
 import type { ConfigArray, ConfigWithExtends } from 'typescript-eslint'
 
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type -- 将来のために予約してある
-type Options = {}
+type Options = {
+  ignores?: string[]
+}
 
 export function config(options?: Options, ...overrides: ConfigWithExtends[]): ConfigArray {
   return defineConfig(
+    globalIgnores(options?.ignores ?? []),
+
     // ベース
     [
       common,
@@ -43,10 +46,10 @@ export function config(options?: Options, ...overrides: ConfigWithExtends[]): Co
     [
       // React
       react,
-      // Next.js
-      nextJs,
       // Vite
       vite,
+      // Next.js
+      nextJs,
       // Relay
       relay,
       // Storybook