@lntvow/eslint-config 9.3.6 → 9.3.8

package/dist/index.cjs

@@ -84,6 +84,47 @@ var import_local_pkg2 = require("local-pkg");
 
 // src/configs/custom.ts
 var import_eslint_plugin = __toESM(require("@lntvow/eslint-plugin"), 1);
+async function custom() {
+  return [
+    {
+      name: "lntvow/custom",
+      plugins: {
+        lntvow: import_eslint_plugin.default
+      }
+    }
+  ];
+}
+
+// src/configs/gitignore.ts
+var import_fs = __toESM(require("fs"), 1);
+var import_find_up = require("find-up");
+var import_utils = require("@lntvow/utils");
+var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
+async function gitignore(options) {
+  const { name = ".gitignore", root = false, files: _files = root ? name : (0, import_find_up.findUpSync)(name) || [] } = options;
+  const files = (0, import_utils.castArray)(_files);
+  const ignores2 = [];
+  for (const file of files) {
+    try {
+      const content = import_fs.default.readFileSync(file, "utf8");
+      const globs = (0, import_parse_gitignore.default)(content).globs();
+      for (const glob of globs) {
+        if (glob.type === "ignore") {
+          ignores2.push(...glob.patterns);
+        } else if (glob.type === "unignore") {
+          ignores2.push(...glob.patterns.map((pattern) => `!${pattern}`));
+        }
+      }
+    } catch (error) {
+      throw new Error(`Failed to read file: ${file}`);
+    }
+  }
+  return [
+    {
+      ignores: ignores2
+    }
+  ];
+}
 
 // src/globs.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
@@ -162,56 +203,6 @@ var GLOB_EXCLUDE = [
   "**/components.d.ts"
 ];
 
