@deot/dev-releaser 1.1.1 → 1.1.2

package/dist/index.cjs.js

@@ -441,9 +441,6 @@ class Release {
             cwd: packageDir
         });
     }
-    async clean() {
-        await this.cleanTagsAndKeepLastTag();
-    }
     async cleanTagsAndKeepLastTag() {
         const { commandOptions } = this;
         if (!commandOptions.keepLastTag)
@@ -561,29 +558,40 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
         devShared.Logger.log(chalk.yellow('Git Fetch...'));
         await devShared.Shell.spawn('git', ['fetch', '--prune', '--prune-tags']);
     }
+    devShared.Logger.log(chalk.blue(`\n---------------------\n`));
     await inputs
         .reduce((preProcess, packageFolderName) => {
         const instance = instances[packageFolderName];
         preProcess = preProcess
             .then(() => instance.publish())
-            .then(() => instance.tag())
-            .then(() => instance.clean());
+            .then(() => instance.tag());
         return preProcess;
     }, Promise.resolve());
     devShared.Logger.log(chalk.blue(`\n---------------------\n`));
     if (!isChanged) {
-        devShared.Logger.log(chalk.magenta(`FINISH: `) + 'Nothing Chanaged.');
+        devShared.Logger.log(chalk.magenta(`PUSH: `) + 'Nothing Chanaged.');
     }
     else if (!options.push) {
-        devShared.Logger.log(chalk.magenta(`FINISH: `) + 'Push Disabled.');
+        devShared.Logger.log(chalk.magenta(`PUSH: `) + 'Push Disabled.');
     }
     else if (options.dryRun) {
-        devShared.Logger.log(chalk.magenta(`FINISH: `) + 'Skipping Git Push');
+        devShared.Logger.log(chalk.magenta(`PUSH: `) + 'Skipping Git Push');
     }
     else {
+        devShared.Logger.log(chalk.yellow('Git Pull/Push...'));
+        await devShared.Shell.spawn('git', ['pull', '--rebase']);
         await devShared.Shell.spawn('git', ['push']);
         await devShared.Shell.spawn('git', ['push', '--tags']);
     }
+    devShared.Logger.log(chalk.blue(`\n---------------------\n`));
+    await inputs
+        .reduce((preProcess, packageFolderName) => {
+        const instance = instances[packageFolderName];
+        preProcess = preProcess
+            .then(() => instance.cleanTagsAndKeepLastTag());
+        return preProcess;
+    }, Promise.resolve());
+    devShared.Logger.log(chalk.magenta(`FINISH: `) + chalk.green(`Release Successed.`));
     if (options.dryRun) {
         devShared.Logger.log(chalk.green('NO DRY RUN WAY: ')
             + chalk.grey(`npm run release -- --no-dry-run\n`));
@@ -596,6 +604,7 @@ const run = (options) => devShared.Utils.autoCatch(async () => {
         else {
             devShared.Logger.error(e);
         }
+        devShared.Logger.log(chalk.magenta(`FINISH: `) + chalk.red(`Release Failed.`));
         process.exit(1);
     }
 });

package/dist/index.es.js

@@ -420,9 +420,6 @@ class Release {
             cwd: packageDir
         });
     }
-    async clean() {
-        await this.cleanTagsAndKeepLastTag();
-    }
     async cleanTagsAndKeepLastTag() {
         const { commandOptions } = this;
         if (!commandOptions.keepLastTag)
@@ -540,29 +537,40 @@ const run = (options) => Utils.autoCatch(async () => {
         Logger.log(chalk.yellow('Git Fetch...'));
         await Shell.spawn('git', ['fetch', '--prune', '--prune-tags']);
     }
+    Logger.log(chalk.blue(`\n---------------------\n`));
     await inputs
         .reduce((preProcess, packageFolderName) => {
         const instance = instances[packageFolderName];
         preProcess = preProcess
             .then(() => instance.publish())
-            .then(() => instance.tag())
-            .then(() => instance.clean());
+            .then(() => instance.tag());
         return preProcess;
     }, Promise.resolve());
     Logger.log(chalk.blue(`\n---------------------\n`));
     if (!isChanged) {
-        Logger.log(chalk.magenta(`FINISH: `) + 'Nothing Chanaged.');
+        Logger.log(chalk.magenta(`PUSH: `) + 'Nothing Chanaged.');
     }
     else if (!options.push) {
-        Logger.log(chalk.magenta(`FINISH: `) + 'Push Disabled.');
+        Logger.log(chalk.magenta(`PUSH: `) + 'Push Disabled.');
     }
     else if (options.dryRun) {
-        Logger.log(chalk.magenta(`FINISH: `) + 'Skipping Git Push');
+        Logger.log(chalk.magenta(`PUSH: `) + 'Skipping Git Push');
     }
     else {
+        Logger.log(chalk.yellow('Git Pull/Push...'));
+        await Shell.spawn('git', ['pull', '--rebase']);
         await Shell.spawn('git', ['push']);
         await Shell.spawn('git', ['push', '--tags']);
     }
+    Logger.log(chalk.blue(`\n---------------------\n`));
+    await inputs
+        .reduce((preProcess, packageFolderName) => {
+        const instance = instances[packageFolderName];
+        preProcess = preProcess
+            .then(() => instance.cleanTagsAndKeepLastTag());
+        return preProcess;
+    }, Promise.resolve());
+    Logger.log(chalk.magenta(`FINISH: `) + chalk.green(`Release Successed.`));
     if (options.dryRun) {
         Logger.log(chalk.green('NO DRY RUN WAY: ')
             + chalk.grey(`npm run release -- --no-dry-run\n`));
@@ -575,6 +583,7 @@ const run = (options) => Utils.autoCatch(async () => {
         else {
             Logger.error(e);
         }
+        Logger.log(chalk.magenta(`FINISH: `) + chalk.red(`Release Failed.`));
         process.exit(1);
     }
 });

package/package.json

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