eslint-config-decent 1.4.0 → 1.5.0

package/dist/index.cjs

@@ -1,11 +1,13 @@
 'use strict';
 
 const eslint = require('@eslint/js');
+const prettier = require('eslint-plugin-prettier/recommended');
 const globals = require('globals');
 const tsEslint = require('typescript-eslint');
-const prettier = require('eslint-plugin-prettier/recommended');
 const fs = require('fs');
 const path = require('path');
+const utils = require('@typescript-eslint/utils');
+const importPlugin = require('eslint-plugin-import-x');
 const jsdoc = require('eslint-plugin-jsdoc');
 const mocha = require('eslint-plugin-mocha');
 const promise = require('eslint-plugin-promise');
@@ -19,9 +21,10 @@ const unicorn = require('eslint-plugin-unicorn');
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
 const eslint__default = /*#__PURE__*/_interopDefaultCompat(eslint);
+const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 const globals__default = /*#__PURE__*/_interopDefaultCompat(globals);
 const tsEslint__default = /*#__PURE__*/_interopDefaultCompat(tsEslint);
-const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
+const importPlugin__default = /*#__PURE__*/_interopDefaultCompat(importPlugin);
 const jsdoc__default = /*#__PURE__*/_interopDefaultCompat(jsdoc);
 const mocha__default = /*#__PURE__*/_interopDefaultCompat(mocha);
 const promise__default = /*#__PURE__*/_interopDefaultCompat(promise);