-// src/configs/custom.ts
-async function custom() {
-  return [
-    {
-      name: "lntvow/custom",
-      plugins: {
-        lntvow: import_eslint_plugin.default
-      }
-    },
-    {
-      name: "lntvow/custom/test/rules",
-      files: [GLOB_TESTS],
-      rules: {
-        "lntvow/newline-before": "error"
-      }
-    }
-  ];
-}
-
-// src/configs/gitignore.ts
-var import_fs = __toESM(require("fs"), 1);
-var import_find_up = require("find-up");
-var import_utils = require("@lntvow/utils");
-var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
-async function gitignore(options) {
-  const { name = ".gitignore", root = false, files: _files = root ? name : (0, import_find_up.findUpSync)(name) || [] } = options;
-  const files = (0, import_utils.castArray)(_files);
-  const ignores2 = [];
-  for (const file of files) {
-    try {
-      const content = import_fs.default.readFileSync(file, "utf8");
-      const globs = (0, import_parse_gitignore.default)(content).globs();
-      for (const glob of globs) {
-        if (glob.type === "ignore") {
-          ignores2.push(...glob.patterns);
-        } else if (glob.type === "unignore") {
-          ignores2.push(...glob.patterns.map((pattern) => `!${pattern}`));
-        }
-      }
-    } catch (error) {
-      throw new Error(`Failed to read file: ${file}`);
-    }
-  }
-  return [
-    {
-      ignores: ignores2
-    }
-  ];
-}
-
 // src/configs/ignores.ts
 async function ignores() {
   return [
@@ -432,7 +423,6 @@ async function prettier() {
 
 // src/configs/regexp.ts
 var import_eslint_plugin_regexp = require("eslint-plugin-regexp");
-var import_eslint_plugin2 = __toESM(require("@lntvow/eslint-plugin"), 1);
 async function regexp(options = {}) {
   const { overrides } = options;
   const pluginRegexp = import_eslint_plugin_regexp.configs["flat/recommended"].plugins.regexp;
@@ -441,13 +431,11 @@ async function regexp(options = {}) {
     {
       name: "lntvow/regexp/rules",
       plugins: {
-        regexp: pluginRegexp,
-        lntvow: import_eslint_plugin2.default
+        regexp: pluginRegexp
       },
       rules: {
         // Update to eslint-plugin-regexp v2.6.0
         ...rules,
-        // 'lntvow/newline-before': 'error',
         // Overrides
         ...overrides
       }
@@ -456,7 +444,7 @@ async function regexp(options = {}) {
 }
 
 // src/configs/stylistic.ts
-var import_eslint_plugin3 = __toESM(require("@stylistic/eslint-plugin"), 1);
+var import_eslint_plugin2 = __toESM(require("@stylistic/eslint-plugin"), 1);
 var StylisticConfigDefaults = {
   indent: 2,
   jsx: true,
@@ -474,7 +462,7 @@ async function stylistic(options = {}) {
     ...StylisticConfigDefaults,
     ...options
   };
-  const config = import_eslint_plugin3.default.configs.customize({
+  const config = import_eslint_plugin2.default.configs.customize({
     flat: true,
     indent,
     jsx,
@@ -486,7 +474,7 @@ async function stylistic(options = {}) {
     {
       name: "lntvow/stylistic/rules",
       plugins: {
-        style: import_eslint_plugin3.default
+        style: import_eslint_plugin2.default
       },
       rules: {
         // ...config.rules,
@@ -515,10 +503,9 @@ async function test(options = {}) {
       plugins: {
         test: import_eslint_plugin_vitest.default
       },
-      files: [GLOB_TESTS],
+      files: [...GLOB_TESTS],
       rules: {
-        // Update to eslint-plugin-regexp v2.6.0
-        // ...rules,
+        "lntvow/newline-before-describe-test": "error",
         // Overrides
         ...overrides
       }
@@ -527,7 +514,7 @@ async function test(options = {}) {
 }
 
 // src/configs/typescript.ts
-var import_eslint_plugin4 = __toESM(require("@typescript-eslint/eslint-plugin"), 1);
+var import_eslint_plugin3 = __toESM(require("@typescript-eslint/eslint-plugin"), 1);
 var import_parser = __toESM(require("@typescript-eslint/parser"), 1);
 
 // src/utils/index.ts
@@ -551,7 +538,7 @@ async function typescript(options = {}) {
     {
       name: "lntvow/typescript/rules",
       plugins: {
-        ts: import_eslint_plugin4.default
+        ts: import_eslint_plugin3.default
       },
       languageOptions: {
         parser: import_parser.default,
@@ -561,10 +548,10 @@ async function typescript(options = {}) {
       },
       files,
       rules: {
-        ...renameRules(import_eslint_plugin4.default.configs["eslint-recommended"].overrides[0].rules, {
+        ...renameRules(import_eslint_plugin3.default.configs["eslint-recommended"].overrides[0].rules, {
           "@typescript-eslint": "ts"
         }),
-        ...renameRules(import_eslint_plugin4.default.configs.strict.rules, { "@typescript-eslint": "ts" }),
+        ...renameRules(import_eslint_plugin3.default.configs.strict.rules, { "@typescript-eslint": "ts" }),
         // Override default configuration
         // 禁止使用!断言
         "ts/no-non-null-assertion": "off",
@@ -911,6 +898,7 @@ function lntvow(options = {}, ...userConfigs) {
   const configs2 = [];
   configs2.push(
     ignores(),
+    custom(),
     javascript({
       ...resolveSubOptions(options, "javascript")
     }),
@@ -955,7 +943,7 @@ function lntvow(options = {}, ...userConfigs) {
   if (Object.keys(fusedConfig).length) {
     configs2.push([fusedConfig]);
   }
-  configs2.push(custom(), prettier());
+  configs2.push(prettier());
   let composer = new import_eslint_flat_config_utils.FlatConfigComposer();
   composer = composer.append(...configs2, ...userConfigs);
   if (autoRenamePlugins) {

package/dist/index.js

@@ -5,6 +5,47 @@ import { isPackageExists } from "local-pkg";
 
 // src/configs/custom.ts
 import lntvowPlugin from "@lntvow/eslint-plugin";
+async function custom() {
+  return [
+    {
+      name: "lntvow/custom",
+      plugins: {
+        lntvow: lntvowPlugin
+      }
+    }
+  ];
+}
+
+// src/configs/gitignore.ts
+import fs from "fs";
+import { findUpSync } from "find-up";
+import { castArray } from "@lntvow/utils";
+import parse from "parse-gitignore";
+async function gitignore(options) {
+  const { name = ".gitignore", root = false, files: _files = root ? name : findUpSync(name) || [] } = options;
+  const files = castArray(_files);
+  const ignores2 = [];
+  for (const file of files) {
+    try {
+      const content = fs.readFileSync(file, "utf8");
+      const globs = parse(content).globs();
+      for (const glob of globs) {
+        if (glob.type === "ignore") {
+          ignores2.push(...glob.patterns);
+        } else if (glob.type === "unignore") {
+          ignores2.push(...glob.patterns.map((pattern) => `!${pattern}`));
+        }
+      }
+    } catch (error) {
+      throw new Error(`Failed to read file: ${file}`);
+    }
+  }
+  return [
+    {
+      ignores: ignores2
+    }
+  ];
+}
 
 // src/globs.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
@@ -83,56 +124,6 @@ var GLOB_EXCLUDE = [
   "**/components.d.ts"
 ];
 
-// src/configs/custom.ts
-async function custom() {
-  return [
-    {
-      name: "lntvow/custom",
-      plugins: {
-        lntvow: lntvowPlugin
-      }
-    },
-    {
-      name: "lntvow/custom/test/rules",
-      files: [GLOB_TESTS],
-      rules: {
-        "lntvow/newline-before": "error"
-      }
-    }
-  ];
-}
-
-// src/configs/gitignore.ts
-import fs from "fs";
-import { findUpSync } from "find-up";
-import { castArray } from "@lntvow/utils";
-import parse from "parse-gitignore";
-async function gitignore(options) {
-  const { name = ".gitignore", root = false, files: _files = root ? name : findUpSync(name) || [] } = options;
-  const files = castArray(_files);
-  const ignores2 = [];
-  for (const file of files) {
-    try {
-      const content = fs.readFileSync(file, "utf8");
-      const globs = parse(content).globs();
-      for (const glob of globs) {
-        if (glob.type === "ignore") {
-          ignores2.push(...glob.patterns);
-        } else if (glob.type === "unignore") {
-          ignores2.push(...glob.patterns.map((pattern) => `!${pattern}`));
-        }
-      }
-    } catch (error) {
-      throw new Error(`Failed to read file: ${file}`);
-    }
-  }
-  return [
-    {
-      ignores: ignores2
-    }
-  ];
-}
-
 // src/configs/ignores.ts
 async function ignores() {
   return [
@@ -353,7 +344,6 @@ async function prettier() {
 
 // src/configs/regexp.ts
 import { configs } from "eslint-plugin-regexp";
-import lntvowPlugin2 from "@lntvow/eslint-plugin";
 async function regexp(options = {}) {
   const { overrides } = options;
   const pluginRegexp = configs["flat/recommended"].plugins.regexp;
@@ -362,13 +352,11 @@ async function regexp(options = {}) {
     {
       name: "lntvow/regexp/rules",
       plugins: {
-        regexp: pluginRegexp,
-        lntvow: lntvowPlugin2
+        regexp: pluginRegexp
       },
       rules: {
         // Update to eslint-plugin-regexp v2.6.0
         ...rules,
-        // 'lntvow/newline-before': 'error',
         // Overrides
         ...overrides
       }
@@ -436,10 +424,9 @@ async function test(options = {}) {
       plugins: {
         test: pluginVitest
       },
-      files: [GLOB_TESTS],
+      files: [...GLOB_TESTS],
       rules: {
-        // Update to eslint-plugin-regexp v2.6.0
-        // ...rules,
+        "lntvow/newline-before-describe-test": "error",
         // Overrides
         ...overrides
       }
@@ -832,6 +819,7 @@ function lntvow(options = {}, ...userConfigs) {
   const configs2 = [];
   configs2.push(
     ignores(),
+    custom(),
     javascript({
       ...resolveSubOptions(options, "javascript")
     }),
@@ -876,7 +864,7 @@ function lntvow(options = {}, ...userConfigs) {
   if (Object.keys(fusedConfig).length) {
     configs2.push([fusedConfig]);
   }
-  configs2.push(custom(), prettier());
+  configs2.push(prettier());
   let composer = new FlatConfigComposer();
   composer = composer.append(...configs2, ...userConfigs);
   if (autoRenamePlugins) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lntvow/eslint-config",
-  "version": "9.3.6",
+  "version": "9.3.8",
   "author": "lntvow",
   "description": "eslint-config",
   "type": "module",
@@ -54,7 +54,7 @@
     "tslib": "^2.6.2",
     "typescript": "^5.4.5",
     "vue-eslint-parser": "^9.4.2",
-    "@lntvow/eslint-plugin": "^9.3.6"
+    "@lntvow/eslint-plugin": "^9.3.8"
   },
   "scripts": {
     "dev": "pnpm build --format esm --watch",