@deot/dev-updater 2.2.0 → 2.2.2

package/dist/index.cjs.js

@@ -54,13 +54,13 @@ class Update {
   commandOptions;
   constructor(commandOptions) {
     const locals = devShared.Locals.impl();
-    const { packageDir } = locals;
+    const { rootPackageOptions, packageDir, cwd } = locals;
     const packageOptionsMap = {
+      [cwd]: rootPackageOptions,
       ...Object.keys(locals.packageOptionsMap).reduce((result, key) => {
         result[path__namespace.resolve(packageDir, key)] = locals.packageOptionsMap[key];
         return result;
-      }, {}),
-      [packageDir]: locals.packageOptions
+      }, {})
     };
     this.packageOptionsMap = packageOptionsMap;
     this.commandOptions = commandOptions;
@@ -96,6 +96,7 @@ class Update {
           }
           resolve();
         }).catch(() => {
+          delete packageNames[packageName];
           resolve();
         });
       });
@@ -104,6 +105,7 @@ class Update {
   }
   async updatePackageOptions(changed) {
     const { packageOptionsMap, commandOptions } = this;
+    let packageFolderNames = [];
     Object.keys(packageOptionsMap).forEach((packageDir) => {
       const packageOptions = packageOptionsMap[packageDir];
       const { devDependencies = {}, dependencies = {} } = packageOptions;
@@ -118,14 +120,19 @@ class Update {
         });
       });
       if (isChanged) {
+        const locals = devShared.Locals.impl();
+        const { cwd } = locals;
+        if (packageDir !== cwd) {
+          packageFolderNames.push(packageDir.split("/").pop());
+        }
         if (commandOptions.dryRun) {
-          const locals = devShared.Locals.impl();
-          devShared.Logger.log(chalk.magenta(`CHANGED: `) + chalk.yellow(`Skipping ${path__namespace.relative(locals.cwd, packageDir)} Update`));
+          devShared.Logger.log(chalk.magenta(`CHANGED: `) + chalk.yellow(`Skipping ${path__namespace.relative(cwd, packageDir)} Update`));
         } else {
           fs.outputFileSync(`${packageDir}/package.json`, JSON.stringify(packageOptions, null, 2));
         }
       }
     });
+    return packageFolderNames;
   }
   async updateLock() {
     if (this.commandOptions.dryRun) {
@@ -181,7 +188,7 @@ ${message}`);
     spinner.start();
     let changed = await this.getPackageChanged();
     spinner.stop();
-    let message = `chore: deps updated 
+    let message = `deps updated 
 
 `;
     let keys = Object.keys(changed);
@@ -197,7 +204,8 @@ ${message}`);
         devShared.Logger.log(`${chalk.cyan(key)}: ${chalk.yellow(version)} -> ${chalk.green(changed[key][version])}`);
       });
     });
-    await this.updatePackageOptions(changed);
+    const packageFolderNames = await this.updatePackageOptions(changed);
+    message = `chore${packageFolderNames.length ? "(" : ""}${packageFolderNames.join(",")}${packageFolderNames.length ? ")" : ""}: ${message}`;
     await this.updateLock();
     await this.test();
     await this.commit(message);

package/dist/index.es.js

@@ -31,13 +31,13 @@ class Update {
   commandOptions;
   constructor(commandOptions) {
     const locals = Locals.impl();
-    const { packageDir } = locals;
+    const { rootPackageOptions, packageDir, cwd } = locals;
     const packageOptionsMap = {
+      [cwd]: rootPackageOptions,
       ...Object.keys(locals.packageOptionsMap).reduce((result, key) => {
         result[path.resolve(packageDir, key)] = locals.packageOptionsMap[key];
         return result;
-      }, {}),
-      [packageDir]: locals.packageOptions
+      }, {})
     };
     this.packageOptionsMap = packageOptionsMap;
     this.commandOptions = commandOptions;
@@ -73,6 +73,7 @@ class Update {
           }
           resolve();
         }).catch(() => {
+          delete packageNames[packageName];
           resolve();
         });
       });
@@ -81,6 +82,7 @@ class Update {
   }
   async updatePackageOptions(changed) {
     const { packageOptionsMap, commandOptions } = this;
+    let packageFolderNames = [];
     Object.keys(packageOptionsMap).forEach((packageDir) => {
       const packageOptions = packageOptionsMap[packageDir];
       const { devDependencies = {}, dependencies = {} } = packageOptions;
@@ -95,14 +97,19 @@ class Update {
         });
       });
       if (isChanged) {
+        const locals = Locals.impl();
+        const { cwd } = locals;
+        if (packageDir !== cwd) {
+          packageFolderNames.push(packageDir.split("/").pop());
+        }
         if (commandOptions.dryRun) {
-          const locals = Locals.impl();
-          Logger.log(chalk.magenta(`CHANGED: `) + chalk.yellow(`Skipping ${path.relative(locals.cwd, packageDir)} Update`));
+          Logger.log(chalk.magenta(`CHANGED: `) + chalk.yellow(`Skipping ${path.relative(cwd, packageDir)} Update`));
         } else {
           fs.outputFileSync(`${packageDir}/package.json`, JSON.stringify(packageOptions, null, 2));
         }
       }
     });
+    return packageFolderNames;
   }
   async updateLock() {
     if (this.commandOptions.dryRun) {
@@ -158,7 +165,7 @@ ${message}`);
     spinner.start();
     let changed = await this.getPackageChanged();
     spinner.stop();
-    let message = `chore: deps updated 
+    let message = `deps updated 
 
 `;
     let keys = Object.keys(changed);
@@ -174,7 +181,8 @@ ${message}`);
         Logger.log(`${chalk.cyan(key)}: ${chalk.yellow(version)} -> ${chalk.green(changed[key][version])}`);
       });
     });
-    await this.updatePackageOptions(changed);
+    const packageFolderNames = await this.updatePackageOptions(changed);
+    message = `chore${packageFolderNames.length ? "(" : ""}${packageFolderNames.join(",")}${packageFolderNames.length ? ")" : ""}: ${message}`;
     await this.updateLock();
     await this.test();
     await this.commit(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/dev-updater",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "types": "dist/index.d.ts",