@@ -32,7 +35,7 @@ const testingLibrary__default = /*#__PURE__*/_interopDefaultCompat(testingLibrar
 const security__default = /*#__PURE__*/_interopDefaultCompat(security);
 const unicorn__default = /*#__PURE__*/_interopDefaultCompat(unicorn);
 
-const base$8 = {
+const base$9 = {
   rules: {
     "array-callback-return": ["error", { allowImplicit: true }],
     "block-scoped-var": "error",
@@ -229,6 +232,14 @@ const base$8 = {
       }
     ],
     "prefer-template": "error",
+    "sort-imports": [
+      "error",
+      {
+        ignoreCase: true,
+        ignoreDeclarationSort: true,
+        allowSeparatedGroups: true
+      }
+    ],
     "symbol-description": "error",
     "unicode-bom": ["error", "never"],
     "vars-on-top": "error",
@@ -274,34 +285,37 @@ const cjs = {
     strict: ["error", "global"]
   }
 };
-const configs$8 = {
-  base: base$8,
+const configs$9 = {
+  base: base$9,
   cjsAndEsm,
   cjs
 };
 
-const requireExtensionRule = {
+const requireExtensionRule = utils.ESLintUtils.RuleCreator(() => "https://github.com/jgeurts/eslint-config-decent/tree/main/src/rules/requireExtensionRule.ts")({
+  name: "require-extension",
   meta: {
     type: "suggestion",
     docs: {
-      description: "Ensure import and export statements include a file extension",
-      category: "Best Practices",
-      recommended: true
+      description: "Ensure import and export statements include a file extension"
     },
     fixable: "code",
-    schema: []
+    schema: [],
+    messages: {
+      requireExtension: "Relative imports and exports must include a file extension."
+    }
   },
+  defaultOptions: [],
   create(context) {
     function checkSource(source) {
       const importPath = source.value;
       if (!importPath || !importPath.startsWith(".") || importPath.endsWith(".js")) {
         return;
       }
-      const resolvedPath = path.resolve(path.dirname(context.filename), importPath);
+      const resolvedPath = path.resolve(path.dirname(context.getFilename()), importPath);
       if (!fs.existsSync(resolvedPath)) {
         context.report({
           node: source,
-          message: "Relative imports and exports must include a file extension.",
+          messageId: "requireExtension",
           fix(fixer) {
             const fixedPath = `${importPath}.js`;
             return fixer.replaceText(source, `'${fixedPath}'`);
@@ -323,19 +337,22 @@ const requireExtensionRule = {
       }
     };
   }
-};
+});
 
-const requireIndexRule = {
+const requireIndexRule = utils.ESLintUtils.RuleCreator(() => "https://github.com/jgeurts/eslint-config-decent/tree/main/src/rules/requireIndexRule.ts")({
+  name: "require-index",
   meta: {
     type: "suggestion",
     docs: {
-      description: "Ensure directory import and export statements use index.js",
-      category: "Best Practices",
-      recommended: true
+      description: "Ensure directory import and export statements use index.js"
     },
     fixable: "code",
-    schema: []
+    schema: [],
+    messages: {
+      requireExtension: "Directory imports and exports must use index.js."
+    }
   },
+  defaultOptions: [],
   create(context) {
     function checkSource(source) {
       const importPath = source.value;
@@ -344,7 +361,7 @@ const requireIndexRule = {
       if (isDirectory) {
         context.report({
           node: source,
-          message: "Directory imports and exports must use index.js.",
+          messageId: "requireExtension",
           fix(fixer) {
             const fixedPath = importPath.replace(/\/?$/, "/index.js");
             return fixer.replaceText(source, `'${fixedPath}'`);
@@ -366,9 +383,9 @@ const requireIndexRule = {
       }
     };
   }
-};
+});
 
-const base$7 = {
+const base$8 = {
   plugins: {
     "decent-extension": {
       meta: {
@@ -386,6 +403,25 @@ const base$7 = {
     "decent-extension/require-index": "error"
   }
 };
+const configs$8 = {
+  base: base$8
+};
+
+const base$7 = {
+  plugins: {
+    import: importPlugin__default
+  },
+  rules: {
+    "import/order": [
+      "error",
+      {
+        "newlines-between": "always",
+        alphabetize: { order: "asc", caseInsensitive: true },
+        pathGroupsExcludedImportTypes: ["builtin"]
+      }
+    ]
+  }
+};
 const configs$7 = {
   base: base$7
 };
@@ -403,6 +439,7 @@ const base$6 = {
     }
   },
   plugins: {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     jsdoc: jsdoc__default
   },
   rules: {
@@ -680,6 +717,7 @@ function defaultConfig(options) {
       name: "eslint-config-decent/base",
       files: ["**/*.ts", "**/*.js", "**/*.cjs", "**/*.mjs", "**/*.tsx"],
       plugins: {
+        ...configs$8.base.plugins,
         ...configs$7.base.plugins,
         ...configs$6.base.plugins,
         ...configs$4.base.plugins,
@@ -687,8 +725,9 @@ function defaultConfig(options) {
         ...configs.base.plugins
       },
       rules: {
-        ...configs$8.base.rules,
-        ...enableRequireExtensionRule ? configs$7.base.rules : {},
+        ...configs$9.base.rules,
+        ...enableRequireExtensionRule ? configs$8.base.rules : {},
+        ...configs$7.base.rules,
         ...configs$6.base.rules,
         ...configs$4.base.rules,
         ...configs$2.base.rules,
@@ -711,7 +750,7 @@ function defaultConfig(options) {
       languageOptions: {
         sourceType: "script"
       },
-      ...configs$8.cjsAndEsm
+      ...configs$9.cjsAndEsm
     },
     {
       name: "eslint-config-decent/cjs",
@@ -719,7 +758,7 @@ function defaultConfig(options) {
       languageOptions: {
         sourceType: "script"
       },
-      ...configs$8.cjs
+      ...configs$9.cjs
     },
     {
       name: "eslint-config-decent/tests",
@@ -731,7 +770,8 @@ function defaultConfig(options) {
 }
 
 exports.defaultConfig = defaultConfig;
-exports.eslintConfigs = configs$8;
+exports.eslintConfigs = configs$9;
+exports.importConfigs = configs$7;
 exports.jsdocConfigs = configs$6;
 exports.promiseConfigs = configs$4;
 exports.reactConfigs = configs$3;

package/dist/index.d.cts

@@ -1,33 +1,38 @@
 import { ConfigWithExtends } from 'typescript-eslint';
+import { TSESLint } from '@typescript-eslint/utils';
+
+declare const configs$7: {
+    base: TSESLint.FlatConfig.Config;
+    cjsAndEsm: TSESLint.FlatConfig.Config;
+    cjs: TSESLint.FlatConfig.Config;
+};
 
 declare const configs$6: {
-    base: ConfigWithExtends;
-    cjsAndEsm: ConfigWithExtends;
-    cjs: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$5: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$4: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$3: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$2: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$1: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 interface DefaultConfigOptions {
@@ -36,4 +41,4 @@ interface DefaultConfigOptions {
 }
 declare function defaultConfig(options?: DefaultConfigOptions): ConfigWithExtends[];
 
-export { type DefaultConfigOptions, defaultConfig, configs$6 as eslintConfigs, configs$5 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };
+export { type DefaultConfigOptions, defaultConfig, configs$7 as eslintConfigs, configs$6 as importConfigs, configs$5 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };

package/dist/index.d.mts

@@ -1,33 +1,38 @@
 import { ConfigWithExtends } from 'typescript-eslint';
+import { TSESLint } from '@typescript-eslint/utils';
+
+declare const configs$7: {
+    base: TSESLint.FlatConfig.Config;
+    cjsAndEsm: TSESLint.FlatConfig.Config;
+    cjs: TSESLint.FlatConfig.Config;
+};
 
 declare const configs$6: {
-    base: ConfigWithExtends;
-    cjsAndEsm: ConfigWithExtends;
-    cjs: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$5: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$4: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$3: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$2: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$1: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 interface DefaultConfigOptions {
@@ -36,4 +41,4 @@ interface DefaultConfigOptions {
 }
 declare function defaultConfig(options?: DefaultConfigOptions): ConfigWithExtends[];
 
-export { type DefaultConfigOptions, defaultConfig, configs$6 as eslintConfigs, configs$5 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };
+export { type DefaultConfigOptions, defaultConfig, configs$7 as eslintConfigs, configs$6 as importConfigs, configs$5 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };

package/dist/index.d.ts

@@ -1,33 +1,38 @@
 import { ConfigWithExtends } from 'typescript-eslint';
+import { TSESLint } from '@typescript-eslint/utils';
+
+declare const configs$7: {
+    base: TSESLint.FlatConfig.Config;
+    cjsAndEsm: TSESLint.FlatConfig.Config;
+    cjs: TSESLint.FlatConfig.Config;
+};
 
 declare const configs$6: {
-    base: ConfigWithExtends;
-    cjsAndEsm: ConfigWithExtends;
-    cjs: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$5: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$4: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$3: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$2: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs$1: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 declare const configs: {
-    base: ConfigWithExtends;
+    base: TSESLint.FlatConfig.Config;
 };
 
 interface DefaultConfigOptions {
@@ -36,4 +41,4 @@ interface DefaultConfigOptions {
 }
 declare function defaultConfig(options?: DefaultConfigOptions): ConfigWithExtends[];
 
-export { type DefaultConfigOptions, defaultConfig, configs$6 as eslintConfigs, configs$5 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };
+export { type DefaultConfigOptions, defaultConfig, configs$7 as eslintConfigs, configs$6 as importConfigs, configs$5 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };

package/dist/index.mjs

@@ -1,9 +1,11 @@
 import eslint from '@eslint/js';
+import prettier from 'eslint-plugin-prettier/recommended';
 import globals from 'globals';
 import tsEslint from 'typescript-eslint';
-import prettier from 'eslint-plugin-prettier/recommended';
 import { existsSync, lstatSync } from 'fs';
 import { resolve, dirname } from 'path';
+import { ESLintUtils } from '@typescript-eslint/utils';
+import importPlugin from 'eslint-plugin-import-x';
 import jsdoc from 'eslint-plugin-jsdoc';
 import mocha from 'eslint-plugin-mocha';
 import promise from 'eslint-plugin-promise';
@@ -14,7 +16,7 @@ import testingLibrary from 'eslint-plugin-testing-library';
 import security from 'eslint-plugin-security';
 import unicorn from 'eslint-plugin-unicorn';
 
-const base$8 = {
+const base$9 = {
   rules: {
     "array-callback-return": ["error", { allowImplicit: true }],
     "block-scoped-var": "error",
@@ -211,6 +213,14 @@ const base$8 = {
       }
     ],
     "prefer-template": "error",
+    "sort-imports": [
+      "error",
+      {
+        ignoreCase: true,
+        ignoreDeclarationSort: true,
+        allowSeparatedGroups: true
+      }
+    ],
     "symbol-description": "error",
     "unicode-bom": ["error", "never"],
     "vars-on-top": "error",
@@ -256,34 +266,37 @@ const cjs = {
     strict: ["error", "global"]
   }
 };
-const configs$8 = {
-  base: base$8,
+const configs$9 = {
+  base: base$9,
   cjsAndEsm,
   cjs
 };
 
-const requireExtensionRule = {
+const requireExtensionRule = ESLintUtils.RuleCreator(() => "https://github.com/jgeurts/eslint-config-decent/tree/main/src/rules/requireExtensionRule.ts")({
+  name: "require-extension",
   meta: {
     type: "suggestion",
     docs: {
-      description: "Ensure import and export statements include a file extension",
-      category: "Best Practices",
-      recommended: true
+      description: "Ensure import and export statements include a file extension"
     },
     fixable: "code",
-    schema: []
+    schema: [],
+    messages: {
+      requireExtension: "Relative imports and exports must include a file extension."
+    }
   },
+  defaultOptions: [],
   create(context) {
     function checkSource(source) {
       const importPath = source.value;
       if (!importPath || !importPath.startsWith(".") || importPath.endsWith(".js")) {
         return;
       }
-      const resolvedPath = resolve(dirname(context.filename), importPath);
+      const resolvedPath = resolve(dirname(context.getFilename()), importPath);
       if (!existsSync(resolvedPath)) {
         context.report({
           node: source,
-          message: "Relative imports and exports must include a file extension.",
+          messageId: "requireExtension",
           fix(fixer) {
             const fixedPath = `${importPath}.js`;
             return fixer.replaceText(source, `'${fixedPath}'`);
@@ -305,19 +318,22 @@ const requireExtensionRule = {
       }
     };
   }
-};
+});
 
-const requireIndexRule = {
+const requireIndexRule = ESLintUtils.RuleCreator(() => "https://github.com/jgeurts/eslint-config-decent/tree/main/src/rules/requireIndexRule.ts")({
+  name: "require-index",
   meta: {
     type: "suggestion",
     docs: {
-      description: "Ensure directory import and export statements use index.js",
-      category: "Best Practices",
-      recommended: true
+      description: "Ensure directory import and export statements use index.js"
     },
     fixable: "code",
-    schema: []
+    schema: [],
+    messages: {
+      requireExtension: "Directory imports and exports must use index.js."
+    }
   },
+  defaultOptions: [],
   create(context) {
     function checkSource(source) {
       const importPath = source.value;
@@ -326,7 +342,7 @@ const requireIndexRule = {
       if (isDirectory) {
         context.report({
           node: source,
-          message: "Directory imports and exports must use index.js.",
+          messageId: "requireExtension",
           fix(fixer) {
             const fixedPath = importPath.replace(/\/?$/, "/index.js");
             return fixer.replaceText(source, `'${fixedPath}'`);
@@ -348,9 +364,9 @@ const requireIndexRule = {
       }
     };
   }
-};
+});
 
-const base$7 = {
+const base$8 = {
   plugins: {
     "decent-extension": {
       meta: {
@@ -368,6 +384,25 @@ const base$7 = {
     "decent-extension/require-index": "error"
   }
 };
+const configs$8 = {
+  base: base$8
+};
+
+const base$7 = {
+  plugins: {
+    import: importPlugin
+  },
+  rules: {
+    "import/order": [
+      "error",
+      {
+        "newlines-between": "always",
+        alphabetize: { order: "asc", caseInsensitive: true },
+        pathGroupsExcludedImportTypes: ["builtin"]
+      }
+    ]
+  }
+};
 const configs$7 = {
   base: base$7
 };
@@ -385,6 +420,7 @@ const base$6 = {
     }
   },
   plugins: {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     jsdoc
   },
   rules: {
@@ -662,6 +698,7 @@ function defaultConfig(options) {
       name: "eslint-config-decent/base",
       files: ["**/*.ts", "**/*.js", "**/*.cjs", "**/*.mjs", "**/*.tsx"],
       plugins: {
+        ...configs$8.base.plugins,
         ...configs$7.base.plugins,
         ...configs$6.base.plugins,
         ...configs$4.base.plugins,
@@ -669,8 +706,9 @@ function defaultConfig(options) {
         ...configs.base.plugins
       },
       rules: {
-        ...configs$8.base.rules,
-        ...enableRequireExtensionRule ? configs$7.base.rules : {},
+        ...configs$9.base.rules,
+        ...enableRequireExtensionRule ? configs$8.base.rules : {},
+        ...configs$7.base.rules,
         ...configs$6.base.rules,
         ...configs$4.base.rules,
         ...configs$2.base.rules,
@@ -693,7 +731,7 @@ function defaultConfig(options) {
       languageOptions: {
         sourceType: "script"
       },
-      ...configs$8.cjsAndEsm
+      ...configs$9.cjsAndEsm
     },
     {
       name: "eslint-config-decent/cjs",
@@ -701,7 +739,7 @@ function defaultConfig(options) {
       languageOptions: {
         sourceType: "script"
       },
-      ...configs$8.cjs
+      ...configs$9.cjs
     },
     {
       name: "eslint-config-decent/tests",
@@ -712,4 +750,4 @@ function defaultConfig(options) {
   ];
 }
 
-export { defaultConfig, configs$8 as eslintConfigs, configs$6 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };
+export { defaultConfig, configs$9 as eslintConfigs, configs$7 as importConfigs, configs$6 as jsdocConfigs, configs$4 as promiseConfigs, configs$3 as reactConfigs, configs$2 as securityConfigs, configs$1 as typescriptEslintConfigs, configs as unicornConfigs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-decent",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A decent ESLint configuration",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -72,31 +72,33 @@
     "node": ">=20.11.0"
   },
   "dependencies": {
-    "@eslint/js": "^9.6.0",
+    "@eslint/js": "^9.7.0",
+    "@typescript-eslint/utils": "8.0.0-alpha.46",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import-x": "^3.0.1",
     "eslint-plugin-jsdoc": "^48.7.0",
+    "eslint-plugin-jsx-a11y": "^6.9.0",
     "eslint-plugin-mocha": "^10.4.3",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-promise": "^6.4.0",
-    "eslint-plugin-jsx-a11y": "^6.9.0",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint-plugin-react": "^7.34.4",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-security": "^3.0.1",
     "eslint-plugin-testing-library": "^6.2.2",
     "eslint-plugin-unicorn": "^54.0.0",
     "globals": "^15.8.0",
-    "typescript-eslint": "8.0.0-alpha.41"
+    "typescript-eslint": "8.0.0-alpha.46"
   },
   "devDependencies": {
-    "@swc/core": "1.6.13",
+    "@swc/core": "1.7.0",
     "@types/node": ">=20",
-    "eslint": "^9.6.0",
-    "husky": "^9.0.11",
+    "eslint": "^9.7.0",
+    "husky": "^9.1.1",
     "lint-staged": "^15.2.7",
     "markdownlint-cli": "^0.41.0",
     "npm-run-all": "^4.1.5",
     "pinst": "^3.0.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "typescript": "^5.5.3",
     "unbuild": "2.0.0"
   },

package/src/eslint.ts

@@ -1,6 +1,6 @@
-import type { ConfigWithExtends } from 'typescript-eslint';
+import type { TSESLint } from '@typescript-eslint/utils';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   rules: {
     'array-callback-return': ['error', { allowImplicit: true }],
     'block-scoped-var': 'error',
@@ -194,6 +194,14 @@ const base: ConfigWithExtends = {
       },
     ],
     'prefer-template': 'error',
+    'sort-imports': [
+      'error',
+      {
+        ignoreCase: true,
+        ignoreDeclarationSort: true,
+        allowSeparatedGroups: true,
+      },
+    ],
     'symbol-description': 'error',
     'unicode-bom': ['error', 'never'],
     'vars-on-top': 'error',
@@ -201,7 +209,7 @@ const base: ConfigWithExtends = {
   },
 };
 
-const cjsAndEsm: ConfigWithExtends = {
+const cjsAndEsm: TSESLint.FlatConfig.Config = {
   rules: {
     curly: ['error', 'multi-line'],
     'dot-notation': ['error', { allowKeywords: true }],
@@ -236,7 +244,7 @@ const cjsAndEsm: ConfigWithExtends = {
   },
 };
 
-const cjs: ConfigWithExtends = {
+const cjs: TSESLint.FlatConfig.Config = {
   rules: {
     strict: ['error', 'global'],
   },

package/src/extension.ts

@@ -1,8 +1,9 @@
-import type { ConfigWithExtends } from 'typescript-eslint';
+import type { TSESLint } from '@typescript-eslint/utils';
+
 import { requireExtensionRule } from './rules/requireExtensionRule.js';
 import { requireIndexRule } from './rules/requireIndexRule.js';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   plugins: {
     'decent-extension': {
       meta: {

package/src/import.ts

@@ -0,0 +1,26 @@
+import type { TSESLint } from '@typescript-eslint/utils';
+import importPlugin from 'eslint-plugin-import-x';
+
+const base: TSESLint.FlatConfig.Config = {
+  plugins: {
+    import: importPlugin,
+  },
+  rules: {
+    'import/order': [
+      'error',
+      {
+        'newlines-between': 'always',
+        alphabetize: { order: 'asc', caseInsensitive: true },
+        pathGroupsExcludedImportTypes: ['builtin'],
+      },
+    ],
+  },
+};
+
+export const configs = {
+  base,
+};
+
+export default {
+  configs,
+};

package/src/index.ts

@@ -1,9 +1,11 @@
 import eslint from '@eslint/js';
+import prettier from 'eslint-plugin-prettier/recommended';
 import globals from 'globals';
 import tsEslint, { type ConfigWithExtends } from 'typescript-eslint';
-import prettier from 'eslint-plugin-prettier/recommended';
+
 import { configs as eslintConfigs } from './eslint.js';
 import { configs as extensionConfigs } from './extension.js';
+import { configs as importConfigs } from './import.js';
 import { configs as jsdocConfigs } from './jsdoc.js';
 import { configs as mochaConfigs } from './mocha.js';
 import { configs as promiseConfigs } from './promise.js';
@@ -14,6 +16,7 @@ import { configs as unicornConfigs } from './unicorn.js';
 
 export {
   eslintConfigs, //
+  importConfigs,
   jsdocConfigs,
   promiseConfigs,
   reactConfigs,
@@ -42,6 +45,7 @@ export function defaultConfig(options?: DefaultConfigOptions): ConfigWithExtends
     },
   };
 
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return [
     {
       ignores: ['**/dist/**', '**/node_modules/**'],
@@ -75,6 +79,7 @@ export function defaultConfig(options?: DefaultConfigOptions): ConfigWithExtends
       files: ['**/*.ts', '**/*.js', '**/*.cjs', '**/*.mjs', '**/*.tsx'],
       plugins: {
         ...extensionConfigs.base.plugins,
+        ...importConfigs.base.plugins,
         ...jsdocConfigs.base.plugins,
         ...promiseConfigs.base.plugins,
         ...securityConfigs.base.plugins,
@@ -83,6 +88,7 @@ export function defaultConfig(options?: DefaultConfigOptions): ConfigWithExtends
       rules: {
         ...eslintConfigs.base.rules,
         ...(enableRequireExtensionRule ? extensionConfigs.base.rules : {}),
+        ...importConfigs.base.rules,
         ...jsdocConfigs.base.rules,
         ...promiseConfigs.base.rules,
         ...securityConfigs.base.rules,

package/src/jsdoc.ts

@@ -1,7 +1,7 @@
+import type { TSESLint } from '@typescript-eslint/utils';
 import jsdoc from 'eslint-plugin-jsdoc';
-import type { ConfigWithExtends } from 'typescript-eslint';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   settings: {
     jsdoc: {
       preferredTypes: {
@@ -14,6 +14,7 @@ const base: ConfigWithExtends = {
     },
   },
   plugins: {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     jsdoc,
   },
   rules: {

package/src/mocha.ts

@@ -1,7 +1,7 @@
+import type { TSESLint } from '@typescript-eslint/utils';
 import mocha from 'eslint-plugin-mocha';
-import type { ConfigWithExtends } from 'typescript-eslint';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   plugins: {
     mocha,
   },

package/src/promise.ts

@@ -1,7 +1,7 @@
+import type { TSESLint } from '@typescript-eslint/utils';
 import promise from 'eslint-plugin-promise';
-import type { ConfigWithExtends } from 'typescript-eslint';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   plugins: {
     promise,
   },

package/src/react.ts

@@ -1,10 +1,10 @@
+import type { TSESLint } from '@typescript-eslint/utils';
 import a11y from 'eslint-plugin-jsx-a11y';
 import react from 'eslint-plugin-react';
 import reactHooks from 'eslint-plugin-react-hooks';
 import testingLibrary from 'eslint-plugin-testing-library';
-import type { ConfigWithExtends } from 'typescript-eslint';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   plugins: {
     'jsx-a11y': a11y,
     react,

package/src/rules/requireExtensionRule.ts

@@ -1,34 +1,42 @@
 import { existsSync } from 'fs';
 import { dirname, resolve } from 'path';
-import type { Rule } from 'eslint';
 
-export const requireExtensionRule: Rule.RuleModule = {
+import type { TSESTree } from '@typescript-eslint/utils';
+import { ESLintUtils } from '@typescript-eslint/utils';
+
+type Options = [];
+type MessageIds = 'requireExtension';
+
+export const requireExtensionRule = ESLintUtils.RuleCreator(() => 'https://github.com/jgeurts/eslint-config-decent/tree/main/src/rules/requireExtensionRule.ts')<Options, MessageIds>({
+  name: 'require-extension',
   meta: {
     type: 'suggestion',
     docs: {
       description: 'Ensure import and export statements include a file extension',
-      category: 'Best Practices',
-      recommended: true,
     },
     fixable: 'code',
     schema: [],
+    messages: {
+      requireExtension: 'Relative imports and exports must include a file extension.',
+    },
   },
-  create(context: Rule.RuleContext) {
-    function checkSource(source: Parameters<NonNullable<Rule.NodeListener['ImportDeclaration']>>[0]['source']): void {
-      const importPath = source.value as string;
+  defaultOptions: [],
+  create(context) {
+    function checkSource(source: TSESTree.StringLiteral): void {
+      const importPath = source.value;
 
       if (!importPath || !importPath.startsWith('.') || importPath.endsWith('.js')) {
         return;
       }
 
-      const resolvedPath = resolve(dirname(context.filename), importPath);
+      const resolvedPath = resolve(dirname(context.getFilename()), importPath);
 
       // If the import/export path doesn't end with a file extension, report an error
       // eslint-disable-next-line security/detect-non-literal-fs-filename
       if (!existsSync(resolvedPath)) {
         context.report({
           node: source,
-          message: 'Relative imports and exports must include a file extension.',
+          messageId: 'requireExtension',
           fix(fixer) {
             const fixedPath = `${importPath}.js`;
             return fixer.replaceText(source, `'${fixedPath}'`);
@@ -38,17 +46,17 @@ export const requireExtensionRule: Rule.RuleModule = {
     }
 
     return {
-      ImportDeclaration(node: Parameters<NonNullable<Rule.NodeListener['ImportDeclaration']>>[0]): void {
+      ImportDeclaration(node: TSESTree.ImportDeclaration): void {
         checkSource(node.source);
       },
-      ExportNamedDeclaration(node: Parameters<NonNullable<Rule.NodeListener['ExportNamedDeclaration']>>[0]): void {
+      ExportNamedDeclaration(node: TSESTree.ExportNamedDeclaration): void {
         if (node.source) {
           checkSource(node.source);
         }
       },
-      ExportAllDeclaration(node: Parameters<NonNullable<Rule.NodeListener['ExportAllDeclaration']>>[0]): void {
+      ExportAllDeclaration(node: TSESTree.ExportAllDeclaration): void {
         checkSource(node.source);
       },
     };
   },
-};
+});

package/src/rules/requireIndexRule.ts

@@ -1,31 +1,40 @@
 import { existsSync, lstatSync } from 'fs';
-import { resolve, dirname } from 'path';
-import type { Rule } from 'eslint';
+import { dirname, resolve } from 'path';
 
-export const requireIndexRule: Rule.RuleModule = {
+import type { TSESTree } from '@typescript-eslint/utils';
+import { ESLintUtils } from '@typescript-eslint/utils';
+
+type Options = [];
+type MessageIds = 'requireExtension';
+
+export const requireIndexRule = ESLintUtils.RuleCreator(() => 'https://github.com/jgeurts/eslint-config-decent/tree/main/src/rules/requireIndexRule.ts')<Options, MessageIds>({
+  name: 'require-index',
   meta: {
     type: 'suggestion',
     docs: {
       description: 'Ensure directory import and export statements use index.js',
-      category: 'Best Practices',
-      recommended: true,
     },
     fixable: 'code',
     schema: [],
+    messages: {
+      requireExtension: 'Directory imports and exports must use index.js.',
+    },
   },
-  create(context: Rule.RuleContext) {
-    function checkSource(source: Parameters<NonNullable<Rule.NodeListener['ImportDeclaration']>>[0]['source']): void {
-      const importPath = source.value as string;
+  defaultOptions: [],
+  create(context) {
+    function checkSource(source: TSESTree.StringLiteral): void {
+      const importPath = source.value;
 
       // Resolve the path relative to the file being linted
       const resolvedPath = resolve(dirname(context.filename), importPath);
 
       // eslint-disable-next-line security/detect-non-literal-fs-filename
       const isDirectory = existsSync(resolvedPath) && lstatSync(resolvedPath).isDirectory();
+      // If the import/export path doesn't end with a file extension, report an error
       if (isDirectory) {
         context.report({
           node: source,
-          message: 'Directory imports and exports must use index.js.',
+          messageId: 'requireExtension',
           fix(fixer) {
             const fixedPath = importPath.replace(/\/?$/, '/index.js');
             return fixer.replaceText(source, `'${fixedPath}'`);
@@ -35,17 +44,17 @@ export const requireIndexRule: Rule.RuleModule = {
     }
 
     return {
-      ImportDeclaration(node: Parameters<NonNullable<Rule.NodeListener['ImportDeclaration']>>[0]): void {
+      ImportDeclaration(node: TSESTree.ImportDeclaration): void {
         checkSource(node.source);
       },
-      ExportNamedDeclaration(node: Parameters<NonNullable<Rule.NodeListener['ExportNamedDeclaration']>>[0]): void {
+      ExportNamedDeclaration(node: TSESTree.ExportNamedDeclaration): void {
         if (node.source) {
           checkSource(node.source);
         }
       },
-      ExportAllDeclaration(node: Parameters<NonNullable<Rule.NodeListener['ExportAllDeclaration']>>[0]): void {
+      ExportAllDeclaration(node: TSESTree.ExportAllDeclaration): void {
         checkSource(node.source);
       },
     };
   },
-};
+});

package/src/security.ts

@@ -1,7 +1,7 @@
+import type { TSESLint } from '@typescript-eslint/utils';
 import security from 'eslint-plugin-security';
-import type { ConfigWithExtends } from 'typescript-eslint';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   plugins: {
     security,
   },

package/src/types/eslint-js.d.ts

@@ -1,8 +1,8 @@
 declare module '@eslint/js' {
-  import type { ESLint, Linter } from 'eslint';
-  const value: ESLint.Plugin & {
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin & {
     configs: {
-      recommended: Linter.FlatConfig;
+      recommended: TSESLint.FlatConfig.Config;
     };
   };
   export default value;

package/src/types/eslint-plugin-jsx-a11y.d.ts

@@ -1,8 +1,8 @@
 declare module 'eslint-plugin-jsx-a11y' {
-  import type { ESLint, Linter } from 'eslint';
-  const value: ESLint.Plugin & {
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin & {
     configs: {
-      recommended: Linter.FlatConfig;
+      recommended: TSESLint.FlatConfig.Config;
     };
   };
   export default value;

package/src/types/eslint-plugin-mocha.d.ts

@@ -1,8 +1,8 @@
 declare module 'eslint-plugin-mocha' {
-  import type { ESLint, Linter } from 'eslint';
-  const value: ESLint.Plugin & {
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin & {
     configs: {
-      recommended: Linter.FlatConfig;
+      recommended: TSESLint.FlatConfig.Config;
     };
   };
   export default value;

package/src/types/eslint-plugin-promise.d.ts

@@ -1,5 +1,5 @@
 declare module 'eslint-plugin-promise' {
-  import type { ESLint } from 'eslint';
-  const value: ESLint.Plugin;
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin;
   export default value;
 }

package/src/types/eslint-plugin-react-hooks.d.ts

@@ -1,5 +1,5 @@
 declare module 'eslint-plugin-react-hooks' {
-  import type { ESLint } from 'eslint';
-  const value: ESLint.Plugin;
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin;
   export default value;
 }

package/src/types/eslint-plugin-react.d.ts

@@ -1,8 +1,8 @@
 declare module 'eslint-plugin-react' {
-  import type { ESLint, Linter } from 'eslint';
-  const value: ESLint.Plugin & {
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin & {
     configs: {
-      recommended: Linter.FlatConfig;
+      recommended: TSESLint.FlatConfig.Config;
     };
   };
   export default value;

package/src/types/eslint-plugin-security.d.ts

@@ -1,5 +1,5 @@
 declare module 'eslint-plugin-security' {
-  import type { ESLint } from 'eslint';
-  const value: ESLint.Plugin;
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin;
   export default value;
 }

package/src/types/eslint-plugin-testing-library.d.ts

@@ -1,8 +1,8 @@
 declare module 'eslint-plugin-testing-library' {
-  import type { ESLint, Linter } from 'eslint';
-  const value: ESLint.Plugin & {
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin & {
     configs: {
-      react: Linter.FlatConfig;
+      react: TSESLint.FlatConfig.Config;
     };
   };
   export default value;

package/src/types/eslint-plugin-unicorn.d.ts

@@ -1,5 +1,5 @@
 declare module 'eslint-plugin-unicorn' {
-  import type { ESLint } from 'eslint';
-  const value: ESLint.Plugin;
+  import type { TSESLint } from '@typescript-eslint/utils';
+  const value: TSESLint.FlatConfig.Plugin;
   export default value;
 }

package/src/typescriptEslint.ts

@@ -1,6 +1,6 @@
-import type { ConfigWithExtends } from 'typescript-eslint';
+import type { TSESLint } from '@typescript-eslint/utils';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   rules: {
     'no-loss-of-precision': 'off',
     'no-loop-func': 'off',

package/src/unicorn.ts

@@ -1,7 +1,7 @@
+import type { TSESLint } from '@typescript-eslint/utils';
 import unicorn from 'eslint-plugin-unicorn';
-import type { ConfigWithExtends } from 'typescript-eslint';
 
-const base: ConfigWithExtends = {
+const base: TSESLint.FlatConfig.Config = {
   plugins: {
     unicorn,
   },