@agilebot/eslint-config 0.3.9 → 0.3.10

package/dist/cli.js

@@ -1,5 +1,5 @@
 /**
- * @license @agilebot/eslint-config v0.3.9
+ * @license @agilebot/eslint-config v0.3.10
  *
  * Copyright (c) Agilebot, Inc. and its affiliates.
  *
@@ -48,21 +48,12 @@ var import_node_fs = __toESM(require("fs"));
 var import_node_path = __toESM(require("path"));
 var import_eslint_utils = require("@agilebot/eslint-utils");
 
-// src/factory/constants.ts
-var defaultExtensions = [
-  ".js",
-  ".jsx",
-  ".ts",
-  ".tsx",
-  ".cjs",
-  ".mjs",
-  ".cts",
-  ".mts",
-  ".vue"
-];
-
-// src/cli/constants.ts
-var isEslint = /^\.eslint.*/;
+// src/constants.ts
+var JS_EXTS = [".js", ".jsx", ".cjs", ".cjsx", ".mjs", ".mjsx"];
+var TS_EXTS = [".ts", ".tsx", ".cts", ".ctsx", ".mts", ".mtsx"];
+var VUE_EXTS = [".vue"];
+var DEFAULT_EXTS = [...JS_EXTS, ...TS_EXTS, ...VUE_EXTS];
+var IS_ESLINT = /^\.eslint.*/;
 
 // src/cli/index.ts
 function cli() {
@@ -87,7 +78,7 @@ function cli() {
     process.argv.splice(2, 0, "--fix");
   }
   if (!has.ext) {
-    process.argv.splice(2, 0, "--ext", defaultExtensions.join(","));
+    process.argv.splice(2, 0, "--ext", DEFAULT_EXTS.join(","));
   }
   if (has.progress && !(0, import_eslint_utils.isCI)()) {
     process.argv.splice(
@@ -108,7 +99,7 @@ function cli() {
       throw err;
     }
     has.config = has.config || files.some((file) => {
-      return isEslint.test(file);
+      return IS_ESLINT.test(file);
     });
     if (!has.config) {
       throw new Error("No ESLint configuration file found");

package/dist/index.d.ts

@@ -45,7 +45,7 @@ interface FactoryOptions {
      * Flag indicating whether to enable GoDaddy configurations
      * @default undefined
      */
-    godaddy?: boolean;
+    godaddy?: boolean | 'typescript';
     /**
      * Flag indicating whether to enable JSDoc configurations
      * @default true

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @license @agilebot/eslint-config v0.3.9
+ * @license @agilebot/eslint-config v0.3.10
  *
  * Copyright (c) Agilebot, Inc. and its affiliates.
  *
@@ -59,16 +59,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tsup@8.0.2_postcss@8.4.38_ts-node@10.9.2_@types+node@20.11.28_typescript@5.4.5__typescript@5.4.5/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.1.0_postcss@8.4.39_ts-node@10.9.2_@types+node@20.11.28_typescript@5.4.5__typescript@5.4.5/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.0.2_postcss@8.4.38_ts-node@10.9.2_@types+node@20.11.28_typescript@5.4.5__typescript@5.4.5/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.1.0_postcss@8.4.39_ts-node@10.9.2_@types+node@20.11.28_typescript@5.4.5__typescript@5.4.5/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
   }
 });
 
-// ../../node_modules/.pnpm/eslint-config-love@47.0.0_@typescript-eslint+eslint-plugin@7.9.0_@typescript-eslint+parser@7._yewwkxdqextsdihbrotj7foatu/node_modules/eslint-config-love/lib/index.js
+// ../../node_modules/.pnpm/eslint-config-love@47.0.0_@typescript-eslint+eslint-plugin@7.16.0_@typescript-eslint+parser@7_bx3ud3a5a3wg7ark6pvzt2lrse/node_modules/eslint-config-love/lib/index.js
 var require_lib = __commonJS({
-  "../../node_modules/.pnpm/eslint-config-love@47.0.0_@typescript-eslint+eslint-plugin@7.9.0_@typescript-eslint+parser@7._yewwkxdqextsdihbrotj7foatu/node_modules/eslint-config-love/lib/index.js"(exports2, module2) {
+  "../../node_modules/.pnpm/eslint-config-love@47.0.0_@typescript-eslint+eslint-plugin@7.16.0_@typescript-eslint+parser@7_bx3ud3a5a3wg7ark6pvzt2lrse/node_modules/eslint-config-love/lib/index.js"(exports2, module2) {
     "use strict";
     init_cjs_shims();
     var eslint_1 = require("eslint");
@@ -520,9 +520,10 @@ function standard() {
       standardRules[key] = value;
     }
   });
+  const disabled = standardDisabled();
   return {
     plugins: ["@typescript-eslint", "import-x", "n", "promise"],
-    rules: __spreadProps(__spreadValues({}, standardRules), {
+    rules: __spreadValues(__spreadProps(__spreadValues({}, standardRules), {
       "no-alert": "error",
       // 找出TODO注释，以便后期修复
       "no-warning-comments": [
@@ -545,8 +546,13 @@ function standard() {
       "promise/valid-params": "error",
       "promise/no-multiple-resolved": "error",
       "promise/no-return-in-finally": "error",
-      "promise/prefer-await-to-then": "warn",
-      // 覆盖standard中的规则
+      "promise/prefer-await-to-then": "warn"
+    }), disabled.rules)
+  };
+}
+function standardDisabled() {
+  return {
+    rules: {
       "@typescript-eslint/no-confusing-void-expression": "off",
       "@typescript-eslint/space-before-function-paren": "off",
       "@typescript-eslint/unbound-method": "off",
@@ -557,9 +563,8 @@ function standard() {
       "@typescript-eslint/strict-boolean-expressions": "off",
       "@typescript-eslint/explicit-function-return-type": "off",
       "@typescript-eslint/restrict-template-expressions": "off",
-      "@typescript-eslint/explicit-member-accessibility": "off",
       "@typescript-eslint/no-unsafe-argument": "off"
-    })
+    }
   };
 }
 
@@ -666,6 +671,32 @@ function ts() {
     }
   };
 }
+function tsOnly() {
+  return {
+    rules: {
+      "@typescript-eslint/explicit-member-accessibility": "error"
+    }
+  };
+}
+function jsOnly() {
+  return {
+    rules: {
+      "@typescript-eslint/no-var-requires": "off"
+    }
+  };
+}
+function dts() {
+  return {
+    rules: {
+      // .d.ts中支持导入ts文件中的类型
+      "@typescript-eslint/consistent-type-imports": "off",
+      // .d.ts中忽略属性命名规则
+      "@typescript-eslint/naming-convention": "off",
+      // .d.ts中忽略三斜线引用
+      "@typescript-eslint/triple-slash-reference": "off"
+    }
+  };
+}
 
 // src/configs/imports.ts
 init_cjs_shims();
@@ -1123,27 +1154,21 @@ function godaddy() {
   };
 }
 
-// src/factory/constants.ts
+// src/constants.ts
 init_cjs_shims();
-var defaultExtensions = [
-  ".js",
-  ".jsx",
-  ".ts",
-  ".tsx",
-  ".cjs",
-  ".mjs",
-  ".cts",
-  ".mts",
-  ".vue"
-];
-var jsExtensions = [".js", ".jsx", ".cjs", ".mjs"];
-var tsExtensions = [".ts", ".tsx", ".cts", ".mts"];
-var dtsExtensions = [".d.ts", ".d.cts", ".d.mts"];
+var JS_EXTS = [".js", ".jsx", ".cjs", ".cjsx", ".mjs", ".mjsx"];
+var TS_EXTS = [".ts", ".tsx", ".cts", ".ctsx", ".mts", ".mtsx"];
+var DTS_EXTS = [".d.ts", ".d.cts", ".d.mts"];
+var VUE_EXTS = [".vue"];
+var DEFAULT_EXTS = [...JS_EXTS, ...TS_EXTS, ...VUE_EXTS];
 
 // src/factory/index.ts
 function factory(root, options) {
   var _a, _b, _c, _d, _e;
   import_node_assert.default.ok(root, "root option is required");
+  const tsconfigFiles = (0, import_eslint_utils3.findTsconfigFiles)(root, {
+    absolute: true
+  });
   const defaultOptions = {
     jsdoc: true,
     prettier: true,
@@ -1173,8 +1198,11 @@ function factory(root, options) {
     }) : {},
     options.prettier ? prettier() : {}
   ];
+  let config;
   if (options == null ? void 0 : options.godaddy) {
-    return (0, import_eslint_utils3.mergeESLintConfig)(
+    config = __spreadValues({
+      parser: options.godaddy === "typescript" ? "@typescript-eslint/parser" : void 0
+    }, (0, import_eslint_utils3.mergeESLintConfig)(
       godaddy(),
       (options == null ? void 0 : options.jsdoc) ? jsdoc({
         ts: false
@@ -1184,82 +1212,69 @@ function factory(root, options) {
         ts: false
       }) : {},
       (_b = options == null ? void 0 : options.config) != null ? _b : {}
-    );
-  }
-  const tsconfigFiles = (0, import_eslint_utils3.findTsconfigFiles)(root, {
-    absolute: true
-  });
-  const config = {
-    overrides: [
-      __spreadValues({
-        files: defaultExtensions.map((ext) => `*${ext}`),
-        parser: !(options == null ? void 0 : options.vue) ? "@typescript-eslint/parser" : "vue-eslint-parser",
-        parserOptions: {
-          parser: "@typescript-eslint/parser",
-          tsconfigRootDir: root,
-          ecmaFeatures: {
-            jsx: true
-          },
-          sourceType: options.module ? "module" : void 0,
-          extraFileExtensions: !(options == null ? void 0 : options.vue) ? void 0 : [".vue"]
-        }
-      }, (0, import_eslint_utils3.mergeESLintConfig)(
-        env(),
-        standard(),
-        // standard必须在ts之前
-        ts(),
-        (options == null ? void 0 : options.react) ? react({ version: options.react }) : {},
-        (options == null ? void 0 : options.vue) ? vue({
-          version: options.vue
-        }) : {},
-        (options == null ? void 0 : options.jsdoc) ? jsdoc({
-          ts: true
-        }) : {},
-        (options == null ? void 0 : options.lodash) ? lodash() : {},
-        deprecation(),
-        (options == null ? void 0 : options.cspell) ? cspell({
-          words: (_c = options == null ? void 0 : options.cspellWords) != null ? _c : []
-        }) : {},
-        ...commonConfigs,
-        agilebot({
-          root,
-          monorepoScope: options == null ? void 0 : options.monorepoScope
-        }),
-        (_d = options == null ? void 0 : options.config) != null ? _d : {}
-      )),
-      __spreadValues({
-        files: jsExtensions.map((ext) => `*${ext}`)
-      }, (0, import_eslint_utils3.mergeESLintConfig)(
-        {
-          rules: {
-            "@typescript-eslint/no-var-requires": "off"
+    ));
+  } else {
+    config = {
+      overrides: [
+        __spreadValues({
+          files: DEFAULT_EXTS.map((ext) => `*${ext}`),
+          parser: !(options == null ? void 0 : options.vue) ? "@typescript-eslint/parser" : "vue-eslint-parser",
+          parserOptions: {
+            parser: "@typescript-eslint/parser",
+            tsconfigRootDir: root,
+            ecmaFeatures: {
+              jsx: true
+            },
+            sourceType: options.module ? "module" : void 0,
+            extraFileExtensions: !(options == null ? void 0 : options.vue) ? void 0 : [".vue"]
           }
-        },
-        (options == null ? void 0 : options.jsdoc) ? jsdoc({
-          ts: false
-        }) : {}
-      )),
-      {
-        files: tsExtensions.map((ext) => `*${ext}`),
-        rules: {
-          "@typescript-eslint/explicit-member-accessibility": "error"
-        }
-      },
-      {
-        files: dtsExtensions.map((ext) => `*${ext}`),
-        rules: {
-          // .d.ts中支持导入ts文件中的类型
-          "@typescript-eslint/consistent-type-imports": "off",
-          // .d.ts中忽略属性命名规则
-          "@typescript-eslint/naming-convention": "off",
-          // .d.ts中忽略三斜线引用
-          "@typescript-eslint/triple-slash-reference": "off"
-        }
-      }
-    ]
-  };
+        }, (0, import_eslint_utils3.mergeESLintConfig)(
+          env(),
+          standard(),
+          // standard必须在ts之前
+          ts(),
+          (options == null ? void 0 : options.react) ? react({ version: options.react }) : {},
+          (options == null ? void 0 : options.vue) ? vue({
+            version: options.vue
+          }) : {},
+          (options == null ? void 0 : options.jsdoc) ? jsdoc({
+            ts: true
+          }) : {},
+          (options == null ? void 0 : options.lodash) ? lodash() : {},
+          deprecation(),
+          (options == null ? void 0 : options.cspell) ? cspell({
+            words: (_c = options == null ? void 0 : options.cspellWords) != null ? _c : []
+          }) : {},
+          ...commonConfigs,
+          agilebot({
+            root,
+            monorepoScope: options == null ? void 0 : options.monorepoScope
+          }),
+          (_d = options == null ? void 0 : options.config) != null ? _d : {}
+        )),
+        __spreadValues({
+          files: JS_EXTS.map((ext) => `*${ext}`)
+        }, (0, import_eslint_utils3.mergeESLintConfig)(
+          jsOnly(),
+          (options == null ? void 0 : options.jsdoc) ? jsdoc({
+            ts: false
+          }) : {}
+        )),
+        __spreadValues({
+          files: TS_EXTS.map((ext) => `*${ext}`)
+        }, tsOnly()),
+        __spreadValues({
+          files: DTS_EXTS.map((ext) => `*${ext}`)
+        }, dts())
+      ]
+    };
+  }
   if ((_e = config.overrides) == null ? void 0 : _e[0].parserOptions) {
     config.overrides[0].parserOptions.project = tsconfigFiles.length > 0 ? tsconfigFiles : true;
+  } else if (config.parser) {
+    config.parserOptions = {
+      project: tsconfigFiles.length > 0 ? tsconfigFiles : true
+    };
   }
   return config;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilebot/eslint-config",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "Agilebot's ESLint config",
   "bin": {
     "eslint-agilebot": "bin/eslint-agilebot"
@@ -18,40 +18,40 @@
   },
   "homepage": "https://github.com/sh-agilebot/frontend-toolkit/tree/master/packages/eslint-config#readme",
   "dependencies": {
-    "@cspell/eslint-plugin": "^8.8.1",
-    "@eslint-react/eslint-plugin": "^1.5.11",
-    "@stylistic/eslint-plugin": "^2.1.0",
-    "@typescript-eslint/eslint-plugin": "~7.9.0",
-    "@typescript-eslint/parser": "~7.9.0",
+    "@cspell/eslint-plugin": "^8.10.4",
+    "@eslint-react/eslint-plugin": "^1.5.23",
+    "@stylistic/eslint-plugin": "^2.3.0",
+    "@typescript-eslint/eslint-plugin": "~7.16.0",
+    "@typescript-eslint/parser": "~7.16.0",
     "eslint-config-godaddy": "^6.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-deprecation": "^2.0.0",
+    "eslint-plugin-deprecation": "^3.0.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-file-progress": "^1.4.0",
-    "eslint-plugin-import-x": "^0.5.0",
-    "eslint-plugin-jsdoc": "^48.2.4",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-n": "^17.7.0",
-    "eslint-plugin-no-relative-import-paths": "^1.5.4",
+    "eslint-plugin-import-x": "^0.5.3",
+    "eslint-plugin-jsdoc": "^48.5.2",
+    "eslint-plugin-jsx-a11y": "^6.9.0",
+    "eslint-plugin-n": "^17.9.0",
+    "eslint-plugin-no-relative-import-paths": "^1.5.5",
     "eslint-plugin-prefer-arrow-functions": "^3.3.2",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-react": "^7.34.1",
+    "eslint-plugin-promise": "^6.4.0",
+    "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-unicorn": "^53.0.0",
+    "eslint-plugin-unicorn": "^54.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
     "eslint-plugin-vue": "^9.26.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.13.0",
     "vue-eslint-parser": "^9.4.2",
-    "@agilebot/eslint-utils": "0.3.9"
+    "@agilebot/eslint-utils": "0.3.10"
   },
   "devDependencies": {
     "eslint-config-love": "^47.0.0"
   },
   "peerDependencies": {
     "eslint": "^7.0.0 || ^8.0.0",
-    "@agilebot/eslint-plugin": "0.3.9"
+    "@agilebot/eslint-plugin": "0.3.10"
   },
   "files": [
     "bin",