@bfra.me/eslint-config 0.33.0 → 0.34.0

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import * as eslint_flat_config_utils from 'eslint-flat-config-utils';
 import { ResolvableFlatConfig, FlatConfigComposer } from 'eslint-flat-config-utils';
 export { FlatConfigComposer, ResolvableFlatConfig } from 'eslint-flat-config-utils';
+import { RulesConfig } from '@eslint/core';
 import { Linter } from 'eslint';
 import { StylisticCustomizeOptions } from '@stylistic/eslint-plugin';
 import { ParserOptions } from '@typescript-eslint/types';
@@ -16002,7 +16003,7 @@ type Yoda = []|[("always" | "never")]|[("always" | "never"), {
  *
  * @see https://eslint.org/docs/latest/use/configure/configuration-files#configuration-objects
  */
-type Config<R extends Linter.RulesRecord | Rules = Linter.RulesRecord & Rules> = Linter.Config<R>
+type Config<R extends RulesConfig = Rules> = Linter.Config<R>
 
 /**
  * Defines the names of the available ESLint configurations.

package/lib/index.js

@@ -107,7 +107,7 @@ var GLOB_EXCLUDE = [
 import { fileURLToPath } from "url";
 
 // package.json
-var version = "0.33.0";
+var version = "0.34.0";
 
 // src/parsers/any-parser.ts
 var lineBreakPattern = /\r\n|[\n\r\u2028\u2029]/u;
@@ -166,7 +166,7 @@ async function interopDefault(m) {
 
 // src/configs/fallback.ts
 async function fallback(missingList = [], options) {
-  const rules = await interopDefault(import("./missing-module-for-config-YSY2AGPQ.js"));
+  const rules = await interopDefault(import("./missing-module-for-config-YQFEGW2J.js"));
   const pluginName = `@bfra.me${missingList.length > 0 ? `/missing-modules-${missingList.map((m) => m.replaceAll(/[^a-z0-9]/gi, "-").toLowerCase()).join("-")}` : ""}`;
   return [
     {
@@ -910,6 +910,10 @@ async function nextjs(options = {}) {
     ["@next/eslint-plugin-next"],
     async () => {
       const pluginNextJs = await interopDefault(import("@next/eslint-plugin-next"));
+      function getRules(name) {
+        const rules = pluginNextJs.configs?.[name]?.rules;
+        return normalizeRules(rules);
+      }
       return [
         {
           name: "@bfra.me/nextjs/setup",
@@ -925,8 +929,8 @@ async function nextjs(options = {}) {
             sourceType: "module"
           },
           rules: {
-            ...normalizeRules(pluginNextJs.configs.recommended.rules),
-            ...normalizeRules(pluginNextJs.configs["core-web-vitals"].rules),
+            ...getRules("recommended"),
+            ...getRules("core-web-vitals"),
             ...overrides
           },
           settings: {

package/lib/{missing-module-for-config-YSY2AGPQ.js → missing-module-for-config-YQFEGW2J.js}

@@ -144,4 +144,4 @@ export {
   create,
   meta
 };
-//# sourceMappingURL=missing-module-for-config-YSY2AGPQ.js.map
+//# sourceMappingURL=missing-module-for-config-YQFEGW2J.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bfra.me/eslint-config",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Shared ESLint configuration for bfra.me",
   "keywords": [
     "bfra.me",
@@ -66,11 +66,11 @@
   "devDependencies": {
     "@eslint-react/eslint-plugin": "2.0.1",
     "@eslint/config-inspector": "1.3.0",
-    "@eslint/js": "9.38.0",
+    "@eslint/core": "0.17.0",
     "@next/eslint-plugin-next": "15.5.6",
     "@types/eslint-config-prettier": "6.11.3",
     "@typescript-eslint/types": "8.46.2",
-    "@vitest/eslint-plugin": "1.3.23",
+    "@vitest/eslint-plugin": "1.3.25",
     "astro-eslint-parser": "1.2.2",
     "eslint": "9.38.0",
     "eslint-config-prettier": "10.1.8",
@@ -83,9 +83,9 @@
     "eslint-typegen": "2.3.0",
     "tsup": "8.5.0",
     "tsx": "4.20.6",
-    "@bfra.me/eslint-config": "0.33.0",
-    "@bfra.me/tsconfig": "0.12.0",
-    "@bfra.me/prettier-config": "0.16.1"
+    "@bfra.me/eslint-config": "0.34.0",
+    "@bfra.me/prettier-config": "0.16.1",
+    "@bfra.me/tsconfig": "0.12.0"
   },
   "peerDependencies": {
     "@eslint-react/eslint-plugin": "^2.0.1",

package/src/config.d.ts

@@ -1,6 +1,7 @@
 // This file is generated by scripts/generate-types.ts
 // Do not edit this file directly.
 
+import type {RulesConfig} from '@eslint/core'
 import type {Linter} from 'eslint'
 import type {FlatConfigComposer, ResolvableFlatConfig} from 'eslint-flat-config-utils'
 import type {Rules} from './rules'
@@ -13,7 +14,7 @@ export type {FlatConfigComposer, ResolvableFlatConfig}
  *
  * @see https://eslint.org/docs/latest/use/configure/configuration-files#configuration-objects
  */
-export type Config<R extends Linter.RulesRecord | Rules = Linter.RulesRecord & Rules> = Linter.Config<R>
+export type Config<R extends RulesConfig = Rules> = Linter.Config<R>
 
 /**
  * Defines the names of the available ESLint configurations.

package/src/configs/nextjs.ts

@@ -1,3 +1,4 @@
+import type {Plugin} from '@eslint/core'
 import type {Config} from '../config'
 import type {Flatten, OptionsFiles, OptionsOverrides} from '../options'
 import {GLOB_SRC} from '../globs'
@@ -37,10 +38,16 @@ export async function nextjs(options: NextjsOptions = {}): Promise<Config[]> {
     ['@next/eslint-plugin-next'],
     async (): Promise<Config[]> => {
       const pluginNextJs = await interopDefault(import('@next/eslint-plugin-next'))
+
+      function getRules(name: keyof typeof pluginNextJs.configs) {
+        const rules = pluginNextJs.configs?.[name]?.rules
+        return normalizeRules(rules)
+      }
+
       return [
         {
           name: '@bfra.me/nextjs/setup',
-          plugins: {'@next/next': pluginNextJs},
+          plugins: {'@next/next': pluginNextJs as Record<string, Plugin>},
         },
         {
           name: '@bfra.me/nextjs/rules',
@@ -52,8 +59,8 @@ export async function nextjs(options: NextjsOptions = {}): Promise<Config[]> {
             sourceType: 'module',
           },
           rules: {
-            ...normalizeRules(pluginNextJs.configs.recommended.rules),
-            ...normalizeRules(pluginNextJs.configs['core-web-vitals'].rules),
+            ...getRules('recommended'),
+            ...getRules('core-web-vitals'),
 
             ...overrides,
           },

package/src/plugins.d.ts

@@ -1,27 +1,10 @@
 declare module '@eslint-community/eslint-plugin-eslint-comments' {
-  import type {ESLint, Linter} from 'eslint'
+  import type {ConfigObject, Plugin, RulesConfig} from '@eslint/core'
 
-  const plugin: ESLint.Plugin & {
+  const plugin: Plugin & {
     configs: {
-      recommended: ESLint.ConfigData & {
-        rules: Linter.RulesRecord
-      }
-    }
-  }
-
-  export default plugin
-}
-
-declare module '@next/eslint-plugin-next' {
-  import type {ESLint, Linter} from 'eslint'
-
-  const plugin: ESLint.Plugin & {
-    configs: {
-      recommended: ESLint.ConfigData & {
-        rules: Linter.RulesRecord
-      }
-      'core-web-vitals': ESLint.ConfigData & {
-        rules: Linter.RulesRecord
+      recommended: ConfigObject & {
+        rules: RulesConfig
       }
     }
   }
@@ -30,17 +13,17 @@ declare module '@next/eslint-plugin-next' {
 }
 
 declare module 'eslint-plugin-import-x' {
-  import type {ESLint} from 'eslint'
+  import type {Plugin} from '@eslint/core'
 
-  const plugin: ESLint.Plugin
+  const plugin: Plugin
 
   export default plugin
 }
 
 declare module 'eslint-plugin-perfectionist' {
-  import type {ESLint} from 'eslint'
+  import type {Plugin} from '@eslint/core'
 
-  const plugin: ESLint.Plugin
+  const plugin: Plugin
 
   export default plugin
 }

package/src/rules/missing-module-for-config.ts

@@ -1,4 +1,5 @@
-import {Linter, type Rule} from 'eslint'
+import type {RuleContext, RulesMeta} from '@eslint/core'
+import {Linter} from 'eslint'
 import {getPackageInstallCommand, tryInstall} from '../package-utils'
 
 // Whether to install the missing module(s) for the config
@@ -19,7 +20,7 @@ let shouldFix = false
   })
 })()
 
-export const meta: Rule.RuleMetaData = {
+export const meta: RulesMeta = {
   docs: {
     description: 'Missing module for config',
     url: 'https://github.com/bfra-me/works',
@@ -34,7 +35,7 @@ export const meta: Rule.RuleMetaData = {
   type: 'problem',
 }
 
-export function create(context: Rule.RuleContext) {
+export function create(context: RuleContext) {
   const [modules] = context.options as [string[]]
   for (const module of modules) {
     let output = ''