@slashnephy/eslint-config 3.0.105 → 3.0.110

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@slashnephy/eslint-config",
-  "version": "3.0.105",
+  "version": "3.0.110",
   "keywords": [
     "eslint",
     "eslintconfig"
@@ -14,42 +14,32 @@
   "type": "module",
   "main": "./src/index.js",
   "files": [
-    "./package.json",
     "./src/**/*.js",
-    "./src/**/*.ts",
-    "./README.md"
+    "./src/**/*.ts"
   ],
-  "scripts": {
-    "build": "tsc",
-    "bump-version": "tsx bin/bump-version.ts",
-    "clean": "rm -rf src/**/*.js",
-    "format": "eslint --fix",
-    "lint": "eslint",
-    "publish": "yarn build && yarn npm publish"
-  },
   "dependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "4.5.0",
-    "@eslint/js": "9.28.0",
+    "@eslint/js": "9.39.2",
     "@graphql-eslint/eslint-plugin": "4.4.0",
-    "@next/eslint-plugin-next": "15.3.6",
+    "@next/eslint-plugin-next": "16.0.10",
     "@stylistic/eslint-plugin": "5.6.1",
     "@susisu/eslint-plugin-safe-typescript": "0.10.1",
-    "@typescript-eslint/utils": "8.30.1",
-    "@vitest/eslint-plugin": "1.5.1",
+    "@typescript-eslint/utils": "8.49.0",
+    "@vitest/eslint-plugin": "1.5.2",
     "eslint-config-flat-gitignore": "2.1.0",
     "eslint-import-resolver-node": "0.3.9",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import-x": "4.16.1",
-    "eslint-plugin-jest": "29.2.1",
+    "eslint-plugin-jest": "29.2.2",
     "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-n": "17.16.2",
-    "eslint-plugin-package-json": "0.30.0",
+    "eslint-plugin-n": "17.23.1",
+    "eslint-plugin-package-json": "0.85.0",
     "eslint-plugin-promise": "7.2.1",
     "eslint-plugin-react": "7.37.5",
-    "eslint-plugin-react-hooks": "5.2.0",
+    "eslint-plugin-react-hooks": "7.0.1",
     "eslint-plugin-react-refresh": "0.4.24",
     "eslint-plugin-relay": "2.0.0",
-    "eslint-plugin-storybook": "0.12.0",
+    "eslint-plugin-storybook": "10.1.8",
     "eslint-plugin-tsdoc": "0.5.0",
     "eslint-plugin-unused-imports": "4.3.0",
     "eslint-plugin-userscripts": "0.5.6",
@@ -57,25 +47,34 @@
     "eslint-plugin-yml": "1.19.0",
     "globals": "16.5.0",
     "graphql": "16.12.0",
-    "jsonc-eslint-parser": "2.4.1",
+    "jsonc-eslint-parser": "2.4.2",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.30.1",
+    "typescript-eslint": "8.49.0",
     "yaml-eslint-parser": "1.3.2"
   },
   "devDependencies": {
     "@eslint/config-inspector": "1.4.2",
     "@types/eslint": "9.6.1",
-    "@types/node": "24.10.1",
+    "@types/node": "25.0.1",
     "concurrently": "9.2.1",
-    "eslint": "9.28.0",
+    "eslint": "9.39.2",
     "jiti": "2.6.1",
     "tsx": "4.21.0"
   },
   "peerDependencies": {
     "eslint": "^9"
   },
-  "packageManager": "yarn@4.12.0",
+  "engines": {
+    "node": ">= 22"
+  },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "tsc",
+    "bump-version": "tsx bin/bump-version.ts",
+    "clean": "rm -rf src/**/*.js",
+    "format": "eslint --fix",
+    "lint": "eslint"
   }
 }

package/src/base/common.ts

