Added publish command and slightly refactored some other command messaging

Author: Brian Vaughn

package.json

@@ -93,7 +93,7 @@
     "testRegex": "/scripts/jest/dont-run-jest-directly\\.js$"
   },
   "scripts": {
-    "build": "npm run version-check && node ./scripts/rollup/build.js",
+    "build": "node ./scripts/rollup/build.js",
     "linc": "node ./scripts/tasks/linc.js",
     "lint": "node ./scripts/tasks/eslint.js",
     "lint-build": "node ./scripts/rollup/validate/index.js",

scripts/release/ci-add-build-info-json.js

@@ -16,7 +16,7 @@ const run = async () => {
 
   const cwd = join(__dirname, '..', '..');
 
-  const {checksum, commit, branch} = await getBuildInfo();
+  const {branch, checksum, commit, reactVersion} = await getBuildInfo();
 
   const packages = getPackages(join(cwd, 'packages'));
   const packagesDir = join(cwd, 'packages');
@@ -26,6 +26,7 @@ const run = async () => {
     checksum,
     commit,
     environment: 'ci',
+    reactVersion,
   };
 
   for (let i = 0; i < packages.length; i++) {

scripts/release/ci-update-package-versions.js

@@ -14,9 +14,9 @@ const run = async () => {
 
   const cwd = join(__dirname, '..', '..');
 
-  const {version} = await getBuildInfo();
+  const {reactVersion, version} = await getBuildInfo();
 
-  await updateVersionsForCanary(cwd, version);
+  await updateVersionsForCanary(cwd, reactVersion, version);
 };
 
 // Install (or update) release script dependencies before proceeding.

scripts/release/create-canary-commands/add-build-info-json.js

@@ -7,7 +7,7 @@ const {writeJson} = require('fs-extra');
 const {join} = require('path');
 const {getPackages, logPromise} = require('../utils');
 
-const run = async ({branch, checksum, commit, tempDirectory}) => {
+const run = async ({branch, checksum, commit, reactVersion, tempDirectory}) => {
   const packages = getPackages(join(tempDirectory, 'packages'));
   const packagesDir = join(tempDirectory, 'packages');
 
@@ -16,6 +16,7 @@ const run = async ({branch, checksum, commit, tempDirectory}) => {
     checksum,
     commit,
     environment: 'local',
+    reactVersion,
   };
 
   for (let i = 0; i < packages.length; i++) {

scripts/release/create-canary-commands/confirm-automated-testing.js

@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const chalk = require('chalk');
+const clear = require('clear');
+const {confirm} = require('../utils');
+
+const run = async () => {
+  clear();
+
+  console.log(
+    chalk.red(
+      'This script does not run any automated tests.' +
+        'You should run them manually before creating a canary release.'
+    )
+  );
+
+  await confirm('Do you want to proceed?');
+
+  clear();
+};
+
+module.exports = run;

scripts/release/create-canary-commands/npm-pack-and-unpack.js

@@ -27,7 +27,7 @@ const run = async ({cwd, dry, tempDirectory}) => {
     `cp -r ${tempDirectory}/build/node_modules/*.tgz ${cwd}/build/node_modules/`
   );
 
-  // Unpack packages and parepare to publish.
+  // Unpack packages and prepare to publish.
   const compressedPackages = readdirSync('build/node_modules/');
   for (let i = 0; i < compressedPackages.length; i++) {
     await exec(

scripts/release/create-canary-commands/update-version-numbers.js

@@ -5,9 +5,9 @@
 const chalk = require('chalk');
 const {logPromise, updateVersionsForCanary} = require('../utils');
 
-module.exports = async ({tempDirectory, version}) => {
+module.exports = async ({reactVersion, tempDirectory, version}) => {
   return logPromise(
-    updateVersionsForCanary(tempDirectory, version),
+    updateVersionsForCanary(tempDirectory, reactVersion, version),
     `Updating version numbers (${chalk.yellow.bold(version)})`
   );
 };

scripts/release/create-canary.js

@@ -8,13 +8,14 @@ const {getBuildInfo, handleError} = require('./utils');
 
 // This script is an escape hatch!
 // It exists for special case manual builds.
-// The typical suggesgted release process is to create a canary from a CI artifact.
+// The typical suggested release process is to create a canary from a CI artifact.
 // This build script is optimized for speed and simplicity.
 // It doesn't run all of the tests that the CI environment runs.
 // You're expected to run those manually before publishing a release.
 
 const addBuildInfoJSON = require('./create-canary-commands/add-build-info-json');
 const buildArtifacts = require('./create-canary-commands/build-artifacts');
+const confirmAutomatedTesting = require('./create-canary-commands/confirm-automated-testing');
 const copyRepoToTempDirectory = require('./create-canary-commands/copy-repo-to-temp-directory');
 const npmPackAndUnpack = require('./create-canary-commands/npm-pack-and-unpack');
 const printPrereleaseSummary = require('./shared-commands/print-prerelease-summary');
@@ -23,10 +24,25 @@ const updateVersionNumbers = require('./create-canary-commands/update-version-nu
 const run = async () => {
   try {
     const cwd = join(__dirname, '..', '..');
-    const {branch, checksum, commit, version} = await getBuildInfo();
+    const {
+      branch,
+      checksum,
+      commit,
+      reactVersion,
+      version,
+    } = await getBuildInfo();
     const tempDirectory = join(tmpdir(), `react-${commit}`);
-    const params = {branch, checksum, commit, cwd, tempDirectory, version};
+    const params = {
+      branch,
+      checksum,
+      commit,
+      cwd,
+      reactVersion,
+      tempDirectory,
+      version,
+    };
 
+    await confirmAutomatedTesting(params);
     await copyRepoToTempDirectory(params);
     await updateVersionNumbers(params);
     await addBuildInfoJSON(params);

scripts/release/package.json

@@ -7,14 +7,15 @@
   "dependencies": {
     "chalk": "^2.1.0",
     "child-process-promise": "^2.2.1",
+    "clear": "^0.1.0",
     "cli-spinners": "^1.1.0",
     "command-line-args": "^4.0.7",
     "command-line-usage": "^4.0.1",
+    "diff": "^3.5.0",
     "figlet": "^1.2.0",
     "folder-hash": "^2.1.2",
     "fs-extra": "^4.0.2",
     "log-update": "^2.1.0",
-    "print-diff": "^0.1.1",
     "prompt-promise": "^1.0.3",
     "request-promise-json": "^1.0.4",
     "semver": "^5.4.1"

scripts/release/prepare-canary-commands/download-build-artifacts.js

@@ -27,7 +27,7 @@ const run = async ({build, cwd}) => {
     `tar zxvf ${cwd}/build/node_modules.tgz -C ${cwd}/build/node_modules/`
   );
 
-  // Unpack packages and parepare to publish
+  // Unpack packages and prepare to publish
   const compressedPackages = readdirSync('build/node_modules/');
   for (let i = 0; i < compressedPackages.length; i++) {
     await exec(