Clean up publish-npm.js and use parseVersion

Summary:
Changelog: [Internal] Remove unnecessary logic and new parseVersions function

Changes:
* Remove `tagsForVersions` which in the past got all the tags for the `currentCommit` to figure out which one we're releasing to. I believe this is redundant because the CircleCI envvar `CIRCLE_TAG` should already have the version that we're releasing -- this is set in `bump-oss-version`. Note: this will only be set for full-on releases, (re: not nightly or commitly)
* Re-arrange some logic to group where we set `releaseVersion` and separate where we call `bump-oss-version` script for dryRun (commitly) && nightly builds

Reviewed By: hramos

Differential Revision: D32196237

fbshipit-source-id: 10f21f71bad1ea0496c5eb9094271cc4454a2544

Author: Luna Wei

scripts/__tests__/version-utils-test.js

@@ -21,19 +21,70 @@ describe('version-utils', () => {
     });
 
     it('should parse pre-release version with .', () => {
-      const {major, minor, patch, prerelease} = parseVersion('0.66.0-rc.4');
+      const {version, major, minor, patch, prerelease} =
+        parseVersion('0.66.0-rc.4');
+      expect(version).toBe('0.66.0-rc.4');
       expect(major).toBe('0');
       expect(minor).toBe('66');
       expect(patch).toBe('0');
       expect(prerelease).toBe('rc.4');
     });
 
+    it('should parse pre-release version with -', () => {
+      const {version, major, minor, patch, prerelease} =
+        parseVersion('0.66.0-rc-4');
+      expect(version).toBe('0.66.0-rc-4');
+      expect(major).toBe('0');
+      expect(minor).toBe('66');
+      expect(patch).toBe('0');
+      expect(prerelease).toBe('rc-4');
+    });
+
     it('should parse stable version', () => {
-      const {major, minor, patch, prerelease} = parseVersion('0.66.0');
+      const {version, major, minor, patch, prerelease} = parseVersion('0.66.0');
+      expect(version).toBe('0.66.0');
+      expect(major).toBe('0');
+      expect(minor).toBe('66');
+      expect(patch).toBe('0');
+      expect(prerelease).toBeUndefined();
+    });
+    it('should parse pre-release version from tag', () => {
+      const {version, major, minor, patch, prerelease} =
+        parseVersion('v0.66.1-rc.4');
+      expect(version).toBe('0.66.1-rc.4');
+      expect(major).toBe('0');
+      expect(minor).toBe('66');
+      expect(patch).toBe('1');
+      expect(prerelease).toBe('rc.4');
+    });
+
+    it('should parse stable version from tag', () => {
+      const {version, major, minor, patch, prerelease} =
+        parseVersion('v0.66.0');
+      expect(version).toBe('0.66.0');
       expect(major).toBe('0');
       expect(minor).toBe('66');
       expect(patch).toBe('0');
       expect(prerelease).toBeUndefined();
     });
+
+    it('should parse nightly fake version', () => {
+      const {version, major, minor, patch, prerelease} = parseVersion('0.0.0');
+      expect(version).toBe('0.0.0');
+      expect(major).toBe('0');
+      expect(minor).toBe('0');
+      expect(patch).toBe('0');
+      expect(prerelease).toBeUndefined();
+    });
+
+    it('should parse dryrun fake version', () => {
+      const {version, major, minor, patch, prerelease} =
+        parseVersion('1000.0.0');
+      expect(version).toBe('1000.0.0');
+      expect(major).toBe('1000');
+      expect(minor).toBe('0');
+      expect(patch).toBe('0');
+      expect(prerelease).toBeUndefined();
+    });
   });
 });

scripts/publish-npm.js

@@ -10,7 +10,7 @@
 'use strict';
 
 /**
- * This script publishes a new version of react-native to NPM.
+ * This script prepares a release version of react-native and may publish to NPM.
  * It is supposed to run in CI environment, not on a developer's machine.
  *
  * To make it easier for developers it uses some logic to identify with which
@@ -49,11 +49,14 @@
  * If tag v0.XY.Z is present on the commit then publish to npm with version 0.XY.Z and no tag (npm will consider it latest)
  */
 
-/*eslint-disable no-undef */
-require('shelljs/global');
+const {exec, echo, exit, test} = require('shelljs');
 const yargs = require('yargs');
+const {parseVersion} = require('./version-utils');
 
-let argv = yargs
+const buildTag = process.env.CIRCLE_TAG;
+const otp = process.env.NPM_CONFIG_OTP;
+
+const argv = yargs
   .option('n', {
     alias: 'nightly',
     type: 'boolean',
@@ -64,75 +67,52 @@ let argv = yargs
     type: 'boolean',
     default: false,
   }).argv;
-
 const nightlyBuild = argv.nightly;
 const dryRunBuild = argv.dryRun;
-const buildFromMain = nightlyBuild || dryRunBuild;
-const buildTag = process.env.CIRCLE_TAG;
-const otp = process.env.NPM_CONFIG_OTP;
-
-let branchVersion = 0;
-if (buildFromMain) {
-  branchVersion = 0;
-} else {
-  if (!buildTag) {
-    echo('Error: We publish only from git tags');
-    exit(1);
-  }
-
-  let match = buildTag.match(/^v(\d+\.\d+)\.\d+(?:-.+)?$/);
-  if (!match) {
-    echo('Error: We publish only from release version git tags');
-    exit(1);
-  }
-  [, branchVersion] = match;
-}
-// 0.33
 
 // 34c034298dc9cad5a4553964a5a324450fda0385
