adding apply git tags on pack option

chaseholland · chaseholland · commit 67d966d8abaa · 2019-08-28T11:31:29.000-07:00
diff --git a/apps/rush-lib/src/cli/actions/PublishAction.ts b/apps/rush-lib/src/cli/actions/PublishAction.ts
@@ -46,6 +46,7 @@ export class PublishAction extends BaseRushAction {
   private _force: CommandLineFlagParameter;
   private _prereleaseToken: PrereleaseToken;
   private _versionPolicy: CommandLineStringParameter;
+  private _applyGitTagsOnPack: CommandLineFlagParameter;
 
   private _releaseFolder: CommandLineStringParameter;
   private _pack: CommandLineFlagParameter;
@@ -180,6 +181,12 @@ export class PublishAction extends BaseRushAction {
       parameterShortName: undefined,
       description: 'If this flag is specified with --publish, packages will be published with --force on npm'
     });
+    this._applyGitTagsOnPack = this.defineFlagParameter({
+      parameterLongName: '--apply-git-tags-on-pack',
+      parameterShortName: undefined,
+      description: `If specified with --publish and --pack, git tags will be applied for packages on pack` +
+      ` as if a publish was being run without --pack.`
+    });
   }
 
   /**
@@ -312,14 +319,23 @@ export class PublishAction extends BaseRushAction {
       if (packageConfig.shouldPublish &&
         (!this._versionPolicy.value || this._versionPolicy.value === packageConfig.versionPolicyName)
       ) {
+        const applyTag: (apply: boolean) => void = (apply: boolean): void => {
+          if (!apply) {
+            return;
+          }
+
+          git.addTag(!!this._publish.value && !this._registryUrl.value, packageName, packageConfig.packageJson.version);
+          updated = true;
+        };
+
         if (this._pack.value) {
           // packs to tarball instead of publishing to NPM repository
           this._npmPack(packageName, packageConfig);
+          applyTag(this._applyGitTagsOnPack.value);
         } else if (this._force.value || !this._packageExists(packageConfig)) {
           // Publish to npm repository
           this._npmPublish(packageName, packageConfig.projectFolder);
-          git.addTag(!!this._publish.value && !this._registryUrl.value, packageName, packageConfig.packageJson.version);
-          updated = true;
+          applyTag(true);
         } else {
           console.log(`Skip ${packageName}. Not updated.`);
         }
diff --git a/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap b/apps/rush-lib/src/cli/test/__snapshots__/CommandLineHelp.test.ts.snap
@@ -343,6 +343,7 @@ exports[`CommandLineHelp prints the help for each action: publish 1`] = `
                     [--release-folder FOLDER] [--include-all]
                     [--version-policy POLICY] [--prerelease-name NAME]
                     [--partial-prerelease] [--suffix SUFFIX] [--force]
+                    [--apply-git-tags-on-pack]
                     
 
 Reads and processes package publishing change requests generated by \\"rush 
@@ -412,6 +413,10 @@ Optional arguments:
                         used with --prerelease-name.
   --force               If this flag is specified with --publish, packages 
                         will be published with --force on npm
+  --apply-git-tags-on-pack
+                        If specified with --publish and --pack, git tags will 
+                        be applied for packages on pack as if a publish was 
+                        being run without --pack.
 "
 `;
 
