@coderwyd/eslint-config 1.1.1 → 2.0.0

package/dist/cli.js

@@ -17,32 +17,30 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "1.1.1";
+var version = "2.0.0";
 var devDependencies = {
-  "@antfu/ni": "^0.21.10",
-  "@stylistic/eslint-plugin-migrate": "^1.4.0",
-  "@types/eslint": "^8.44.7",
+  "@antfu/ni": "^0.21.12",
+  "@types/eslint": "^8.56.0",
   "@types/fs-extra": "^11.0.4",
-  "@types/node": "^20.9.4",
+  "@types/node": "^20.10.5",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.57.7",
-  bumpp: "^9.2.0",
-  eslint: "^8.54.0",
-  "eslint-flat-config-viewer": "^0.1.3",
+  "@unocss/eslint-plugin": "^0.58.2",
+  bumpp: "^9.2.1",
+  eslint: "^8.56.0",
+  "eslint-flat-config-viewer": "^0.1.4",
   "eslint-plugin-react": "^7.33.2",
   "eslint-plugin-react-hooks": "^4.6.0",
-  "eslint-plugin-react-refresh": "^0.4.4",
+  "eslint-plugin-react-refresh": "^0.4.5",
   esno: "^4.0.0",
   execa: "^8.0.1",
   "fast-glob": "^3.3.2",
-  "fs-extra": "^11.1.1",
-  "lint-staged": "^15.1.0",
+  "fs-extra": "^11.2.0",
+  "lint-staged": "^15.2.0",
   rimraf: "^5.0.5",
   "simple-git-hooks": "^2.9.0",
   tsup: "^8.0.1",
-  typescript: "^5.3.2",
-  vitest: "^0.34.6"
+  typescript: "^5.3.3"
 };
 
 // src/cli/constants.ts
@@ -65,31 +63,20 @@ var vscodeSettingsString = `
     "source.organizeImports": "never"
   },
 
-  // Silent the stylistic rules in you IDE, but still auto fix them
-  "eslint.rules.customizations": [
-    { "rule": "style/*", "severity": "off" },
-    { "rule": "*-indent", "severity": "off" },
-    { "rule": "*-spacing", "severity": "off" },
-    { "rule": "*-spaces", "severity": "off" },
-    { "rule": "*-order", "severity": "off" },
-    { "rule": "*-dangle", "severity": "off" },
-    { "rule": "*-newline", "severity": "off" },
-    { "rule": "*quotes", "severity": "off" },
-    { "rule": "*semi", "severity": "off" }
-  ],
-
   // Enable eslint for all supported languages
   "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact",
-    "vue",
+    "svelte",
+    "astro",
     "html",
-    "markdown",
+    "css",
+    "less",
+    "scss",
     "json",
     "jsonc",
-    "yaml"
+    "yaml",
+    "yml",
+    "markdown",
+    "toml"
   ]
 `;
 
@@ -113,11 +100,23 @@ async function run(options = {}) {
   const pathPackageJSON = path.join(cwd, "package.json");
   const pathESLintIngore = path.join(cwd, ".eslintignore");
   if (fs.existsSync(pathFlatConfig)) {
-    console.log(c2.yellow(`${WARN} eslint.config.js already exists, migration wizard exited.`));
-    return;
+    console.log(
+      c2.yellow(
+        `${WARN} eslint.config.js already exists, migration wizard exited.`
+      )
+    );
+    return process.exit(1);
+  }
+  if (!SKIP_GIT_CHECK && !isGitClean()) {
+    const { confirmed } = await prompts({
+      initial: false,
+      message: "There are uncommitted changes in the current repository, are you sure to continue?",
+      name: "confirmed",
+      type: "confirm"
+    });
+    if (!confirmed)
+      return process.exit(1);
   }
-  if (!SKIP_GIT_CHECK && !isGitClean())
-    throw new Error("There are uncommitted changes in the current repository, please commit them and try again");
   console.log(c2.cyan(`${ARROW} bumping @coderwyd/eslint-config to v${version}`));
   const pkgContent = await fsp.readFile(pathPackageJSON, "utf-8");
   const pkg = JSON.parse(pkgContent);
@@ -137,24 +136,26 @@ async function run(options = {}) {
       if (glob.type === "ignore")
         eslintIgnores.push(...glob.patterns);
       else if (glob.type === "unignore")
-        eslintIgnores.push(...glob.patterns.map((pattern) => `!${pattern}`));
+        eslintIgnores.push(
+          ...glob.patterns.map((pattern) => `!${pattern}`)
+        );
     }
   }
   let eslintConfigContent = "";
   const coderwydConfig = `${eslintIgnores.length ? `ignores: ${JSON.stringify(eslintIgnores)}` : ""}`;
   if (pkg.type === "module") {
     eslintConfigContent = `
-import coderwyd from '@coderwyd/eslint-config'
+import { defineConfig } from '@coderwyd/eslint-config'
 
-export default coderwyd({
+export default defineConfig({
 ${coderwydConfig}
 })
 `.trimStart();
   } else {
     eslintConfigContent = `
-const coderwyd = require('@coderwyd/eslint-config').default
+const { defineConfig } = require('@coderwyd/eslint-config')
 
-module.exports = coderwyd({
+module.exports = defineConfig({
 ${coderwydConfig}
 })
 `.trimStart();
@@ -176,22 +177,25 @@ ${coderwydConfig}
   };
   if (!SKIP_PROMPT) {
     try {
-      promptResult = await prompts({
-        initial: true,
-        message: "Update .vscode/settings.json for better VS Code experience?",
-        name: "updateVscodeSettings",
-        type: "confirm"
-      }, {
-        onCancel: () => {
-          throw new Error(`Cancelled`);
+      promptResult = await prompts(
+        {
+          initial: true,
+          message: "Update .vscode/settings.json for better VS Code experience?",
+          name: "updateVscodeSettings",
+          type: "confirm"
+        },
+        {
+          onCancel: () => {
+            throw new Error(`Cancelled`);
+          }
         }
-      });
+      );
     } catch (cancelled) {
       console.log(cancelled.message);
       return;
     }
   }
-  if (promptResult?.updateVscodeSettings ?? true) {
+  if ((promptResult == null ? void 0 : promptResult.updateVscodeSettings) ?? true) {
     const dotVscodePath = path.join(cwd, ".vscode");
     const settingsPath = path.join(dotVscodePath, "settings.json");
     if (!fs.existsSync(dotVscodePath))
@@ -211,8 +215,10 @@ ${coderwydConfig}
     }
   }
   console.log(c2.green(`${CHECK} migration completed`));
-  console.log(`Now you can update the dependencies and run ${c2.blue("eslint . --fix")}
-`);
+  console.log(
+    `Now you can update the dependencies and run ${c2.blue("eslint . --fix")}
+`
+  );
 }
 
 // src/cli/index.ts
@@ -223,7 +229,11 @@ ${c3.green(`@coderwyd/eslint-config `)}${c3.dim(`v${version}`)}`);
 var instance = yargs(hideBin(process2.argv)).scriptName("@coderwyd/eslint-config").usage("").command(
   "*",
   "Run the initialization or migration",
-  (args) => args.option("yes", { alias: "y", description: "Skip prompts and use default values", type: "boolean" }).help(),
+  (args) => args.option("yes", {
+    alias: "y",
+    description: "Skip prompts and use default values",
+    type: "boolean"
+  }).help(),
   async (args) => {
     header();
     console.log();