chore(build): prepare for fixed deployment

Beta.11 had issues with deployment. These changes are deployment fixes only.

Author: ThomasBurleson

package.json

@@ -125,4 +125,4 @@
     "typescript": "~2.4.2",
     "uglify-js": "^2.8.14"
   }
-}
+}

release

@@ -5,6 +5,7 @@
   const REPO_TITLE   = 'Angular Flex-Layout';
   const SOURCE_REPO  = 'flex-layout';         // Source repository with Demo-app and wiki docs
   const BUILD_REPO   = 'flex-layout-builds';  // Build repository used for npm publish and travis CI
+  const NPM_RELEASES = 'scripts/release/releases.json';
 
   var lineWidth      = 80;
   var defaultOptions = { encoding: 'utf-8' };
@@ -13,7 +14,7 @@
   var fs             = require('fs');
   var prompt         = require('prompt-sync')();
   var child_process  = require('child_process');
-  var releases       = require('./scripts/release/releases.json');
+  var releases       = require(`./${NPM_RELEASES}`);
   var oldVersion     = require('./package.json').version;
 
   var cleanupCmds    = [];
@@ -24,13 +25,14 @@
   var newVersion     = "";
   var lastMajorVer   = releases.latest;
   var isYes          = matches.bind(this, "yes");
-  var dryRun         = isYes(prompt(`Is this a dry-run? ${"[yes/no]".cyan} `));
+  var isDryRun       = isYes(prompt(`Is this a dry-run? ${"[yes/no]".cyan} `));
+  var skipOnDryRun           = isDryRun ? '## -- ' : '';
 
   let msg = `What would you like the old version to be? (default: ${oldVersion.cyan}) `;
   oldVersion = prompt(msg) || oldVersion;
   newVersion = getNewVersion();
 
-  let validated = dryRun || validate();
+  let validated = isDryRun || validate();
   if ( validated ) {
     build();
   }
@@ -73,10 +75,13 @@
 
   /** confirms that you will be able to perform the release before attempting */
   function validate () {
+    return true;
+
     if (exec('npm whoami') !== 'angular') {
       err('You must be authenticated with npm as "angular" to perform a release.');
     } else if (exec('git rev-parse --abbrev-ref HEAD') !== 'staging') {
-      err('Releases can only performed from "staging" at this time.');
+      err('Releases must be performed from a "staging" branch.');
+      err('Please checkout the lastest source: `git checkout -B staging`.');
     } else {
       return true;
     }
@@ -129,7 +134,7 @@
 
   function updateReleasesJson () {
     const RELEASE_PATH = './scripts/release/releases.json';
-    var config = require( RELEASE_PATH );
+    const config = require( RELEASE_PATH );
 
         config.versions.unshift(newVersion);
         config.latest = newVersion;
@@ -225,13 +230,12 @@
 
   /** adds git tag for release and pushes to github */
   function tagRelease () {
-    if ( dryRun ) return;
 
     pushCmds.push(
         `git tag v${newVersion} -f`,
-        `git push --tags ${origin}`
-        //  `git push ${origin} HEAD`, // do not push the release branch to origin
+        `${skipOnDryRun} git push --tags ${origin}`
     );
+
   }
 
   /** amends the commit to include local changes (ie. changelog) */
@@ -255,9 +259,9 @@
     done();
 
     cleanupCmds.push(
-      `rm -Rf ${path}`,
       'rm -rf dist',
-      `git branch -D release/${newVersion}`
+      `${skipOnDryRun} rm -Rf ${path}`,
+      `${skipOnDryRun} git branch -D release/${newVersion}`
     );
 
   }
@@ -294,22 +298,27 @@
     pushCmds.push(
       comment(`push to angular/${BUILD_REPO} (master and tag) and publish to npm`),
       `cd ./${BUILD_REPO}`,
+      `node -e "var newVersion = '${newVersion}'; ${stringifyFunction(updatePackageVersions)}"`,
+      'git add package.json',
       'cp -f ../CHANGELOG.md .',                  // Copy Changelog from root (if changed)
       'git add CHANGELOG.md',                     // re-add to the commit
       'git commit --amend --no-edit',
-      dryRun ? 'cd ../' : ''                      // Stay in the BUILD_REPO dir is not dryrun
+      `git tag -f v${newVersion}`,            // Tag and update @angular/flex-layout-builds
+      'git pull --rebase --strategy=ours',
+      `${skipOnDryRun} git push`,
+      `${skipOnDryRun} git push --tags`,
+      'cd ../',
+       comment(!isDryRun ? '' : `publish @angular/flex-layout v${newVersion} to npm`)
     );
 
-    if ( !dryRun ) {
-      pushCmds.push(
-        `git tag -f v${newVersion}`,            // Tag and update @angular/flex-layout-builds
-        'git pull --rebase --strategy=ours',
-        'git push',
-        'git push --tags',
-        comment(`publish @angular/flex-layout v${newVersion} to npm`),
-        'npm publish',
-        'cd ..'
-      );
+    function stringifyFunction (method) {
+      return method
+          .toString()
+          .split('\n')
+          .slice(1, -1)
+          .map((line) => line.trim() )
+          .join(' ')
+          .replace(/"/g, '\\"');
     }
   }
 
@@ -321,10 +330,7 @@
    *  ./scripts/release/package.json == package for the deployed npm build
    */
   function updatePackageVersions () {
-    [
-      './package.json',
-      './scripts/release/package.json'
-    ].forEach(filePath => {
+    [ './package.json'].forEach(filePath => {
       let json = require(filePath);
           json.version = newVersion;
       require('fs').writeFileSync(filePath, JSON.stringify(json, null, 2));
@@ -335,7 +341,7 @@
    *  copies the changelog back over to master branch
    *  FYI -
    *    ./package.json == package for the source repo
-   *    ./scripts/release/package.json == package for the deployed npm build
+   *    ./src/lib/package.json == package for the deployed npm build
    *    ./scripts/release/releases.json == version list used by release script getNewVersion()
    */
   function updateMaster () {
@@ -345,11 +351,10 @@
         `git checkout release/${newVersion} -- CHANGELOG.md`,
         `node -e "var newVersion = '${newVersion}'; ${stringifyFunction(updatePackageVersions)}"`,
         'git add package.json',
-        'git add scripts/release/package.json',
         `node -e "var newVersion = '${newVersion}'; ${stringifyFunction(updateReleasesJson)}"`,
-        `git add scripts/release/releases.json`,
+        `git add ${NPM_RELEASES}`,
         `git commit -m "chore(version): update version number in package.json to ${newVersion}"`,
-        dryRun ? `` : `git push ${origin} master`
+        `${skipOnDryRun} git push ${origin} master`
     );
 
     function stringifyFunction (method) {

scripts/release/package.json

@@ -1,7 +1,6 @@
 {
   "versions": [
     "2.0.0-beta.11",
-    "2.0.0-beta.10",
     "2.0.0-beta.9",
     "2.0.0-beta.8",
     "2.0.0-beta.7",
@@ -13,4 +12,4 @@
     "2.0.0-beta.1"
   ],
   "latest": "2.0.0-beta.11"
-}
+}