@cto.af/eslint-config 6.0.17 → 6.2.0

package/all.js

@@ -1,5 +1,6 @@
 import ava from './ava.js';
 import cjs from './cjs.js';
+import {defineConfig} from 'eslint/config';
 import ignores from './ignores.js';
 import js from './js.js';
 import jsdoc from './jsdoc.js';
@@ -10,15 +11,15 @@ import mjs from './mjs.js';
 import ts from './ts.js';
 
 // Turn on everything.  Requires all of the optional dependencies.
-export default [
-  ...ignores,
-  ...js,
-  ...mjs,
-  ...cjs,
-  ...ts,
-  ...jsdoc,
-  ...jsdoc_ts,
-  ...json,
-  ...ava,
-  ...markdown,
-];
+export default defineConfig(
+  ignores,
+  js,
+  mjs,
+  cjs,
+  ts,
+  jsdoc,
+  jsdoc_ts,
+  json,
+  ava,
+  markdown
+);

package/allModule.js

@@ -1,7 +1,8 @@
 import all from './all.js';
+import {defineConfig} from 'eslint/config';
 import mod from './module.js';
 
-export default [
-  ...all,
-  ...mod,
-];
+export default defineConfig(
+  all,
+  mod
+);

package/ava.js

@@ -1,8 +1,9 @@
 import ava from 'eslint-plugin-ava';
+import {defineConfig} from 'eslint/config';
 import n from 'eslint-plugin-n';
 import {rules} from './rules/ava.js';
 