@@ -1,42 +1,14 @@
-import stylisticPlugin from '@stylistic/eslint-plugin'
-import { globalIgnores } from 'eslint/config'
+import { defineConfig, globalIgnores } from 'eslint/config'
 import gitignore from 'eslint-config-flat-gitignore'
-import { config } from 'typescript-eslint'
 
-export const common = config(
+export const common = defineConfig(
   globalIgnores([
     '**/.git/**',
     '**/node_modules/**',
     '**/.yarn/**',
     '**/dist/**',
     '**/.idea/**',
+    '**/pnpm-lock.yaml',
   ]),
   gitignore({ name: 'eslint-config-flat-gitignore', strict: false }),
-  {
-    name: '@stylistic/eslint-plugin',
-    files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
-    extends: [
-      stylisticPlugin.configs.customize({
-        indent: 2,
-        quotes: 'single',
-        semi: false,
-        jsx: true,
-        arrowParens: true,
-        blockSpacing: true,
-        quoteProps: 'consistent-as-needed',
-        commaDangle: 'always-multiline',
-      }),
-    ],
-    rules: {
-      // UTF-8 BOM を禁止
-      'unicode-bom': ['error', 'never'],
-      // 最終行に改行を挿入
-      '@stylistic/eol-last': ['error', 'always'],
-      // 行末のスペースを禁止
-      '@stylistic/no-trailing-spaces': ['error'],
-      // 型名の前後のスペースを揃える
-      // e.g. const foo: string = 'bar'
-      '@stylistic/type-annotation-spacing': 'error',
-    },
-  },
 )

package/src/base/graphql.ts

@@ -1,7 +1,7 @@
 import graphqlPlugin from '@graphql-eslint/eslint-plugin'
-import { config } from 'typescript-eslint'
+import { defineConfig } from 'eslint/config'
 
-export const graphql = config(
+export const graphql = defineConfig(
   // GraphQL を解釈できるようにする
   {
     name: '@graphql-eslint/eslint-plugin (parser)',
@@ -10,6 +10,7 @@ export const graphql = config(
       parser: graphqlPlugin.parser,
     },
     plugins: {
+      // @ts-expect-error -- 一時的に型定義を無視
       '@graphql-eslint': graphqlPlugin,
     },
   },

package/src/base/javascript.ts

@@ -1,13 +1,15 @@
 import eslint from '@eslint/js'
 // @ts-expect-error 型定義ファイルがない
 import eslintCommentsConfig from '@eslint-community/eslint-plugin-eslint-comments/configs'
-import importXPlugin from 'eslint-plugin-import-x'
+import stylisticPlugin from '@stylistic/eslint-plugin'
+import { defineConfig } from 'eslint/config'
+import { importX } from 'eslint-plugin-import-x'
 // @ts-expect-error 型定義ファイルがない
 import promisePlugin from 'eslint-plugin-promise'
 import unusedImportsPlugin from 'eslint-plugin-unused-imports'
-import tseslint, { config } from 'typescript-eslint'
+import tseslint from 'typescript-eslint'
 
-export const javaScript = config(
+export const javaScript = defineConfig(
   {
     files: ['**/*.cjs'],
     languageOptions: {
@@ -35,13 +37,13 @@ export const javaScript = config(
       // 関数宣言は function xxx() {} にする
       'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
       // 中括弧の省略を禁止
-      'curly': 'error',
+      curly: 'error',
       // テンプレート文字列を優先
       'prefer-template': 'error',
       // == 比較 👉 === 比較
-      'eqeqeq': 'error',
+      eqeqeq: 'error',
       // *.js で 'use strict'; を強制
-      'strict': ['error', 'global'],
+      strict: ['error', 'global'],
       // 特定の構文を禁止
       'no-restricted-syntax': [
         'error',
@@ -81,12 +83,10 @@ export const javaScript = config(
       'no-unused-private-class-members': 'error',
       // スレッドセーフで安全に更新されないコードを禁止
       'require-atomic-updates': 'error',
-      // func () 👉 func()
-      'func-call-spacing': ['error', 'never'],
       // ペアになっていない setter を禁止
       'accessor-pairs': 'error',
       // キャメルケースに強制しない
-      'camelcase': 'off',
+      camelcase: 'off',
       // switch 文で default を強制しない
       'default-case': 'off',
       // continue 文を許可
@@ -103,25 +103,55 @@ export const javaScript = config(
       'no-plusplus': 'off',
       // return の省略などを許可
       'consistent-return': 'off',
-      // 空行を挟む
-      'padding-line-between-statements': [
-        'warn',
-        // return 前に空行
-        { blankLine: 'always', prev: '*', next: 'return' },
-        // ディレクティブ後に空行
-        { blankLine: 'always', prev: 'directive', next: '*' },
-        { blankLine: 'any', prev: 'directive', next: 'directive' },
-      ],
       // void Promise を許可
       'no-void': 'off',
       // 1 <= x < 10 を許可
-      'yoda': [
+      yoda: [
         'error',
         'never',
         {
           exceptRange: true,
         },
       ],
+      // UTF-8 BOM を禁止
+      'unicode-bom': ['error', 'never'],
+    },
+  },
+  {
+    name: '@stylistic/eslint-plugin',
+    files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
+    extends: [
+      stylisticPlugin.configs.customize({
+        indent: 2,
+        quotes: 'single',
+        semi: false,
+        jsx: true,
+        arrowParens: true,
+        blockSpacing: true,
+        quoteProps: 'as-needed',
+        commaDangle: 'always-multiline',
+        braceStyle: '1tbs',
+      }),
+    ],
+    rules: {
+      // 最終行に改行を挿入
+      '@stylistic/eol-last': ['error', 'always'],
+      // 行末のスペースを禁止
+      '@stylistic/no-trailing-spaces': ['error'],
+      // 型名の前後のスペースを揃える
+      // e.g. const foo: string = 'bar'
+      '@stylistic/type-annotation-spacing': 'error',
+      // func () 👉 func()
+      '@stylistic/function-call-spacing': ['error', 'never'],
+      // 空行を挟む
+      '@stylistic/padding-line-between-statements': [
+        'warn',
+        // return 前に空行
+        { blankLine: 'always', prev: '*', next: 'return' },
+        // ディレクティブ後に空行
+        { blankLine: 'always', prev: 'directive', next: '*' },
+        { blankLine: 'any', prev: 'directive', next: 'directive' },
+      ],
     },
   },
   {
@@ -131,7 +161,10 @@ export const javaScript = config(
   {
     name: 'eslint-plugin-import-x',
     files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
-    extends: [importXPlugin.flatConfigs.recommended],
+    extends: [
+      // @ts-expect-error -- languageOptions の型定義が不一致
+      importX.flatConfigs.recommended,
+    ],
     settings: {
       'import-x/resolver': {
         node: {
@@ -156,7 +189,7 @@ export const javaScript = config(
         'warn',
         {
           // 組み込み → 外部依存 → 内部依存 → object → type の順にする
-          'groups': [
+          groups: [
             'builtin',
             'external',
             ['parent', 'sibling', 'index'],
@@ -167,11 +200,11 @@ export const javaScript = config(
           // カテゴリー間に改行を入れる
           'newlines-between': 'always',
           // 大文字小文字区別なしで ABC 順にする
-          'alphabetize': {
+          alphabetize: {
             order: 'asc',
             caseInsensitive: true,
           },
-          'pathGroups': [
+          pathGroups: [
             // **.css は最後に配置する
             {
               pattern: '**.css',
@@ -180,7 +213,7 @@ export const javaScript = config(
             },
           ],
           // **.css が import 順最後ではないときに警告
-          'warnOnUnassignedImports': true,
+          warnOnUnassignedImports: true,
         },
       ],
     },

package/src/base/package.json.ts

@@ -1,11 +1,12 @@
+import { defineConfig } from 'eslint/config'
 import packageJsonPlugin from 'eslint-plugin-package-json'
-import { config } from 'typescript-eslint'
 
-export const packageJson = config({
+export const packageJson = defineConfig({
   name: 'eslint-plugin-package-json',
   files: ['**/package.json'],
   extends: [packageJsonPlugin.configs.recommended],
   rules: {
+    'package-json/require-description': 'off',
     'package-json/order-properties': [
       'error',
       {

package/src/base/typescript.ts

@@ -1,9 +1,10 @@
 import safeTypeScriptPlugin from '@susisu/eslint-plugin-safe-typescript'
-import importXPlugin from 'eslint-plugin-import-x'
+import { defineConfig } from 'eslint/config'
+import { importX } from 'eslint-plugin-import-x'
 import tsdocPlugin from 'eslint-plugin-tsdoc'
-import tseslint, { config } from 'typescript-eslint'
+import tseslint from 'typescript-eslint'
 
-export const typeScript = config(
+export const typeScript = defineConfig(
   {
     files: ['**/*.cts'],
     languageOptions: {
@@ -202,7 +203,10 @@ export const typeScript = config(
   {
     name: 'eslint-plugin-import-x',
     files: ['**/*.{ts,cts,mts,tsx}'],
-    extends: [importXPlugin.flatConfigs.typescript],
+    extends: [
+      // @ts-expect-error -- languageOptions の型定義が不一致
+      importX.flatConfigs.typescript,
+    ],
     rules: {
       // import に拡張子を推奨
       'import-x/extensions': [

package/src/base/yaml.ts

@@ -1,7 +1,7 @@
+import { defineConfig } from 'eslint/config'
 import ymlPlugin from 'eslint-plugin-yml'
-import { config } from 'typescript-eslint'
 
-export const yaml = config(
+export const yaml = defineConfig(
   {
     name: 'eslint-plugin-yml',
     files: ['**/*.{yml,yaml}'],

package/src/environments/cloudflareWorkers.ts

@@ -1,6 +1,6 @@
-import { config } from 'typescript-eslint'
+import { defineConfig } from 'eslint/config'
 
-export const cloudflareWorkers = config({
+export const cloudflareWorkers = defineConfig({
   files: ['**/src/worker.{js,ts}', '**/functions/**/*.{js,ts}'],
   rules: {
     // default export を許可

package/src/environments/node.ts

@@ -1,7 +1,7 @@
+import { defineConfig } from 'eslint/config'
 import nPlugin from 'eslint-plugin-n'
-import { config } from 'typescript-eslint'
 
-export const node = config(
+export const node = defineConfig(
   {
     name: 'eslint-plugin-n',
     files: [

package/src/environments/userscript.ts

@@ -1,7 +1,7 @@
+import { defineConfig } from 'eslint/config'
 import userScriptsPlugin from 'eslint-plugin-userscripts'
-import { config } from 'typescript-eslint'
 
-export const userScript = config({
+export const userScript = defineConfig({
   name: 'eslint-plugin-userscripts',
   files: ['**/*.user.js'],
   plugins: {

package/src/frameworks/jest.ts

@@ -1,7 +1,7 @@
+import { defineConfig } from 'eslint/config'
 import jestPlugin from 'eslint-plugin-jest'
-import { config } from 'typescript-eslint'
 
-export const jest = config({
+export const jest = defineConfig({
   name: 'eslint-plugin-jest',
   files: [
     '**/*.test.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',

package/src/frameworks/next.js.ts

@@ -1,8 +1,7 @@
-// @ts-expect-error 型定義ファイルがない
 import nextPlugin from '@next/eslint-plugin-next'
-import { config } from 'typescript-eslint'
+import { defineConfig } from 'eslint/config'
 
-export const nextJs = config({
+export const nextJs = defineConfig({
   name: '@next/eslint-plugin-next',
   files: [
     // Pages Router
@@ -10,9 +9,6 @@ export const nextJs = config({
     // App Router
     '**/app/**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',
   ],
-  plugins: {
-    '@next/next': nextPlugin,
-  },
   extends: [
     nextPlugin.configs.recommended,
     nextPlugin.configs['core-web-vitals'],

package/src/frameworks/react.ts

@@ -1,12 +1,12 @@
+import { defineConfig } from 'eslint/config'
 // @ts-expect-error 型定義ファイルがない
 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'
-import { config } from 'typescript-eslint'
 
-export const react = config(
+export const react = defineConfig(
   [
     {
       name: 'eslint-plugin-react',
@@ -98,7 +98,7 @@ export const react = config(
   {
     name: 'eslint-plugin-react-hooks',
     files: ['**/*.{jsx,tsx}'],
-    extends: [reactHooksPlugin.configs['recommended-latest']],
+    extends: [reactHooksPlugin.configs.flat['recommended-latest']],
     rules: {
       // https://recoiljs.org/docs/introduction/installation/#eslint
       'react-hooks/rules-of-hooks': 'error',

package/src/frameworks/relay.ts

@@ -1,14 +1,16 @@
-import { config } from 'typescript-eslint'
+import { defineConfig } from 'eslint/config'
+// @ts-expect-error -- 型定義がない
+import relayPlugin from 'eslint-plugin-relay'
 
-export const relay = config({
+export const relay = defineConfig({
   name: 'eslint-plugin-relay',
   files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
-  // TODO: eslint-plugin-relay が Flat Configs に対応したら移行する
-  // https://github.com/relayjs/eslint-plugin-relay/issues/156
-  // extends: ['plugin:relay/recommended'],
-  // plugins: ['relay'],
-  // rules: {
-  //   // 未使用の GraphQL フィールドを禁止
-  //   'relay/unused-fields': 'error',
-  // },
+  extends: [
+    relayPlugin.configs['ts-recommended'],
+  ],
+  plugins: { relay: relayPlugin },
+  rules: {
+    // 未使用の GraphQL フィールドを禁止
+    'relay/unused-fields': 'error',
+  },
 })

package/src/frameworks/storybook.ts

@@ -1,8 +1,8 @@
+import { defineConfig } from 'eslint/config'
 import storybookPlugin from 'eslint-plugin-storybook'
-import { config } from 'typescript-eslint'
 
-export const storybook = config({
-  name: 'eslint-plugin-storybook',
-  files: ['**/*.stories.{jsx,tsx}'],
-  extends: [storybookPlugin.configs['flat/recommended']],
-})
+export const storybook = defineConfig(
+  // eslint-plugin-storybook
+  // @ts-expect-error -- 型定義が不一致
+  storybookPlugin.configs['flat/recommended'],
+)

package/src/frameworks/vite.ts

@@ -1,7 +1,7 @@
+import { defineConfig } from 'eslint/config'
 import reactRefreshPlugin from 'eslint-plugin-react-refresh'
-import { config } from 'typescript-eslint'
 
-export const vite = config({
+export const vite = defineConfig({
   name: 'eslint-plugin-react-refresh',
   files: ['**/src/**/*.{jsx,tsx}'],
   extends: [reactRefreshPlugin.configs.vite],

package/src/frameworks/vitest.ts

@@ -1,7 +1,7 @@
 import vitestPlugin from '@vitest/eslint-plugin'
-import { config } from 'typescript-eslint'
+import { defineConfig } from 'eslint/config'
 
-export const vitest = config({
+export const vitest = defineConfig({
   name: '@vitest/eslint-plugin',
   files: [
     '**/*.test.{js,cjs,mjs,jsx,ts,cts,mts,tsx}',

package/src/index.ts

@@ -1,4 +1,4 @@
-import tseslint from 'typescript-eslint'
+import { defineConfig } from 'eslint/config'
 
 import { common } from './base/common.js'
 import { graphql } from './base/graphql.js'
@@ -17,11 +17,13 @@ import { storybook } from './frameworks/storybook.js'
 import { vite } from './frameworks/vite.js'
 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 = {}
 
-export function config(_options?: Options, ...overrides: tseslint.ConfigWithExtends[]): tseslint.ConfigArray {
-  return tseslint.config(
+export function config(options?: Options, ...overrides: ConfigWithExtends[]): ConfigArray {
+  return defineConfig(
     // ベース
     [
       common,
@@ -65,6 +67,7 @@ export function config(_options?: Options, ...overrides: tseslint.ConfigWithExte
       userScript,
     ],
 
+    // @ts-expect-error -- 型定義が不完全
     ...overrides,
   )
 }

package/src/base/common.js

@@ -1,37 +0,0 @@
-import stylisticPlugin from '@stylistic/eslint-plugin';
-import { globalIgnores } from 'eslint/config';
-import gitignore from 'eslint-config-flat-gitignore';
-import { config } from 'typescript-eslint';
-export const common = config(globalIgnores([
-    '**/.git/**',
-    '**/node_modules/**',
-    '**/.yarn/**',
-    '**/dist/**',
-    '**/.idea/**',
-]), gitignore({ name: 'eslint-config-flat-gitignore', strict: false }), {
-    name: '@stylistic/eslint-plugin',
-    files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
-    extends: [
-        stylisticPlugin.configs.customize({
-            indent: 2,
-            quotes: 'single',
-            semi: false,
-            jsx: true,
-            arrowParens: true,
-            blockSpacing: true,
-            quoteProps: 'consistent-as-needed',
-            commaDangle: 'always-multiline',
-        }),
-    ],
-    rules: {
-        // UTF-8 BOM を禁止
-        'unicode-bom': ['error', 'never'],
-        // 最終行に改行を挿入
-        '@stylistic/eol-last': ['error', 'always'],
-        // 行末のスペースを禁止
-        '@stylistic/no-trailing-spaces': ['error'],
-        // 型名の前後のスペースを揃える
-        // e.g. const foo: string = 'bar'
-        '@stylistic/type-annotation-spacing': 'error',
-    },
-});

package/src/base/graphql.js

@@ -1,42 +0,0 @@
-import graphqlPlugin from '@graphql-eslint/eslint-plugin';
-import { config } from 'typescript-eslint';
-export const graphql = config(
-// GraphQL を解釈できるようにする
-{
-    name: '@graphql-eslint/eslint-plugin (parser)',
-    files: ['**/*.{graphql,graphqls,gql}'],
-    languageOptions: {
-        parser: graphqlPlugin.parser,
-    },
-    plugins: {
-        '@graphql-eslint': graphqlPlugin,
-    },
-}, 
-// コード中に含まれる GraphQL を解釈して lint できるようにする
-{
-    name: '@graphql-eslint/eslint-plugin (code)',
-    files: ['**/*.{js,cjs,mjs,jsx,ts,cts,mts,tsx}'],
-    processor: graphqlPlugin.processor,
-}, 
-// GraphQL schema
-{
-    name: '@graphql-eslint/eslint-plugin (GraphQL schema)',
-    files: [
-        '**/schema.{graphql,graphqls,gql}',
-        // gqlgen
-        '**/graph/*.{graphql,graphqls,gql}',
-    ],
-    extends: [
-        graphqlPlugin.configs['flat/schema-recommended'],
-        graphqlPlugin.configs['flat/schema-relay'],
-    ],
-}, 
-// GraphQL operations
-{
-    name: '@graphql-eslint/eslint-plugin (GraphQL operations)',
-    files: [
-        '**/documents/*.{graphql,graphqls,gql}',
-        '**/frontend/**/*.{graphql,graphqls,gql}',
-    ],
-    extends: [graphqlPlugin.configs['flat/operations-recommended']],
-});