@icebreakers/eslint-config 0.5.3 → 0.6.0

package/dist/index.cjs

@@ -32,11 +32,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   getPresets: () => getPresets,
-  getRestConfigAndPresets: () => getRestConfigAndPresets,
-  icebreaker: () => icebreaker
+  icebreaker: () => icebreaker,
+  icebreakerLegacy: () => icebreakerLegacy
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/antfu.ts
+var antfu_exports = {};
+__reExport(antfu_exports, require("@antfu/eslint-config"));
+
 // ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") {
@@ -105,12 +109,93 @@ var defuArrayFn = createDefu((object, key, currentValue) => {
   }
 });
 
-// src/antfu.ts
-var antfu_exports = {};
-__reExport(antfu_exports, require("@antfu/eslint-config"));
+// src/defaults.ts
+function getDefaultVueOptions() {
+  const vueOptions = {
+    overrides: {
+      "vue/attribute-hyphenation": "off",
+      "vue/v-on-event-hyphenation": "off",
+      "vue/custom-event-name-casing": "off",
+      "vue/no-mutating-props": "warn",
+      // https://eslint.vuejs.org/rules/no-useless-v-bind.html
+      "vue/no-useless-v-bind": [
+        "error",
+        {
+          // 不允许注释
+          ignoreIncludesComment: false,
+          // 允许在里面使用转义
+          // 比如 v-bind:foo="'bar\nbaz'"
+          ignoreStringEscape: true
+        }
+      ],
+      // https://eslint.vuejs.org/rules/no-unused-refs.html
+      "vue/no-unused-refs": "warn"
+    }
+  };
+  return vueOptions;
+}
+function getDefaultTypescriptOptions() {
+  const typescriptOptions = {
+    overrides: {
+      "ts/no-unused-vars": [
+        "error",
+        {
+          args: "all",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          ignoreRestSiblings: true
+        }
+      ],
+      "ts/prefer-ts-expect-error": "off",
+      "ts/ban-ts-comment": "off",
+      "ts/no-use-before-define": "warn",
+      "ts/no-unused-expressions": [
+        "error",
+        {
+          allowShortCircuit: true,
+          allowTernary: true
+        }
+      ]
+    }
+  };
+  return typescriptOptions;
+}
+
+// src/utils.ts
+function isObject(o) {
+  return Object.prototype.toString.call(o) === "[object Object]";
+}
 
 // src/preset.ts