-const currentCommit = exec('git rev-parse HEAD', {silent: true}).stdout.trim();
-
-// Note: We rely on tagsWithVersion to be alphabetically sorted
-// [34c034298dc9cad5a4553964a5a324450fda0385, refs/heads/0.33-stable, refs/tags/latest, refs/tags/v0.33.1, refs/tags/v0.34.1-rc]
-const tagsWithVersion = exec(`git ls-remote origin | grep ${currentCommit}`, {
+const currentCommit = exec('git rev-parse HEAD', {
   silent: true,
-})
-  .stdout.split(/\s/)
-  // ['refs/tags/v0.33.0', 'refs/tags/v0.33.0-rc', 'refs/tags/v0.33.0-rc1', 'refs/tags/v0.33.0-rc2', 'refs/tags/v0.34.0']
-  .filter(
-    version =>
-      !!version && version.indexOf(`refs/tags/v${branchVersion}`) === 0,
-  )
-  // ['refs/tags/v0.33.0', 'refs/tags/v0.33.0-rc', 'refs/tags/v0.33.0-rc1', 'refs/tags/v0.33.0-rc2']
-  .filter(version => version.indexOf(branchVersion) !== -1)
-  // ['0.33.0', '0.33.0-rc', '0.33.0-rc1', '0.33.0-rc2']
-  .map(version => version.slice('refs/tags/v'.length));
-
-if (!buildFromMain && tagsWithVersion.length === 0) {
-  echo(
-    'Error: Cannot find version tag in current commit. To deploy to NPM you must add tag v0.XY.Z[-rc] to your commit',
-  );
+}).stdout.trim();
+const shortCommit = currentCommit.slice(0, 9);
+
+const rawVersion =
+  // 0.0.0 triggers issues with cocoapods for codegen when building template project.
+  dryRunBuild
+    ? '1000.0.0'
+    : // For nightly we continue to use 0.0.0 for clarity for npm
+    nightlyBuild
+    ? '0.0.0'
+    : // For pre-release and stable releases, we use the git tag of the version we're releasing (set in bump-oss-version)
+      buildTag;
+
+let version,
+  prerelease = null;
+try {
+  ({version, prerelease} = parseVersion(rawVersion));
+} catch (e) {
+  echo(e.message);
   exit(1);
 }
 
 let releaseVersion;
+if (dryRunBuild) {
+  releaseVersion = `${version}-${shortCommit}`;
+} else if (nightlyBuild) {
+  // 2021-09-28T05:38:40.669Z -> 20210928-0538
+  const dateIdentifier = new Date()
+    .toISOString()
+    .slice(0, -8)
+    .replace(/[-:]/g, '')
+    .replace(/[T]/g, '-');
+  releaseVersion = `${version}-${dateIdentifier}-${shortCommit}`;
+} else {
+  releaseVersion = version;
+}
 
-if (buildFromMain) {
-  if (nightlyBuild) {
-    releaseVersion = '0.0.0-';
-    // 2021-09-28T05:38:40.669Z -> 20210928-0538
-    releaseVersion += new Date()
-      .toISOString()
-      .slice(0, -8)
-      .replace(/[-:]/g, '')
-      .replace(/[T]/g, '-');
-  } else {
-    // 0.0.0 triggers issues with cocoapods for codegen for building template project.
-    releaseVersion = '1000.0.0';
-  }
-
-  releaseVersion += `-${currentCommit.slice(0, 9)}`;
-  // Bump version number in various files (package.json, gradle.properties etc)
+// Bump version number in various files (package.json, gradle.properties etc)
+// For stable, pre-release releases, we manually call bump-oss-version on release branch
+if (nightlyBuild || dryRunBuild) {
   if (
     exec(
       `node scripts/bump-oss-version.js --nightly --to-version ${releaseVersion}`,
@@ -141,14 +121,6 @@ if (buildFromMain) {
     echo('Failed to bump version number');
     exit(1);
   }
-} else if (tagsWithVersion[0].indexOf('-rc') === -1) {
-  // if first tag on this commit is non -rc then we are making a stable release
-  // '0.33.0'
-  releaseVersion = tagsWithVersion[0];
-} else {
-  // otherwise pick last -rc tag, indicates latest rc version due to alpha-sort
-  // '0.33.0-rc2'
-  releaseVersion = tagsWithVersion[tagsWithVersion.length - 1];
 }
 
 // -------- Generating Android Artifacts with JavaDoc
@@ -183,12 +155,12 @@ if (dryRunBuild) {
   exit(0);
 }
 
-// if version contains -rc, tag as prerelease
+// Set the right tag for nightly and prerelease builds
 const tagFlag = nightlyBuild
   ? '--tag nightly'
-  : releaseVersion.indexOf('-rc') === -1
-  ? ''
-  : '--tag next';
+  : prerelease != null
+  ? '--tag next'
+  : '';
 
 // use otp from envvars if available
 const otpFlag = otp ? `--otp ${otp}` : '';
@@ -200,4 +172,3 @@ if (exec(`npm publish ${tagFlag} ${otpFlag}`).code) {
   echo(`Published to npm ${releaseVersion}`);
   exit(0);
 }
-/*eslint-enable no-undef */

scripts/version-utils.js

@@ -7,15 +7,16 @@
  * @format
  */
 
-function parseVersion(version) {
-  const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-(.+))?$/);
+function parseVersion(versionStr) {
+  const match = versionStr.match(/^v?((\d+)\.(\d+)\.(\d+)(?:-(.+))?)$/);
   if (!match) {
     throw new Error(
-      `You must pass a correctly formatted version; couldn't parse ${version}`,
+      `You must pass a correctly formatted version; couldn't parse ${versionStr}`,
     );
   }
-  const [, major, minor, patch, prerelease] = match;
+  const [, version, major, minor, patch, prerelease] = match;
   return {
+    version,
     major,
     minor,
     patch,