update(builds): add release scripts

Author: ThomasBurleson

package.json

@@ -42,6 +42,7 @@
     "@angular/core": "~2.4.0",
     "@angular/platform-browser": "~2.4.0",
     "@angular/platform-browser-dynamic": "~2.4.0",
+    "@types/gulp-util": "^3.0.30",
     "ace-builds": "^1.2.5",
     "core-js": "^2.4.1",
     "es-module-loader": "^1.3.5",
@@ -86,6 +87,7 @@
     "browserstacktunnel-wrapper": "^2.0.0",
     "clang-format": "^1.0.45",
     "concurrently": "^2.2.0",
+    "conventional-changelog": "^1.1.0",
     "copy-webpack-plugin": "^4.0.0",
     "css-loader": "^0.25.0",
     "extract-text-webpack-plugin": "^1.0.1",
@@ -98,6 +100,7 @@
     "gulp-clang-format": "^1.0.23",
     "gulp-clean": "^0.3.2",
     "gulp-cli": "^1.2.2",
+    "gulp-conventional-changelog": "^1.1.0",
     "gulp-server-livereload": "^1.8.2",
     "gulp-shell": "^0.5.2",
     "gulp-sourcemaps": "^1.6.0",

release

@@ -0,0 +1 @@
+node --harmony release.js

release.js

