@coderwyd/eslint-config 2.3.0 → 2.3.2

package/dist/cli.cjs

@@ -46,7 +46,7 @@ var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "2.3.0";
+var version = "2.3.2";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@types/eslint": "^8.56.6",
@@ -54,9 +54,9 @@ var devDependencies = {
   "@types/node": "^20.11.30",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.58.6",
+  "@unocss/eslint-plugin": "^0.58.7",
   bumpp: "^9.4.0",
-  eslint: "^8.57.0",
+  eslint: "9.0.0-rc.0",
   "eslint-flat-config-viewer": "^0.1.14",
   "eslint-plugin-react": "^7.34.1",
   "eslint-plugin-react-hooks": "^4.6.0",
@@ -67,7 +67,7 @@ var devDependencies = {
   "fs-extra": "^11.2.0",
   "lint-staged": "^15.2.2",
   rimraf: "^5.0.5",
-  "simple-git-hooks": "^2.11.0",
+  "simple-git-hooks": "^2.11.1",
   "svelte-eslint-parser": "^0.33.1",
   tsup: "^8.0.2",
   tsx: "^4.7.1",
@@ -97,7 +97,6 @@ var vscodeSettingsString = `
   // Enable eslint for all supported languages
   "eslint.validate": [
     "svelte",
-    "astro",
     "html",
     "css",
     "less",
@@ -107,7 +106,9 @@ var vscodeSettingsString = `
     "yaml",
     "yml",
     "markdown",
-    "toml"
+    "toml",
+    "gql",
+    "graphql"
   ]
 `;
 

package/dist/cli.js

@@ -17,7 +17,7 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "2.3.0";
+var version = "2.3.2";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@types/eslint": "^8.56.6",
@@ -25,9 +25,9 @@ var devDependencies = {
   "@types/node": "^20.11.30",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.58.6",
+  "@unocss/eslint-plugin": "^0.58.7",
   bumpp: "^9.4.0",
-  eslint: "^8.57.0",
+  eslint: "9.0.0-rc.0",
   "eslint-flat-config-viewer": "^0.1.14",
   "eslint-plugin-react": "^7.34.1",
   "eslint-plugin-react-hooks": "^4.6.0",
@@ -38,7 +38,7 @@ var devDependencies = {
   "fs-extra": "^11.2.0",
   "lint-staged": "^15.2.2",
   rimraf: "^5.0.5",
-  "simple-git-hooks": "^2.11.0",
+  "simple-git-hooks": "^2.11.1",
   "svelte-eslint-parser": "^0.33.1",
   tsup: "^8.0.2",
   tsx: "^4.7.1",
@@ -68,7 +68,6 @@ var vscodeSettingsString = `
   // Enable eslint for all supported languages
   "eslint.validate": [
     "svelte",
-    "astro",
     "html",
     "css",
     "less",
@@ -78,7 +77,9 @@ var vscodeSettingsString = `
     "yaml",
     "yml",
     "markdown",
-    "toml"
+    "toml",
+    "gql",
+    "graphql"
   ]
 `;
 

package/dist/index.cjs

@@ -103,7 +103,7 @@ var GLOB_JSONC = "**/*.jsonc";
 var GLOB_MARKDOWN = "**/*.md";
 var GLOB_YAML = "**/*.y?(a)ml";
 var GLOB_TOML = "**/*.toml";
-var GLOB_GRAPHQL = "**/*.graphql";
+var GLOB_GRAPHQL = "**/*.{g,graph}ql";
 var GLOB_PRETTIER_LINT = [GLOB_SRC, GLOB_VUE];
 var GLOB_MARKDOWN_CODE = `${GLOB_MARKDOWN}/${GLOB_SRC}`;
 var GLOB_TESTS = [
@@ -933,7 +933,7 @@ function sortTsconfig() {
 // src/configs/prettier.ts
 var import_eslint_config_prettier = __toESM(require("eslint-config-prettier"), 1);
 var { rules: eslintRules } = import_eslint_config_prettier.default;
-async function prettier(rules) {
+async function prettier(rules = {}) {
   const pluginPrettier = await interopDefault(import("eslint-plugin-prettier"));
   const pRules = {
     ...rules
@@ -1545,14 +1545,14 @@ async function unocss(options = {}) {
 
 // src/configs/formatter.ts
 async function formatter(options = {}, prettierRules2 = {}) {
-  const {
-    css = true,
-    graphql,
-    html = true,
-    markdown,
-    toml,
-    yaml
-  } = options || {};
+  const { css, graphql, html, markdown, toml, yaml } = options === true ? {
+    css: true,
+    graphql: true,
+    html: true,
+    markdown: true,
+    toml: true,
+    yaml: true
+  } : options;
   const pluginPrettier = await interopDefault(import("eslint-plugin-prettier"));
   function createPrettierFormatter(files, parser, plugins) {
     const rules = {
@@ -1778,6 +1778,10 @@ async function defineConfig(options = {}, ...userConfigs) {
   const {
     autoRenamePlugins = true,
     componentExts = [],
+    formatter: formatterOptions = {
+      css: true,
+      html: true
+    },
     gitignore: enableGitignore = true,
     isInEditor: isInEditor2 = isInEditor,
     react: enableReact = false,
@@ -1888,22 +1892,26 @@ async function defineConfig(options = {}, ...userConfigs) {
       sortTsconfig()
     );
   }
-  let prettierRules2 = {
-    ...DEFAULT_PRETTIER_RULES
-  };
-  if (options.prettierRules) {
-    prettierRules2 = { ...prettierRules2, ...options.prettierRules };
-  }
-  if (usePrettierrc) {
-    const prettierConfig = await loadPrettierConfig(
-      options.cwd ?? import_node_process4.default.cwd()
+  if (formatterOptions) {
+    let prettierRules2 = {
+      ...DEFAULT_PRETTIER_RULES
+    };
+    if (options.prettierRules) {
+      prettierRules2 = { ...prettierRules2, ...options.prettierRules };
+    }
+    if (usePrettierrc) {
+      const prettierConfig = await loadPrettierConfig(
+        options.cwd ?? import_node_process4.default.cwd()
+      );
+      Object.assign(prettierRules2, prettierConfig);
+    }
+    configs.push(
+      prettier(prettierRules2),
+      formatter(formatterOptions, prettierRules2)
     );
-    Object.assign(prettierRules2, prettierConfig);
+  } else {
+    configs.push(prettier());
   }
-  configs.push(
-    prettier(prettierRules2),
-    formatter(options.formatter, prettierRules2)
-  );
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
     if (key in options)
       acc[key] = options[key];

package/dist/index.d.cts

@@ -538,9 +538,6 @@ interface OptionsConfig extends OptionsComponentExts {
     /**
      * Use external formatters to format files.
      *
-     * Requires installing:
-     * - `eslint-plugin-prettier`
-     *
      * @default
      * {
      *  "html": true,
@@ -550,8 +547,10 @@ interface OptionsConfig extends OptionsComponentExts {
      *  "yaml": false
      *  "toml": false
      * }
+     *
+     * When set to `true`, it will enable all formatters.
      */
-    formatter?: OptionsFormatters;
+    formatter?: boolean | OptionsFormatters;
     /**
      * Default prettier rules
      *

package/dist/index.d.ts

@@ -538,9 +538,6 @@ interface OptionsConfig extends OptionsComponentExts {
     /**
      * Use external formatters to format files.
      *
-     * Requires installing:
-     * - `eslint-plugin-prettier`
-     *
      * @default
      * {
      *  "html": true,
@@ -550,8 +547,10 @@ interface OptionsConfig extends OptionsComponentExts {
      *  "yaml": false
      *  "toml": false
      * }
+     *
+     * When set to `true`, it will enable all formatters.
      */
-    formatter?: OptionsFormatters;
+    formatter?: boolean | OptionsFormatters;
     /**
      * Default prettier rules
      *

package/dist/index.js

@@ -57,7 +57,7 @@ var GLOB_JSONC = "**/*.jsonc";
 var GLOB_MARKDOWN = "**/*.md";
 var GLOB_YAML = "**/*.y?(a)ml";
 var GLOB_TOML = "**/*.toml";
-var GLOB_GRAPHQL = "**/*.graphql";
+var GLOB_GRAPHQL = "**/*.{g,graph}ql";
 var GLOB_PRETTIER_LINT = [GLOB_SRC, GLOB_VUE];
 var GLOB_MARKDOWN_CODE = `${GLOB_MARKDOWN}/${GLOB_SRC}`;
 var GLOB_TESTS = [
@@ -887,7 +887,7 @@ function sortTsconfig() {
 // src/configs/prettier.ts
 import prettierRules from "eslint-config-prettier";
 var { rules: eslintRules } = prettierRules;
-async function prettier(rules) {
+async function prettier(rules = {}) {
   const pluginPrettier = await interopDefault(import("eslint-plugin-prettier"));
   const pRules = {
     ...rules
@@ -1499,14 +1499,14 @@ async function unocss(options = {}) {
 
 // src/configs/formatter.ts
 async function formatter(options = {}, prettierRules2 = {}) {
-  const {
-    css = true,
-    graphql,
-    html = true,
-    markdown,
-    toml,
-    yaml
-  } = options || {};
+  const { css, graphql, html, markdown, toml, yaml } = options === true ? {
+    css: true,
+    graphql: true,
+    html: true,
+    markdown: true,
+    toml: true,
+    yaml: true
+  } : options;
   const pluginPrettier = await interopDefault(import("eslint-plugin-prettier"));
   function createPrettierFormatter(files, parser, plugins) {
     const rules = {
@@ -1732,6 +1732,10 @@ async function defineConfig(options = {}, ...userConfigs) {
   const {
     autoRenamePlugins = true,
     componentExts = [],
+    formatter: formatterOptions = {
+      css: true,
+      html: true
+    },
     gitignore: enableGitignore = true,
     isInEditor: isInEditor2 = isInEditor,
     react: enableReact = false,
@@ -1842,22 +1846,26 @@ async function defineConfig(options = {}, ...userConfigs) {
       sortTsconfig()
     );
   }
-  let prettierRules2 = {
-    ...DEFAULT_PRETTIER_RULES
-  };
-  if (options.prettierRules) {
-    prettierRules2 = { ...prettierRules2, ...options.prettierRules };
-  }
-  if (usePrettierrc) {
-    const prettierConfig = await loadPrettierConfig(
-      options.cwd ?? process4.cwd()
+  if (formatterOptions) {
+    let prettierRules2 = {
+      ...DEFAULT_PRETTIER_RULES
+    };
+    if (options.prettierRules) {
+      prettierRules2 = { ...prettierRules2, ...options.prettierRules };
+    }
+    if (usePrettierrc) {
+      const prettierConfig = await loadPrettierConfig(
+        options.cwd ?? process4.cwd()
+      );
+      Object.assign(prettierRules2, prettierConfig);
+    }
+    configs.push(
+      prettier(prettierRules2),
+      formatter(formatterOptions, prettierRules2)
     );
-    Object.assign(prettierRules2, prettierConfig);
+  } else {
+    configs.push(prettier());
   }
-  configs.push(
-    prettier(prettierRules2),
-    formatter(options.formatter, prettierRules2)
-  );
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
     if (key in options)
       acc[key] = options[key];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderwyd/eslint-config",
   "type": "module",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "packageManager": "pnpm@8.15.5",
   "description": "Donny's ESLint config",
   "author": "Donny Wang <donny526@outlook.com> (https://github.com/coderwyd/)",
@@ -72,13 +72,13 @@
     "@eslint-types/typescript-eslint": "^7.2.0",
     "@eslint-types/unicorn": "^51.0.1",
     "@toml-tools/parser": "^1.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "eslint-config-flat-gitignore": "^0.1.3",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-antfu": "^2.1.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import-x": "^0.4.1",
+    "eslint-plugin-import-x": "^0.4.4",
     "eslint-plugin-jsdoc": "^48.2.1",
     "eslint-plugin-jsonc": "^2.14.1",
     "eslint-plugin-n": "^16.6.2",
@@ -88,9 +88,9 @@
     "eslint-plugin-tailwindcss": "^3.15.1",
     "eslint-plugin-unicorn": "^51.0.1",
     "eslint-plugin-unused-imports": "^3.1.0",
-    "eslint-plugin-vitest": "^0.3.26",
-    "eslint-plugin-vue": "^9.23.0",
-    "globals": "^14.0.0",
+    "eslint-plugin-vitest": "^0.4.0",
+    "eslint-plugin-vue": "^9.24.0",
+    "globals": "^15.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
     "parse-gitignore": "^2.0.0",
@@ -108,9 +108,9 @@
     "@types/node": "^20.11.30",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
-    "@unocss/eslint-plugin": "^0.58.6",
+    "@unocss/eslint-plugin": "^0.58.7",
     "bumpp": "^9.4.0",
-    "eslint": "^8.57.0",
+    "eslint": "9.0.0-rc.0",
     "eslint-flat-config-viewer": "^0.1.14",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -121,7 +121,7 @@
     "fs-extra": "^11.2.0",
     "lint-staged": "^15.2.2",
     "rimraf": "^5.0.5",
-    "simple-git-hooks": "^2.11.0",
+    "simple-git-hooks": "^2.11.1",
     "svelte-eslint-parser": "^0.33.1",
     "tsup": "^8.0.2",
     "tsx": "^4.7.1",