updating staging script

Author: hsubox76

scripts/release/cli.ts

@@ -50,10 +50,10 @@ yargs
         type: 'boolean',
         default: false
       },
-      skipPrompts: {
+      ci: {
         type: 'boolean',
         default: false,
-        desc: 'Skip all interactive prompts (needed if running in CI)'
+        desc: 'set if running in CI (skips prompts, uses wombot publish)'
       }
     },
     argv => runRelease(argv)

scripts/release/release.ts

@@ -17,7 +17,7 @@
 
 import { exec } from 'child-process-promise';
 import { createPromptModule } from 'inquirer';
-import { publish } from './utils/publish';
+import { publish, publishInCI } from './utils/publish';
 import { pushReleaseTagsToGithub, cleanTree, hasDiff } from './utils/git';
 import {
   releaseType as releaseTypePrompt,
@@ -27,15 +27,17 @@ import { reinstallDeps, buildPackages } from './utils/yarn';
 import { runTests, setupTestDeps } from './utils/tests';
 import { bumpVersionForStaging } from './staging';
 import { ReleaseType } from './utils/enums';
+import { getAllPackages } from './utils/workspace';
+import { release } from 'os';
 const prompt = createPromptModule();
 
 interface releaseOptions {
   skipReinstall: boolean;
   skipTests: boolean;
   ignoreUnstaged: boolean;
   releaseType?: string;
-  dryRun?: boolean;
-  skipPrompts: boolean;
+  dryRun: boolean;
+  ci: boolean;
 }
 
 export async function runRelease({
@@ -44,7 +46,7 @@ export async function runRelease({
   ignoreUnstaged,
   releaseType: inputReleaseType,
   dryRun,
-  skipPrompts
+  ci
 }: releaseOptions) {
   try {
     /**
@@ -92,14 +94,16 @@ export async function runRelease({
 
     console.log(`Publishing ${inputReleaseType} release.`);
 
+    let packagesToPublish = [];
+
     /**
      * Bump versions for staging release
      * NOTE: For prod, versions are bumped in a PR which should be merged before running this script
      */
     if (releaseType === ReleaseType.Staging) {
       const updatedPackages = await bumpVersionForStaging();
 
-      if (!skipPrompts) {
+      if (!ci) {
         // We don't need to validate versions for prod releases because prod releases
         // are validated in the version bump PR which should be merged before running this script
         const { versionCheck } = await prompt([
@@ -110,6 +114,10 @@ export async function runRelease({
           throw new Error('Version check failed');
         }
       }
+
+      for (const key of updatedPackages.keys()) {
+        packagesToPublish.push(key);
+      }
     }
 
     /**
@@ -138,26 +146,43 @@ export async function runRelease({
     }
 
     /**
-     * Do not actually publish if it is a dryrun
+     * Publish new versions to NPM using changeset (if manual)
+     * or using wombot for each package (if CI)
+     * It will also create tags
      */
-    if (!dryRun) {
+    if (ci) {
       /**
-       * Release new versions to NPM using changeset
-       * It will also create tags
+       * If the script is calling each individual npm command
+       * it can add the npm flag --dry-run, to better simulate
+       * everything in the publish process except publishing.
        */
-      await publish(releaseType);
-
+      if (releaseType === ReleaseType.Staging) {
+        await publishInCI(packagesToPublish, "next", dryRun);
+      } else {
+        // Production.
+        await publishInCI(packagesToPublish, "latest", dryRun);
+      }
+    } else {
       /**
-       * Changeset creats tags for staging releases as well,
-       * but we should only push tags to Github for prod releases
+       * If the script uses changeset to publish, there's no
+       * way to add the dry-run flag to each npm CLI command.
        */
-      if (releaseType === ReleaseType.Production) {
-        /**
-         * Push release tags created by changeset in publish() to Github
-         */
-        await pushReleaseTagsToGithub();
+      if (!dryRun) {
+        // Uses changeset
+        await publish(releaseType);
       }
     }
+
+    /**
+     * Changeset creates tags for staging releases as well,
+     * but we should only push tags to Github for prod releases
+     */
+      if (releaseType === ReleaseType.Production && !dryRun) {
+      /**
+       * Push release tags created by changeset in publish() to Github
+       */
+      await pushReleaseTagsToGithub();
+    }
   } catch (err) {
     /**
      * Log any errors that happened during the process

scripts/release/utils/publish.ts

@@ -37,7 +37,7 @@ export async function publish(releaseType: string) {
   });
 }
 
-export async function publishInCI(updatedPkgs: string[], npmTag: string) {
+export async function publishInCI(updatedPkgs: string[], npmTag: string, dryRun: boolean) {
   const taskArray = await Promise.all(
     updatedPkgs.map(async pkg => {
       const path = await mapPkgNameToPkgPath(pkg);
@@ -62,7 +62,7 @@ export async function publishInCI(updatedPkgs: string[], npmTag: string) {
 
       return {
         title: `📦  ${pkg}@${version}`,
-        task: () => publishPackageInCI(pkg, npmTag)
+        task: () => publishPackageInCI(pkg, npmTag, dryRun)
       };
     })
   );
@@ -75,7 +75,7 @@ export async function publishInCI(updatedPkgs: string[], npmTag: string) {
   return tasks.run();
 }
 
-async function publishPackageInCI(pkg: string, npmTag: string) {
+async function publishPackageInCI(pkg: string, npmTag: string, dryRun: boolean) {
   try {
     const path = await mapPkgNameToPkgPath(pkg);
 
@@ -92,6 +92,10 @@ async function publishPackageInCI(pkg: string, npmTag: string) {
       'https://wombat-dressing-room.appspot.com'
     ];
 
+    if (dryRun) {
+      args.push('--dry-run');
+    }
+
     // Write proxy registry token for this package to .npmrc.
     await exec(
       `echo "//wombat-dressing-room.appspot.com/:_authToken=${