-export default [{
+export default defineConfig({
   files: [
     '**/test/**.test.*',
     '**/test/**.ava.*',
@@ -16,4 +17,4 @@ export default [{
     n,
   },
   rules,
-}];
+});

package/cjs.js

@@ -1,8 +1,10 @@
-export default [{
+import {defineConfig} from 'eslint/config';
+
+export default defineConfig({
   files: [
     '**/*.cjs',
   ],
   languageOptions: {
     sourceType: 'commonjs',
   },
-}];
+});

package/es6.js

@@ -1,8 +1,9 @@
+import {defineConfig} from 'eslint/config';
 import index from './index.js';
 import mod from './module.js';
 
 // Turn on es6 modules
-export default [
-  ...index,
-  ...mod,
-];
+export default defineConfig(
+  index,
+  mod
+);

package/ignores.js

@@ -1,8 +1,8 @@
-export default [{
-  ignores: [
-    '**/*.d.ts',
-    'coverage/**',
-    'node_modules/**',
-    'docs/**',
-  ],
-}];
+import {globalIgnores} from 'eslint/config';
+
+export default globalIgnores([
+  '**/*.d.ts',
+  '**/coverage/**',
+  '**/node_modules/**',
+  '**/docs/**',
+]);

package/index.js

@@ -1,12 +1,13 @@
+import {defineConfig} from 'eslint/config';
 import ignores from './ignores.js';
 import js from './js.js';
 import json from './json.js';
 import mjs from './mjs.js';
 
 // Just the core rules, no optional dependencies needed.
-export default [
-  ...ignores,
-  ...js,
-  ...mjs,
-  ...json,
-];
+export default defineConfig(
+  ignores,
+  js,
+  mjs,
+  json
+);

package/js.js

@@ -1,10 +1,11 @@
+import {defineConfig} from 'eslint/config';
 import globals from 'globals';
 import n from 'eslint-plugin-n';
 import redos from 'eslint-plugin-redos';
 import {rules} from './rules/js.js';
 import stylistic from '@stylistic/eslint-plugin';
 
-export default [
+export default defineConfig(
   {
     files: [
       '**/*.js',
@@ -37,5 +38,5 @@ export default [
       'no-console': 'off',
       'n/no-top-level-await': 'off',
     },
-  },
-];
+  }
+);

package/jsdoc.js

@@ -1,7 +1,8 @@
+import {defineConfig} from 'eslint/config';
 import jsdoc from 'eslint-plugin-jsdoc';
 import {rules} from './rules/jsdoc.js';
 
-export default [{
+export default defineConfig({
   files: [
     '**/*.js',
     '**/*.cjs',
@@ -19,4 +20,4 @@ export default [{
     },
   },
   rules,
-}];
+});

package/jsdoc_ts.js

@@ -1,10 +1,24 @@
-export default [{
+import {defineConfig} from 'eslint/config';
+
+export default defineConfig({
   files: [
     '**/*.ts',
   ],
   rules: {
+    'jsdoc/no-types': 'error', // Type info comes from TS
     'jsdoc/no-undefined-types': 'off', // Switch to typedoc
-    'jsdoc/require-param-type': 'off', // Not needed in TS
-    'jsdoc/require-returns-type': 'off', // Not needed in TS
+    'jsdoc/require-next-type': 'off',
+    'jsdoc/require-param-type': 'off',
+    'jsdoc/require-property-type': 'off',
+    'jsdoc/require-returns-type': 'off',
+    'jsdoc/require-returns': ['error', {
+      checkConstructors: false,
+      checkGetters: false,
+      forceRequireReturn: false,
+      forceReturnsWithAsync: false,
+      publicOnly: true,
+    }],
+    'jsdoc/require-throws-type': 'off',
+    'jsdoc/require-yields-type': 'off',
   },
-}];
+});

package/json.js

@@ -1,7 +1,8 @@
+import {defineConfig} from 'eslint/config';
 import json from '@eslint/json';
 import {rules} from './rules/json.js';
 
-export default [
+export default defineConfig(
   {
     plugins: {
       json,
@@ -24,5 +25,5 @@ export default [
     files: ['**/*.json5'],
     language: 'json/json5',
     rules,
-  },
-];
+  }
+);

package/markdown.js

@@ -1,7 +1,8 @@
+import {defineConfig} from 'eslint/config';
 import markdown from '@eslint/markdown';
 import {rules} from './rules/markdown.js';
 
-export default [
+export default defineConfig(
   {
     files: [
       '**/*.md',
@@ -33,5 +34,5 @@ export default [
       'n/no-missing-import': 'off',
       'n/no-top-level-await': 'off',
     },
-  },
-];
+  }
+);

package/mjs.js

@@ -1,4 +1,6 @@
-export default [{
+import {defineConfig} from 'eslint/config';
+
+export default defineConfig({
   files: [
     '**/*.mjs',
     '**/*.ts',
@@ -6,4 +8,4 @@ export default [{
   languageOptions: {
     sourceType: 'module',
   },
-}];
+});

package/mocha.js

@@ -1,7 +1,8 @@
+import {defineConfig} from 'eslint/config';
 import globals from 'globals';
 import mocha from 'eslint-plugin-mocha';
 
-export default [{
+export default defineConfig({
   files: [
     'test/**/*.spec.js',
     'test/**/*.spec.ts',
@@ -31,4 +32,4 @@ export default [{
     ...mocha.configs.recommended.rules,
     'mocha/no-mocha-arrows': 'off',
   },
-}];
+});

package/module.js

@@ -1,6 +1,8 @@
-export default [{
+import {defineConfig} from 'eslint/config';
+
+export default defineConfig({
   files: ['**/*.js'],
   languageOptions: {
     sourceType: 'module',
   },
-}];
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cto.af/eslint-config",
-  "version": "6.0.17",
+  "version": "6.2.0",
   "description": "hildjj's lint rules",
   "main": "index.js",
   "type": "module",
@@ -14,13 +14,13 @@
     "url": "git+https://github.com/cto-af/eslint-config.git"
   },
   "dependencies": {
-    "@eslint/json": "0.13.2",
+    "@eslint/json": "0.14.0",
     "@stylistic/eslint-plugin": "5.5.0",
     "eslint-plugin-n": "17.23.1",
     "eslint-plugin-redos": "4.4.5",
-    "globals": "16.4.0"
+    "globals": "16.5.0"
   },
-  "packageManager": "pnpm@10.19.0",
+  "packageManager": "pnpm@10.22.0",
   "engines": {
     "node": ">=20"
   }

package/rules/ava.js

@@ -1,5 +1,7 @@
 /* eslint meta/no-unused-rules: ["error", {ignore: ["n"]}] */
 
+/** @import {RulesConfig} from '@eslint/core' */
+/** @type {Partial<RulesConfig>}*/
 export const rules = {
   // [ava](https://github.com/avajs/eslint-plugin-ava?tab=readme-ov-file#rules)
   'ava/assertion-arguments': 'error',

package/rules/js.js

@@ -1,3 +1,5 @@
+/** @import {RulesConfig} from '@eslint/core' */
+/** @type {Partial<RulesConfig>}*/
 export const rules = {
   // [Possible Problems](https://eslint.org/docs/rules/#possible-problems)
   'array-callback-return': ['error', {allowImplicit: true}],

package/rules/jsdoc.js

@@ -1,3 +1,5 @@
+/** @import {RulesConfig} from '@eslint/core' */
+/** @type {Partial<RulesConfig>}*/
 export const rules = {
   // Check: jsdoc
   // [Stylistic Issues](https://eslint.org/docs/rules/#stylistic-issues)

package/rules/json.js

@@ -1,3 +1,5 @@
+/** @import {RulesConfig} from '@eslint/core' */
+/** @type {Partial<RulesConfig>}*/
 export const rules = {
   // [Rules](https://github.com/eslint/json?tab=readme-ov-file#rules)
   'json/no-duplicate-keys': 'error',

package/rules/markdown.js

@@ -1,3 +1,5 @@
+/** @import {RulesConfig} from '@eslint/core' */
+/** @type {Partial<RulesConfig>}*/
 export const rules = {
   // Check: markdown
   // [Rules](https://github.com/eslint/markdown?tab=readme-ov-file#rules)

package/rules/ts.js

@@ -3,13 +3,17 @@ import ts from 'typescript-eslint';
 
 const originalDisabled = {};
 builtinRules.forEach((_, r) => {
+  // @ts-expect-error TODO(hildjj): fix types
   if (ts.plugin.rules[r]) {
+    // @ts-expect-error TODO(hildjj): fix types
     originalDisabled[r] = 'off';
   }
 });
 
 /* eslint meta/no-unused-rules: ["error", {ignore: ["@stylistic"]}] */
 
+/** @import {RulesConfig} from '@eslint/core' */
+/** @type {Partial<RulesConfig>}*/
 export const rules = {
   // [original disabled for extension](https://typescript-eslint.io/rules/?=extension#extension-rules)
   ...originalDisabled,

package/ts.js

@@ -1,10 +1,10 @@
+import {defineConfig} from 'eslint/config';
 import ignores from './ignores.js';
 import {rules} from './rules/ts.js';
 import tslint from 'typescript-eslint';
 
 const blob = {
   files: ['**/*.ts'],
-  ignores: ignores[0].ignores,
   settings: {
     n: {
       // Ensure that importing real .js files works
@@ -22,8 +22,10 @@ const blob = {
   rules,
 };
 
+// @ts-expect-error TODO(hildjj): fix types
 blob.languageOptions.parserOptions = {
   // It's undefined for now, but just in case.
+  // @ts-expect-error TODO(hildjj): fix types
   ...blob.languageOptions.parserOptions,
   project: true,
 };
@@ -45,7 +47,8 @@ testBlob.settings = {
   },
 };
 
-export default [
+export default defineConfig(
+  ignores,
   blob,
-  testBlob,
-];
+  testBlob
+);