@isentinel/eslint-config 1.2.4 → 1.2.6

package/dist/cli.js

@@ -18,7 +18,7 @@ init_esm_shims();
 import ansis from "ansis";
 
 // package.json
-var version = "1.2.4";
+var version = "1.2.6";
 var package_default = {
   name: "@isentinel/eslint-config",
   version,
@@ -329,7 +329,7 @@ var versionsMap = {
 };
 
 // src/cli/stages/update-package-json.ts
-async function updatePackageJson() {
+async function updatePackageJson(result) {
   const cwd = process2.cwd();
   const pathPackageJSON = path2.join(cwd, "package.json");
   log2.step(ansis3.cyan(`Bumping @isentinel/eslint-config to v${version}`));
@@ -339,9 +339,13 @@ async function updatePackageJson() {
   parsedPackage.devDependencies["@isentinel/eslint-config"] = `^${version}`;
   parsedPackage.devDependencies.eslint ??= versionsMap.eslint;
   const addedPackages = [];
-  for (const dep of dependenciesMap["react"]) {
-    parsedPackage.devDependencies[dep] = versionsMap[dep];
-    addedPackages.push(dep);
+  for (const framework of result.frameworks) {
+    if (framework in dependenciesMap) {
+      for (const dep of dependenciesMap[framework]) {
+        parsedPackage.devDependencies[dep] = versionsMap[dep];
+        addedPackages.push(dep);
+      }
+    }
   }
   if (addedPackages.length) {
     note2(`${ansis3.dim(addedPackages.join(", "))}`, "Added packages");
@@ -386,41 +390,42 @@ async function updateVscodeSettings(result) {
 // src/cli/run.ts
 async function run(options = {}) {
   const argumentSkipPrompt = !!process4.env.SKIP_PROMPT || options.yes;
-  const argumentTemplate = options.frameworks?.map((framework) => framework?.trim()).filter(Boolean);
+  const argumentTemplate = options.frameworks?.map((framework) => framework.trim());
   const eslintConfigFiles = fs3.readdirSync(process4.cwd()).filter((file) => file.startsWith("eslint.config."));
   if (eslintConfigFiles.length > 0) {
     log4.warn(ansis5.yellow(`${eslintConfigFiles[0]} already exists, migration wizard exited.`));
     return process4.exit(1);
   }
   let result = {
-    frameworks: argumentTemplate,
+    frameworks: argumentTemplate ?? [],
     uncommittedConfirmed: false,
     updateVscodeSettings: true
   };
   if (!argumentSkipPrompt) {
     result = await group(
       {
+        uncommittedConfirmed: () => {
+          if (argumentSkipPrompt || isGitClean()) {
+            return Promise.resolve(true);
+          }
+          return confirm({
+            initialValue: false,
+            message: "There are uncommitted changes in the current repository, are you sure to continue?"
+          });
+        },
+        // eslint-disable-next-line perfectionist/sort-objects -- keep the order of prompts
         frameworks: ({ results }) => {
-          const isArgumentTemplateValid = typeof argumentTemplate === "string" && !!frameworks.includes(argumentTemplate);
+          const isArgumentTemplateValid = argumentTemplate && argumentTemplate.length > 0 && argumentTemplate.every((template) => frameworks.includes(template));
           if (!results.uncommittedConfirmed || isArgumentTemplateValid) {
             return;
           }
-          const message = !isArgumentTemplateValid && argumentTemplate ? `"${argumentTemplate}" isn't a valid template. Please choose from below: ` : "Select a framework:";
+          const message = argumentTemplate && argumentTemplate.length > 0 && !isArgumentTemplateValid ? `"${argumentTemplate.join(", ")}" isn't a valid template. Please choose from below: ` : "Select a framework:";
           return multiselect({
             message: ansis5.reset(message),
             options: frameworkOptions,
             required: false
           });
         },
-        uncommittedConfirmed: () => {
-          if (argumentSkipPrompt || isGitClean()) {
-            return Promise.resolve(true);
-          }
-          return confirm({
-            initialValue: false,
-            message: "There are uncommitted changes in the current repository, are you sure to continue?"
-          });
-        },
         updateVscodeSettings: ({ results }) => {
           if (!results.uncommittedConfirmed) {
             return;
@@ -442,7 +447,7 @@ async function run(options = {}) {
       return process4.exit(1);
     }
   }
-  await updatePackageJson();
+  await updatePackageJson(result);
   await updateEslintFiles(result);
   await updateVscodeSettings(result);
   log4.success(ansis5.green("Setup completed"));
@@ -469,14 +474,17 @@ var instance = yargs(hideBin(process5.argv)).scriptName("@isentinel/eslint-confi
       type: "boolean"
     }).option("template", {
       alias: "t",
-      description: "Use the framework template for optimal customization: react",
+      description: "Use the framework template for optimal customization: react, jest",
       type: "string"
     }).help();
   },
   async (args) => {
     header();
     try {
-      await run(args);
+      await run({
+        ...args,
+        frameworks: args.template ? [args.template] : void 0
+      });
     } catch (err) {
       log5.error(ansis6.inverse(ansis6.red(" Failed to migrate ")));
       log5.error(ansis6.red(`\u2718 ${String(err)}`));

package/dist/index.js

@@ -3344,7 +3344,7 @@ async function disables() {
       }
     },
     {
-      files: ["**/*.{test,spec}.([tj])s?(x)"],
+      files: [...GLOB_TESTS],
       name: "style/disables/test",
       rules: {
         "antfu/no-top-level-await": "off",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isentinel/eslint-config",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "iSentinel's ESLint config",
   "keywords": [
     "eslint-config",
@@ -110,7 +110,7 @@
     "simple-git-hooks": "2.12.1",
     "tsup": "8.4.0",
     "typescript": "5.8.3",
-    "@isentinel/eslint-config": "1.2.4"
+    "@isentinel/eslint-config": "1.2.6"
   },
   "peerDependencies": {
     "@eslint-react/eslint-plugin": "^1.45.0",