@deot/dev-updater 2.6.0 → 2.7.0

package/dist/index.cjs

@@ -36,16 +36,8 @@ const fitVersion = (versions, version, commandOptions) => {
   let originalPrefix = (version.match(/([^\d]*).*/) || ["", ""])[1];
   let prefix = major ? ">=" : minor ? "^" : patch ? "~" : originalPrefix;
   let oldVersion = version.match(vRegex)[1];
-  let newVersion = oldVersion;
   let vailds = versions.slice(versions.indexOf(oldVersion) + 1);
-  for (let i = 0; i < vailds.length; i++) {
-    if (!semver.satisfies(vailds[i], prefix + oldVersion)) {
-      newVersion = i - 1 < 0 ? oldVersion : vailds[i - 1];
-      break;
-    } else {
-      newVersion = vailds[i];
-    }
-  }
+  let newVersion = semver.maxSatisfying(vailds, prefix + oldVersion) || oldVersion;
   return `${originalPrefix}${newVersion}`;
 };
 
@@ -133,6 +125,7 @@ class Update {
         if (commandOptions.dryRun) {
           devShared.Logger.log(chalk.magenta(`CHANGED: `) + chalk.yellow(`Skipping ${path__namespace.relative(cwd, packageDir)} Update`));
         } else {
+          fs.removeSync(`${packageDir}/node_modules`);
           fs.outputFileSync(`${packageDir}/package.json`, JSON.stringify(packageOptions, null, 2));
         }
       }
@@ -144,6 +137,9 @@ class Update {
       devShared.Logger.log(chalk.yellow(`Skipping pnpm-lock.yaml Update`));
     } else {
       devShared.Logger.log(chalk.magenta(`CHANGED: `) + `pnpm-lock.yaml`);
+      const locals = devShared.Locals.impl();
+      const { cwd } = locals;
+      await fs.remove(`${cwd}/node_modules`);
       await devShared.Shell.spawn("npx", ["pnpm", "install", "--lockfile-only"]);
     }
   }
@@ -209,8 +205,11 @@ ${message}`);
         devShared.Logger.log(`${chalk.cyan(key)}: ${chalk.yellow(version)} -> ${chalk.green(changed[key][version])}`);
       });
     });
-    const packageFolderNames = await this.updatePackageOptions(changed);
-    message = `chore${packageFolderNames.length ? "(" : ""}${packageFolderNames.join(",")}${packageFolderNames.length ? ")" : ""}: ${message}`;
+    const { all } = this.commandOptions;
+    let packageFolderNames = await this.updatePackageOptions(changed);
+    let hasChanged = packageFolderNames.length;
+    packageFolderNames = hasChanged && all ? ["*"] : packageFolderNames;
+    message = `chore${hasChanged ? "(" : ""}${packageFolderNames.join(",")}${hasChanged ? ")" : ""}: ${message}`;
     await this.updateLock();
     await this.test();
     await this.commit(message);
@@ -238,6 +237,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
     major: false,
     minor: false,
     patch: false,
+    all: false,
     ...options
   };
   if (process.env.NODE_ENV === "UNIT")

package/dist/index.js

@@ -13,16 +13,8 @@ const fitVersion = (versions, version, commandOptions) => {
   let originalPrefix = (version.match(/([^\d]*).*/) || ["", ""])[1];
   let prefix = major ? ">=" : minor ? "^" : patch ? "~" : originalPrefix;
   let oldVersion = version.match(vRegex)[1];
-  let newVersion = oldVersion;
   let vailds = versions.slice(versions.indexOf(oldVersion) + 1);
-  for (let i = 0; i < vailds.length; i++) {
-    if (!semver.satisfies(vailds[i], prefix + oldVersion)) {
-      newVersion = i - 1 < 0 ? oldVersion : vailds[i - 1];
-      break;
-    } else {
-      newVersion = vailds[i];
-    }
-  }
+  let newVersion = semver.maxSatisfying(vailds, prefix + oldVersion) || oldVersion;
   return `${originalPrefix}${newVersion}`;
 };
 
@@ -110,6 +102,7 @@ class Update {
         if (commandOptions.dryRun) {
           Logger.log(chalk.magenta(`CHANGED: `) + chalk.yellow(`Skipping ${path.relative(cwd, packageDir)} Update`));
         } else {
+          fs.removeSync(`${packageDir}/node_modules`);
           fs.outputFileSync(`${packageDir}/package.json`, JSON.stringify(packageOptions, null, 2));
         }
       }
@@ -121,6 +114,9 @@ class Update {
       Logger.log(chalk.yellow(`Skipping pnpm-lock.yaml Update`));
     } else {
       Logger.log(chalk.magenta(`CHANGED: `) + `pnpm-lock.yaml`);
+      const locals = Locals.impl();
+      const { cwd } = locals;
+      await fs.remove(`${cwd}/node_modules`);
       await Shell.spawn("npx", ["pnpm", "install", "--lockfile-only"]);
     }
   }
@@ -186,8 +182,11 @@ ${message}`);
         Logger.log(`${chalk.cyan(key)}: ${chalk.yellow(version)} -> ${chalk.green(changed[key][version])}`);
       });
     });
-    const packageFolderNames = await this.updatePackageOptions(changed);
-    message = `chore${packageFolderNames.length ? "(" : ""}${packageFolderNames.join(",")}${packageFolderNames.length ? ")" : ""}: ${message}`;
+    const { all } = this.commandOptions;
+    let packageFolderNames = await this.updatePackageOptions(changed);
+    let hasChanged = packageFolderNames.length;
+    packageFolderNames = hasChanged && all ? ["*"] : packageFolderNames;
+    message = `chore${hasChanged ? "(" : ""}${packageFolderNames.join(",")}${hasChanged ? ")" : ""}: ${message}`;
     await this.updateLock();
     await this.test();
     await this.commit(message);
@@ -215,6 +214,7 @@ const run = (options) => Utils.autoCatch(async () => {
     major: false,
     minor: false,
     patch: false,
+    all: false,
     ...options
   };
   if (process.env.NODE_ENV === "UNIT")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-updater",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,9 +19,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.6.0",
+    "@deot/dev-shared": "^2.7.0",
     "chalk": "^5.3.0",
-    "fs-extra": "^11.1.1",
+    "fs-extra": "^11.2.0",
     "ora": "^7.0.1",
     "semver": "^7.5.4"
   }