@coderwyd/eslint-config 2.3.1 → 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.1";
+var version = "2.3.2";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@types/eslint": "^8.56.6",

package/dist/cli.js

@@ -17,7 +17,7 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "2.3.1";
+var version = "2.3.2";
 var devDependencies = {
   "@antfu/ni": "^0.21.12",
   "@types/eslint": "^8.56.6",

package/dist/index.cjs

@@ -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,21 +1545,14 @@ async function unocss(options = {}) {
 
 // src/configs/formatter.ts
 async function formatter(options = {}, prettierRules2 = {}) {
-  const {
-    css = true,
-    graphql = false,
-    html = true,
-    markdown = false,
-    toml = false,
-    yaml = false
-  } = typeof options === "object" ? 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 = {
@@ -1785,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,
@@ -1895,21 +1892,25 @@ 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);
-  }
-  configs.push(prettier(options.formatter ? prettierRules2 : {}));
-  if (options.formatter) {
-    configs.push(formatter(options.formatter, prettierRules2));
+  } else {
+    configs.push(prettier());
   }
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
     if (key in options)

package/dist/index.js

@@ -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,21 +1499,14 @@ async function unocss(options = {}) {
 
 // src/configs/formatter.ts
 async function formatter(options = {}, prettierRules2 = {}) {
-  const {
-    css = true,
-    graphql = false,
-    html = true,
-    markdown = false,
-    toml = false,
-    yaml = false
-  } = typeof options === "object" ? 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 = {
@@ -1739,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,
@@ -1849,21 +1846,25 @@ 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);
-  }
-  configs.push(prettier(options.formatter ? prettierRules2 : {}));
-  if (options.formatter) {
-    configs.push(formatter(options.formatter, prettierRules2));
+  } else {
+    configs.push(prettier());
   }
   const fusedConfig = flatConfigProps.reduce((acc, key) => {
     if (key in options)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@coderwyd/eslint-config",
   "type": "module",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "packageManager": "pnpm@8.15.5",
   "description": "Donny's ESLint config",
   "author": "Donny Wang <donny526@outlook.com> (https://github.com/coderwyd/)",