-function getPresets(options) {
+function getPresets(options, mode) {
+  const opts = defu(options, {
+    formatters: true,
+    javascript: {
+      overrides: {
+        "curly": ["error", "all"],
+        "no-console": ["warn"],
+        // 问题在于 auto fix 的时候，会直接 remove 整个 import ，而我们想让用户自己去 remove
+        // 'unused-imports/no-unused-imports': 'error',
+        // https://typescript-eslint.io/rules/no-unused-vars/
+        "no-unused-vars": "off"
+      }
+    }
+  });
+  const vueOptions = getDefaultVueOptions();
+  if (opts.vue === true) {
+    opts.vue = vueOptions;
+  } else if (isObject(opts.vue)) {
+    opts.vue = defu(opts.vue, vueOptions);
+  }
+  const typescriptOptions = getDefaultTypescriptOptions();
+  if (opts.typescript === void 0 || opts.typescript === true) {
+    opts.typescript = typescriptOptions;
+  } else if (isObject(opts.typescript)) {
+    opts.typescript = defu(opts.typescript, typescriptOptions);
+  }
   const {
     tailwindcss: enableTailwindcss,
     mdx: enableMDX,
@@ -118,35 +203,30 @@ function getPresets(options) {
     vue: enableVue,
     react: enableReact
     // ...opts
-  } = options;
+  } = opts;
   const presetRules = {
-    "curly": ["error", "all"],
-    "no-console": ["warn"],
-    // 问题在于 auto fix 的时候，会直接 remove 整个 import ，而我们想让用户自己去 remove
-    // 'unused-imports/no-unused-imports': 'error',
-    // https://typescript-eslint.io/rules/no-unused-vars/
-    "no-unused-vars": "off",
     "unused-imports/no-unused-vars": "off"
   };
+  const isLegacy = mode === "legacy";
+  if (isLegacy) {
+    presetRules["perfectionist/sort-imports"] = "off";
+  }
   if (enableVue) {
-    Object.assign(presetRules, {
-      "vue/attribute-hyphenation": "off",
-      "vue/v-on-event-hyphenation": "off",
-      "vue/custom-event-name-casing": "off",
-      "vue/no-mutating-props": "warn"
-    });
     if (typeof enableVue === "object") {
-      if (enableVue.vueVersion === 2) {
-        Object.assign(presetRules, {
-          "vue/no-v-for-template-key-on-child": "off",
-          "vue/no-v-for-template-key": "error",
-          "vue/no-deprecated-v-bind-sync": "off"
-        });
-      } else {
-        Object.assign(presetRules, {
-          "vue/no-v-for-template-key-on-child": "error",
-          "vue/no-v-for-template-key": "off"
-        });
+      const overrides = enableVue.overrides;
+      if (overrides) {
+        if (enableVue.vueVersion === 2) {
+          Object.assign(overrides, {
+            "vue/no-v-for-template-key-on-child": "off",
+            "vue/no-v-for-template-key": "error",
+            "vue/no-deprecated-v-bind-sync": "off"
+          });
+        } else {
+          Object.assign(overrides, {
+            "vue/no-v-for-template-key-on-child": "error",
+            "vue/no-v-for-template-key": "off"
+          });
+        }
       }
     }
   }
@@ -158,7 +238,6 @@ function getPresets(options) {
   if (enableTailwindcss) {
     presets.push(
       (0, antfu_exports.interopDefault)(
-        // @ts-ignore
         import("eslint-plugin-tailwindcss")
       ).then((tailwind) => {
         return tailwind.configs["flat/recommended"];
@@ -211,49 +290,19 @@ function getPresets(options) {
       );
     }
   }
-  return presets;
+  return [opts, ...presets];
 }
 
 // src/factory.ts
-function getRestConfigAndPresets(options) {
-  const opts = defu(options, {
-    formatters: true,
-    typescript: {
-      overrides: {
-        "ts/no-unused-vars": [
-          "error",
-          {
-            args: "all",
-            argsIgnorePattern: "^_",
-            caughtErrors: "all",
-            caughtErrorsIgnorePattern: "^_",
-            destructuredArrayIgnorePattern: "^_",
-            varsIgnorePattern: "^_",
-            ignoreRestSiblings: true
-          }
-        ],
-        "ts/prefer-ts-expect-error": "off",
-        "ts/ban-ts-comment": "off",
-        "ts/no-use-before-define": "warn",
-        "ts/no-unused-expressions": [
-          "error",
-          {
-            allowShortCircuit: true,
-            allowTernary: true
-          }
-        ]
-      }
-    }
-  });
-  const presets = getPresets(opts);
-  return [opts, ...presets];
-}
 function icebreaker(options = {}, ...userConfigs) {
-  return (0, antfu_exports.antfu)(...getRestConfigAndPresets(options), ...userConfigs);
+  return (0, antfu_exports.antfu)(...getPresets(options), ...userConfigs);
+}
+function icebreakerLegacy(options = {}, ...userConfigs) {
+  return (0, antfu_exports.antfu)(...getPresets(options, "legacy"), ...userConfigs);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getPresets,
-  getRestConfigAndPresets,
-  icebreaker
+  icebreaker,
+  icebreakerLegacy
 });

package/dist/index.d.cts

@@ -9,9 +9,9 @@ type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem & {
 };
 type UserConfigItem = Awaitable<TypedFlatConfigItem | TypedFlatConfigItem[] | FlatConfigComposer<any, any> | Linter.Config[]>;
 
-declare function getRestConfigAndPresets(options?: UserDefinedOptions): [OptionsConfig & TypedFlatConfigItem, ...UserConfigItem[]];
 declare function icebreaker(options?: UserDefinedOptions, ...userConfigs: UserConfigItem[]): FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
+declare function icebreakerLegacy(options?: UserDefinedOptions, ...userConfigs: UserConfigItem[]): FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
 
-declare function getPresets(options: UserDefinedOptions): UserConfigItem[];
+declare function getPresets(options?: UserDefinedOptions, mode?: 'legacy'): [UserDefinedOptions, ...UserConfigItem[]];
 
-export { type UserConfigItem, type UserDefinedOptions, getPresets, getRestConfigAndPresets, icebreaker };
+export { type UserConfigItem, type UserDefinedOptions, getPresets, icebreaker, icebreakerLegacy };

package/dist/index.d.ts

@@ -9,9 +9,9 @@ type UserDefinedOptions = OptionsConfig & TypedFlatConfigItem & {
 };
 type UserConfigItem = Awaitable<TypedFlatConfigItem | TypedFlatConfigItem[] | FlatConfigComposer<any, any> | Linter.Config[]>;
 
-declare function getRestConfigAndPresets(options?: UserDefinedOptions): [OptionsConfig & TypedFlatConfigItem, ...UserConfigItem[]];
 declare function icebreaker(options?: UserDefinedOptions, ...userConfigs: UserConfigItem[]): FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
+declare function icebreakerLegacy(options?: UserDefinedOptions, ...userConfigs: UserConfigItem[]): FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
 
-declare function getPresets(options: UserDefinedOptions): UserConfigItem[];
+declare function getPresets(options?: UserDefinedOptions, mode?: 'legacy'): [UserDefinedOptions, ...UserConfigItem[]];
 
-export { type UserConfigItem, type UserDefinedOptions, getPresets, getRestConfigAndPresets, icebreaker };
+export { type UserConfigItem, type UserDefinedOptions, getPresets, icebreaker, icebreakerLegacy };

package/dist/index.js

@@ -12,6 +12,11 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
+// src/antfu.ts
+var antfu_exports = {};
+__reExport(antfu_exports, eslint_config_star);
+import * as eslint_config_star from "@antfu/eslint-config";
+
 // ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") {
@@ -80,13 +85,93 @@ var defuArrayFn = createDefu((object, key, currentValue) => {
   }
 });
 
-// src/antfu.ts
-var antfu_exports = {};
-__reExport(antfu_exports, eslint_config_star);
-import * as eslint_config_star from "@antfu/eslint-config";
+// src/defaults.ts
+function getDefaultVueOptions() {
+  const vueOptions = {
+    overrides: {
+      "vue/attribute-hyphenation": "off",
+      "vue/v-on-event-hyphenation": "off",
+      "vue/custom-event-name-casing": "off",
+      "vue/no-mutating-props": "warn",
+      // https://eslint.vuejs.org/rules/no-useless-v-bind.html
+      "vue/no-useless-v-bind": [
+        "error",
+        {
+          // 不允许注释
+          ignoreIncludesComment: false,
+          // 允许在里面使用转义
+          // 比如 v-bind:foo="'bar\nbaz'"
+          ignoreStringEscape: true
+        }
+      ],
+      // https://eslint.vuejs.org/rules/no-unused-refs.html
+      "vue/no-unused-refs": "warn"
+    }
+  };
+  return vueOptions;
+}
+function getDefaultTypescriptOptions() {
+  const typescriptOptions = {
+    overrides: {
+      "ts/no-unused-vars": [
+        "error",
+        {
+          args: "all",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          ignoreRestSiblings: true
+        }
+      ],
+      "ts/prefer-ts-expect-error": "off",
+      "ts/ban-ts-comment": "off",
+      "ts/no-use-before-define": "warn",
+      "ts/no-unused-expressions": [
+        "error",
+        {
+          allowShortCircuit: true,
+          allowTernary: true
+        }
+      ]
+    }
+  };
+  return typescriptOptions;
+}
+
+// src/utils.ts
+function isObject(o) {
+  return Object.prototype.toString.call(o) === "[object Object]";
+}
 
 // src/preset.ts
-function getPresets(options) {
+function getPresets(options, mode) {
+  const opts = defu(options, {
+    formatters: true,
+    javascript: {
+      overrides: {
+        "curly": ["error", "all"],
+        "no-console": ["warn"],
+        // 问题在于 auto fix 的时候，会直接 remove 整个 import ，而我们想让用户自己去 remove
+        // 'unused-imports/no-unused-imports': 'error',
+        // https://typescript-eslint.io/rules/no-unused-vars/
+        "no-unused-vars": "off"
+      }
+    }
+  });
+  const vueOptions = getDefaultVueOptions();
+  if (opts.vue === true) {
+    opts.vue = vueOptions;
+  } else if (isObject(opts.vue)) {
+    opts.vue = defu(opts.vue, vueOptions);
+  }
+  const typescriptOptions = getDefaultTypescriptOptions();
+  if (opts.typescript === void 0 || opts.typescript === true) {
+    opts.typescript = typescriptOptions;
+  } else if (isObject(opts.typescript)) {
+    opts.typescript = defu(opts.typescript, typescriptOptions);
+  }
   const {
     tailwindcss: enableTailwindcss,
     mdx: enableMDX,
@@ -94,35 +179,30 @@ function getPresets(options) {
     vue: enableVue,
     react: enableReact
     // ...opts
-  } = options;
+  } = opts;
   const presetRules = {
-    "curly": ["error", "all"],
-    "no-console": ["warn"],
-    // 问题在于 auto fix 的时候，会直接 remove 整个 import ，而我们想让用户自己去 remove
-    // 'unused-imports/no-unused-imports': 'error',
-    // https://typescript-eslint.io/rules/no-unused-vars/
-    "no-unused-vars": "off",
     "unused-imports/no-unused-vars": "off"
   };
+  const isLegacy = mode === "legacy";
+  if (isLegacy) {
+    presetRules["perfectionist/sort-imports"] = "off";
+  }
   if (enableVue) {
-    Object.assign(presetRules, {
-      "vue/attribute-hyphenation": "off",
-      "vue/v-on-event-hyphenation": "off",
-      "vue/custom-event-name-casing": "off",
-      "vue/no-mutating-props": "warn"
-    });
     if (typeof enableVue === "object") {
-      if (enableVue.vueVersion === 2) {
-        Object.assign(presetRules, {
-          "vue/no-v-for-template-key-on-child": "off",
-          "vue/no-v-for-template-key": "error",
-          "vue/no-deprecated-v-bind-sync": "off"
-        });
-      } else {
-        Object.assign(presetRules, {
-          "vue/no-v-for-template-key-on-child": "error",
-          "vue/no-v-for-template-key": "off"
-        });
+      const overrides = enableVue.overrides;
+      if (overrides) {
+        if (enableVue.vueVersion === 2) {
+          Object.assign(overrides, {
+            "vue/no-v-for-template-key-on-child": "off",
+            "vue/no-v-for-template-key": "error",
+            "vue/no-deprecated-v-bind-sync": "off"
+          });
+        } else {
+          Object.assign(overrides, {
+            "vue/no-v-for-template-key-on-child": "error",
+            "vue/no-v-for-template-key": "off"
+          });
+        }
       }
     }
   }
@@ -134,7 +214,6 @@ function getPresets(options) {
   if (enableTailwindcss) {
     presets.push(
       (0, antfu_exports.interopDefault)(
-        // @ts-ignore
         import("eslint-plugin-tailwindcss")
       ).then((tailwind) => {
         return tailwind.configs["flat/recommended"];
@@ -187,48 +266,18 @@ function getPresets(options) {
       );
     }
   }
-  return presets;
+  return [opts, ...presets];
 }
 
 // src/factory.ts
-function getRestConfigAndPresets(options) {
-  const opts = defu(options, {
-    formatters: true,
-    typescript: {
-      overrides: {
-        "ts/no-unused-vars": [
-          "error",
-          {
-            args: "all",
-            argsIgnorePattern: "^_",
-            caughtErrors: "all",
-            caughtErrorsIgnorePattern: "^_",
-            destructuredArrayIgnorePattern: "^_",
-            varsIgnorePattern: "^_",
-            ignoreRestSiblings: true
-          }
-        ],
-        "ts/prefer-ts-expect-error": "off",
-        "ts/ban-ts-comment": "off",
-        "ts/no-use-before-define": "warn",
-        "ts/no-unused-expressions": [
-          "error",
-          {
-            allowShortCircuit: true,
-            allowTernary: true
-          }
-        ]
-      }
-    }
-  });
-  const presets = getPresets(opts);
-  return [opts, ...presets];
-}
 function icebreaker(options = {}, ...userConfigs) {
-  return (0, antfu_exports.antfu)(...getRestConfigAndPresets(options), ...userConfigs);
+  return (0, antfu_exports.antfu)(...getPresets(options), ...userConfigs);
+}
+function icebreakerLegacy(options = {}, ...userConfigs) {
+  return (0, antfu_exports.antfu)(...getPresets(options, "legacy"), ...userConfigs);
 }
 export {
   getPresets,
-  getRestConfigAndPresets,
-  icebreaker
+  icebreaker,
+  icebreakerLegacy
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@icebreakers/eslint-config",
   "type": "module",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "icebreakers's eslint config",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -40,9 +40,9 @@
     "dist"
   ],
   "dependencies": {
-    "@antfu/eslint-config": "3.7.2",
-    "@eslint-react/eslint-plugin": "^1.14.2",
-    "@unocss/eslint-plugin": "^0.62.4",
+    "@antfu/eslint-config": "3.7.3",
+    "@eslint-react/eslint-plugin": "^1.14.3",
+    "@unocss/eslint-plugin": "^0.63.4",
     "eslint-plugin-format": "0.1.2",
     "eslint-plugin-jsx-a11y": "^6.10.0",
     "eslint-plugin-mdx": "3.1.5",
@@ -50,7 +50,7 @@
     "eslint-plugin-react-refresh": "^0.4.12",
     "eslint-plugin-tailwindcss": "3.17.4",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",
-    "globals": "^15.9.0",
+    "globals": "^15.10.0",
     "local-pkg": "0.5.0"
   },
   "publishConfig": {