@@ -1,6 +1,10 @@
 (function () {
   'use strict';
 
+  const SOURCE_REPO  = 'flex-layout';
+  const SOURCE_REPO_TITLE = 'Angular Flex-Layout';
+  const BUILD_REPO   = 'flex-layout-builds';
+
   var colors         = require('colors');
   var strip          = require('cli-color/strip');
   var fs             = require('fs');
@@ -12,9 +16,9 @@
   var pushCmds       = [ 'rm abort push' ];
   var cleanupCmds    = [];
   var defaultOptions = { encoding: 'utf-8' };
-  var origin         = 'git@github.com:angular/material.git';
+  var origin         = 'git@github.com:angular/flex-layout.git';
   var lineWidth      = 80;
-  var lastMajorVer   = JSON.parse(exec('curl https://material.angularjs.org/docs.json')).latest;
+  var lastMajorVer   = "2.0.0.-beta.1";   //JSON.parse(exec(`curl ${URL_VERSIONS}`)).latest;
   var newVersion;
   var dryRun;
 
@@ -40,10 +44,8 @@
     createChangelog();
     commitChanges();
     tagRelease();
-    cloneRepo('bower-material');
-    updateBowerVersion();
-    cloneRepo('code.material.angularjs.org');
-    updateSite();
+    cloneRepo(BUILD_REPO);
+    generateLatestBuild();
     updateMaster();
     writeScript('abort', abortCmds.concat(cleanupCmds));
     if (!dryRun) writeScript('push', pushCmds.concat(cleanupCmds));
@@ -83,11 +85,24 @@
   /** writes the new version to package.json */
   function updateVersion () {
     start(`Updating ${"package.json".cyan} version from ${oldVersion.cyan} to ${newVersion.cyan}...`);
+
+    // Update the repo-root package.json
     pkg.version = newVersion;
     fs.writeFileSync('./package.json', JSON.stringify(pkg, null, 2));
+
+    // update the package.json deploy to npm
+    let npmPackagePath = './tools/scripts/release/npm_assets/package.json';
+    pkg = require(npmPackagePath);
+    pkg.version = newVersion;
+    fs.writeFileSync(npmPackagePath, JSON.stringify(pkg, null, 2));
+
     done();
+
     abortCmds.push('git checkout package.json');
+    abortCmds.push(`gig checkout ${npmPackagePath}`);
+
     pushCmds.push('git add package.json');
+    pushCmds.push(`git add ${npmPackagePath}`);
   }
 
   /** generates the changelog from the commits since the last release */
@@ -208,39 +223,27 @@
     exec('chmod +x ' + name);
   }
 
-  /** updates the version for bower-material in package.json and bower.json */
-  function updateBowerVersion () {
-    start('Updating bower version...');
-    var options = { cwd: './bower-material' },
-        bower   = require(options.cwd + '/bower.json'),
-        pkg     = require(options.cwd + '/package.json');
-    //-- update versions in config files
-    bower.version = pkg.version = newVersion;
-    fs.writeFileSync(options.cwd + '/package.json', JSON.stringify(pkg, null, 2));
-    fs.writeFileSync(options.cwd + '/bower.json', JSON.stringify(bower, null, 2));
-    done();
-    start('Building bower files...');
-    //-- build files for bower
+  /** updates the version for flex-layout-builds in package.json  */
+  function generateLatestBuild () {
+    start('Building deployed files...');
     exec([
       'rm -rf dist',
-      'gulp build',
-      'gulp build-all-modules --mode=default',
-      'gulp build-all-modules --mode=closure',
-      'rm -rf dist/demos'
+      'gulp build:release'
      ]);
     done();
-    start('Copy files into bower repo...');
-    //-- copy files over to bower repo
+
+    start(`Copy files into ${BUILD_REPO} repo...`);
     exec([
            'cp -Rf ../dist/* ./',
            'git add -A',
            `git commit -m "release: version ${newVersion}"`,
            'rm -rf ../dist'
          ], options);
     done();
+
     //-- add steps to push script
     pushCmds.push(
-      comment('push to bower (master and tag) and publish to npm'),
+      comment('push to builds (master and tag) and publish to npm'),
       'cd ' + options.cwd,
       'cp ../CHANGELOG.md .',
       'git add CHANGELOG.md',
@@ -254,97 +257,6 @@
     );
   }
 
-  /** builds the website for the new version */
-  function updateSite () {
-    start('Adding new version of the docs site...');
-    var options = { cwd: './code.material.angularjs.org' };
-    writeDocsJson();
-
-    //-- build files for bower
-    exec([
-        'rm -rf dist',
-        'gulp docs'
-    ]);
-    replaceFilePaths();
-
-    //-- copy files over to site repo
-    exec([
-        `cp -Rf ../dist/docs ${newVersion}`,
-        'rm -rf latest && cp -Rf ../dist/docs latest',
-        'git add -A',
-        `git commit -m "release: version ${newVersion}"`,
-        'rm -rf ../dist'
-    ], options);
-    replaceBaseHref(newVersion);
-    replaceBaseHref('latest');
-
-    //-- update firebase.json file
-    writeFirebaseJson();
-    exec([ 'git commit --amend --no-edit -a' ], options);
-    done();
-
-    //-- add steps to push script
-    pushCmds.push(
-        comment('push the site'),
-        'cd ' + options.cwd,
-        'git pull --rebase --strategy=ours',
-        'git push',
-        'cd ..'
-    );
-
-    function writeFirebaseJson () {
-      fs.writeFileSync(options.cwd + '/firebase.json', getFirebaseJson());
-      function getFirebaseJson () {
-        var json      = require(options.cwd + '/firebase.json');
-        json.rewrites = json.rewrites || [];
-        switch (json.rewrites.length) {
-          case 0:
-            json.rewrites.push(getRewrite('HEAD'));
-          case 1:
-            json.rewrites.push(getRewrite('latest'));
-          default:
-            json.rewrites.push(getRewrite(newVersion));
-        }
-        return JSON.stringify(json, null, 2);
-        function getRewrite (str) {
-          return {
-            source:      '/' + str + '/**/!(*.@(js|html|css|json|svg|png|jpg|jpeg))',
-            destination: '/' + str + '/index.html'
-          };
-        }
-      }
-    }
-
-    function writeDocsJson () {
-      var config      = require(options.cwd + '/docs.json');
-      config.versions.unshift(newVersion);
-
-      //-- only set to default if not a release candidate
-      config.latest = newVersion;
-      fs.writeFileSync(options.cwd + '/docs.json', JSON.stringify(config, null, 2));
-    }
-  }
-
-  /** replaces localhost file paths with public URLs */
-  function replaceFilePaths () {
-    //-- handle docs.js
-    var path = __dirname + '/dist/docs/docs.js';
-    var file = fs.readFileSync(path);
-    var contents = file.toString()
-        .replace(/http:\/\/localhost:8080\/angular-material/g, 'https://cdn.gitcdn.link/cdn/angular/bower-material/v' + newVersion + '/angular-material')
-        .replace(/http:\/\/localhost:8080\/docs.css/g, 'https://material.angularjs.org/' + newVersion + '/docs.css');
-    fs.writeFileSync(path, contents);
-
-  }
-
-  /** replaces base href in index.html for new version as well as latest */
-  function replaceBaseHref (folder) {
-    //-- handle index.html
-    var path = __dirname + '/code.material.angularjs.org/' + folder + '/index.html';
-    var file = fs.readFileSync(path);
-    var contents = file.toString().replace(/base href="\//g, 'base href="/' + folder + '/');
-    fs.writeFileSync(path, contents);
-  }
 
   /** copies the changelog back over to master branch */
   function updateMaster () {
@@ -384,7 +296,7 @@
   function header () {
     clear();
     line();
-    log(center('Angular Material Release'));
+    log(center(`${SOURCE_REPO_TITLE} Release v${newVersion}`));
     line();
   }
 

tools/gulp/gulpfile.ts

@@ -1,3 +1,4 @@
+import './tasks/changelog';
 import './tasks/ci';
 import './tasks/clean';
 import './tasks/components';

tools/gulp/tasks/changelog.ts

@@ -1,26 +1,32 @@
-var fs = require('fs');
-var changelog = require('conventional-changelog');
-var addStream = require('add-stream');
-var spawnSync = require('child_process').spawnSync;
-var chalk = require('gulp-util').colors;
-var log = require('gulp-util').log;
-var path = require('path');
-var args = require('minimist')(process.argv.slice(2));
+import {src, task, dest} from 'gulp';
+import {spawnSync} from 'child_process';
+import path = require('path');
+import minimist = require('minimist');
+import gulpUtils = require('gulp-util');
 
-var SHA = args.sha;
-var ROOT = path.normalize(__dirname + '/../../..');
+let changelog = require('gulp-conventional-changelog');
 
-console.log(`Root = ${ROOT}`);
+const args = minimist(process.argv.slice(2));
+const chalk = gulpUtils.colors;
+const log = gulpUtils.log;
 
-var VERSION = args.version || require(path.join(ROOT,'package.json')).version;
+const SHA = args['sha'] || args['SHA'];
+const ROOT = path.normalize(__dirname + '/../../..');
+const VERSION = args['version'] || require(path.join(ROOT,'package.json')).version;
 
-exports.task = function () {
+/**
+ * Expected `gulp changelog --sha=ad58e11`
+ */
+task('changelog', function() {
 
   var changelogPath = path.join(ROOT, 'CHANGELOG.md');
-  var inputStream = fs.createReadStream(changelogPath);
   var previousTag = getLatestTag();
   var currentTag = 'v' + VERSION;
-
+  var contextOptions = {
+    version: VERSION,
+    previousTag: previousTag.name,
+    currentTag: currentTag
+  };
   /* Validate different fork points for the changelog generation */
   if (previousTag.name === currentTag && !SHA) {
     log(chalk.yellow('Warning: You are generating a changelog by comparing the same versions.'));
@@ -31,24 +37,15 @@ exports.task = function () {
     log('Generating changelog from tag ' + previousTag.name + ' (' + shortSha + ')');
   }
 
-  var contextOptions = {
-    version: VERSION,
-    previousTag: previousTag.name,
-    currentTag: currentTag
-  };
-
-  /* Create our changelog and append the current changelog stream. */
-  var changelogStream = changelog({ preset: 'angular' }, contextOptions, {
+  return src(changelogPath, {
+    buffer:false
+  }).pipe(changelog({
+    preset: 'angular'
+  }, contextOptions, {
     from: SHA || previousTag.sha
-  }).pipe(addStream(inputStream));
-
-
-  /* Wait for the changelog to be ready and overwrite it. */
-  inputStream.on('end', function() {
-    changelogStream.pipe(fs.createWriteStream(changelogPath));
-  });
+  }).pipe(dest(ROOT)));
 
-};
+});
 
 /**
  * Resolves the latest tag over all branches from the repository metadata.