@deot/dev-eslint 2.8.4 → 2.9.1

package/dist/index.cjs

@@ -8,7 +8,7 @@ const js = require('@eslint/js');
 const globals = require('globals');
 const pluginJsdoc = require('eslint-plugin-jsdoc');
 const pluginMarkdown = require('eslint-plugin-markdown');
-const pluginImport = require('eslint-plugin-import');
+const pluginImport = require('eslint-plugin-import-x');
 const pluginStylistic = require('@stylistic/eslint-plugin');
 
 function _interopNamespaceDefault(e) {
@@ -95,7 +95,6 @@ const typescript = async (options$) => {
     "@typescript-eslint/no-shadow": 2,
     // https://github.com/typescript-eslint/typescript-eslint/issues/2483
     "@typescript-eslint/no-unused-vars": 1,
-    "@typescript-eslint/member-delimiter-style": 1,
     // ignore duplicate rules
     "no-unused-vars": 0
   };
@@ -206,7 +205,7 @@ const markdown = async (options$) => {
   if (!options.enable) {
     return [];
   }
-  const config = pluginMarkdown.configs.recommended.overrides[1];
+  const config = pluginMarkdown.configs.recommended[2];
   return [
     {
       plugins: {
@@ -283,14 +282,18 @@ const imports = async (options$) => {
   const recommendedRules = pluginImport.configs.recommended.rules;
   const rules = {
     ...recommendedRules,
-    "import/newline-after-import": 1,
-    "import/no-unresolved": 0
+    "import-x/newline-after-import": 1,
+    "import-x/no-unresolved": 0,
+    "import-x/namespace": 0,
+    "import-x/default": 0,
+    "import-x/no-named-as-default": 0,
+    "import-x/no-named-as-default-member": 0
   };
   return [
     // 单独安装plugins,
     {
       plugins: {
-        import: pluginImport
+        "import-x": pluginImport
       },
       settings: {
         "import/parsers": {
@@ -303,7 +306,7 @@ const imports = async (options$) => {
         ...cleanRules(
           "import",
           Object.keys(pluginImport.rules).reduce((pre, key) => {
-            pre[`import/${key}`] = 2;
+            pre[`import-x/${key}`] = 2;
             return pre;
           }, {}),
           recommendedRules,
@@ -340,7 +343,8 @@ const stylistic = async (options$) => {
       allowSingleLine: true
     }],
     "@stylistic/member-delimiter-style": 1,
-    "@stylistic/max-statements-per-line": ["off", { max: 1 }]
+    "@stylistic/max-statements-per-line": ["off", { max: 1 }],
+    "@stylistic/max-len": [1, { code: 150 }]
   };
   return [
     // 单独安装plugins, 方便扩展

package/dist/index.js

@@ -4,7 +4,7 @@ import js from '@eslint/js';
 import globals from 'globals';
 import pluginJsdoc from 'eslint-plugin-jsdoc';
 import pluginMarkdown from 'eslint-plugin-markdown';
-import pluginImport from 'eslint-plugin-import';
+import pluginImport from 'eslint-plugin-import-x';
 import pluginStylistic from '@stylistic/eslint-plugin';
 
 const pickOptions = async (key, options) => {
@@ -72,7 +72,6 @@ const typescript = async (options$) => {
     "@typescript-eslint/no-shadow": 2,
     // https://github.com/typescript-eslint/typescript-eslint/issues/2483
     "@typescript-eslint/no-unused-vars": 1,
-    "@typescript-eslint/member-delimiter-style": 1,
     // ignore duplicate rules
     "no-unused-vars": 0
   };
@@ -183,7 +182,7 @@ const markdown = async (options$) => {
   if (!options.enable) {
     return [];
   }
-  const config = pluginMarkdown.configs.recommended.overrides[1];
+  const config = pluginMarkdown.configs.recommended[2];
   return [
     {
       plugins: {
@@ -260,14 +259,18 @@ const imports = async (options$) => {
   const recommendedRules = pluginImport.configs.recommended.rules;
   const rules = {
     ...recommendedRules,
-    "import/newline-after-import": 1,
-    "import/no-unresolved": 0
+    "import-x/newline-after-import": 1,
+    "import-x/no-unresolved": 0,
+    "import-x/namespace": 0,
+    "import-x/default": 0,
+    "import-x/no-named-as-default": 0,
+    "import-x/no-named-as-default-member": 0
   };
   return [
     // 单独安装plugins,
     {
       plugins: {
-        import: pluginImport
+        "import-x": pluginImport
       },
       settings: {
         "import/parsers": {
@@ -280,7 +283,7 @@ const imports = async (options$) => {
         ...cleanRules(
           "import",
           Object.keys(pluginImport.rules).reduce((pre, key) => {
-            pre[`import/${key}`] = 2;
+            pre[`import-x/${key}`] = 2;
             return pre;
           }, {}),
           recommendedRules,
@@ -317,7 +320,8 @@ const stylistic = async (options$) => {
       allowSingleLine: true
     }],
     "@stylistic/member-delimiter-style": 1,
-    "@stylistic/max-statements-per-line": ["off", { max: 1 }]
+    "@stylistic/max-statements-per-line": ["off", { max: 1 }],
+    "@stylistic/max-len": [1, { code: 150 }]
   };
   return [
     // 单独安装plugins, 方便扩展

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@deot/dev-eslint",
-  "version": "2.8.4",
+  "version": "2.9.1",
   "main": "dist/index.js",
   "type": "module",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "files": [
@@ -19,16 +19,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@stylistic/eslint-plugin": "^1.5.1",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jsdoc": "^46.9.1",
-    "eslint-plugin-markdown": "^3.0.1",
-    "globals": "^13.24.0"
+    "@stylistic/eslint-plugin": "^4.2.0",
+    "@typescript-eslint/eslint-plugin": "^8.29.0",
+    "@typescript-eslint/parser": "^8.29.0",
+    "eslint-plugin-import-x": "^4.10.0",
+    "eslint-plugin-jsdoc": "^50.6.9",
+    "eslint-plugin-markdown": "^5.1.0",
+    "globals": "^16.0.0"
   },
   "devDependencies": {
-    "@types/eslint": "^8.44.9",
-    "eslint": "^8.55.0"
+    "@types/eslint": "^9.6.1",
+    "eslint": "^9.23.0"
   }
 }