build: refactor QoL on monorepo.json

This should make it easier to manage and diff. This takes 2 things into account:
1. we have either stable or experimental versions and each are kept in monorepo.
2. we dont keep hash and update only changed packages.

This commit also removed the hash to make sure this does not happen.

Author: hansl

.monorepo.json

@@ -42,16 +42,10 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.5",
-      "hash": "5225044ecf49d630564a68b710f6b82f"
     },
     "@_/builders": {
-      "version": "0.14.0-beta.4",
-      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.5",
-      "hash": "ee31237492de354cdeb804a77ddb99a2"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +56,11 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.5",
-      "snapshotRepo": "angular/cli-builds",
-      "hash": "a7d8ce7ece9ffcd1bf4fa095d48848fc"
+      "snapshotRepo": "angular/cli-builds"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.5",
-      "hash": "c384b8179204563116fd10c0b177344d",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +71,15 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "49d84280d90a0596e2f12fabed1b3bc5",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.5",
-      "hash": "f4a1216b5864f85521607ac9d0837a52",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
-      "section": "Tooling",
-      "version": "1.2.0-beta.5",
-      "hash": "a97cd421a1deac9b478d52c4e950cc1e"
+      "section": "Tooling"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +89,6 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "5250a56331833383ca39c17f9be70fe8",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +99,6 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "e87e58f07bad54fe46c169bbd4196ab7",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +109,6 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "71d3197702ff8bad96d185c91a31bd3d",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +119,7 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "a7395f447b3e24d7f178ef54263c198c"
+      "snapshotRepo": "angular/angular-devkit-build-webpack-builds"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +129,6 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.5",
-      "hash": "5f82ed72531a97dc657aa79ab0207227",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +139,31 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.5",
-      "hash": "3f925d566c97375d6101fddbcbef33e3",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.5",
-      "hash": "2a856bf23cc1bf74a6eb981dc6c316a2",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.5",
       "section": "Misc",
-      "hash": "dde27b96d50a58c9738ad4bc27646077",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.5",
-      "hash": "834d6c3ac93c047886db71717f43b959",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.5",
       "section": "Schematics",
-      "hash": "c8967c19e9137071c1e89809d0af2699",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.5",
       "section": "Schematics",
-      "hash": "bc9b7216998a5c42f4b5ab9a993ef64b",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

docs/process/release.md

@@ -49,16 +49,9 @@ Consider if you need to update `packages/schematics/angular/utility/latest-versi
 
 ## Shepparding
 
-As commits are cherry-picked when PRs are merged, creating the release should be a matter of updating the version
-numbers. This can be done with the following command.
+As commits are cherry-picked when PRs are merged, creating the release should be a matter of creating a tag.
 
-See `scripts/release.ts` for the full list of release types, e.g. patch updates the third number per semver.
-
-```bash
-devkit-admin release patch --force # replace with minor-beta etc.
-```
-
-Make sure you update the package versions in `packages/schematics/angular/utility/latest-versions.ts`. After that:
+**Make sure you update the package versions in `packages/schematics/angular/utility/latest-versions.ts`.**
 
 ```bash
 git commit -a -m 'release: vXX'

lib/packages.ts

@@ -8,14 +8,12 @@
 // tslint:disable-next-line:no-implicit-dependencies
 import { JsonObject } from '@angular-devkit/core';
 import { execSync } from 'child_process';
-import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 
-const glob = require('glob');
 const distRoot = path.join(__dirname, '../dist');
-const { packages: monorepoPackages } = require('../.monorepo.json');
+const { versions: monorepoVersions, packages: monorepoPackages } = require('../.monorepo.json');
 
 
 export interface PackageInfo {
@@ -28,53 +26,19 @@ export interface PackageInfo {
   build: string;
   tar: string;
   private: boolean;
+  experimental: boolean;
   packageJson: JsonObject;
   dependencies: string[];
 
   snapshot: boolean;
   snapshotRepo: string;
   snapshotHash: string;
 
-  dirty: boolean;
-  hash: string;
   version: string;
 }
 export type PackageMap = { [name: string]: PackageInfo };
 
 
-const hashCache: {[name: string]: string | null} = {};
-function _getHashOf(pkg: PackageInfo): string {
-  if (!(pkg.name in hashCache)) {
-    hashCache[pkg.name] = null;
-    const md5Stream = crypto.createHash('md5');
-
-    // Update the stream with all files content.
-    const files: string[] = glob.sync(path.join(pkg.root, '**'), { nodir: true });
-    files.forEach(filePath => {
-      md5Stream.write(`\0${filePath}\0`);
-      md5Stream.write(fs.readFileSync(filePath));
-    });
-    // Update the stream with all versions of upstream dependencies.
-    pkg.dependencies.forEach(depName => {
-      md5Stream.write(`\0${depName}\0${_getHashOf(packages[depName])}\0`);
-    });
-
-    md5Stream.end();
-
-    hashCache[pkg.name] = (md5Stream.read() as Buffer).toString('hex');
-  }
-
-  const value = hashCache[pkg.name];
-  if (!value) {
-    // Protect against circular dependency.
-    throw new Error('Circular dependency detected between the following packages: '
-      + Object.keys(hashCache).filter(key => hashCache[key] == null).join(', '));
-  }
-
-  return value;
-}
-
-
 function loadPackageJson(p: string) {
   const root = require('../package.json');
   const pkg = require(p);
@@ -174,16 +138,42 @@ const packageJsonPaths = _findAllPackageJson(path.join(__dirname, '..'), exclude
   .filter(p => p != path.join(__dirname, '../package.json'));
 
 
+function _exec(cmd: string) {
+  return execSync(cmd).toString().trim();
+}
+
+
 let gitShaCache: string;
 function _getSnapshotHash(_pkg: PackageInfo): string {
   if (!gitShaCache) {
-    gitShaCache = execSync('git log --format=%h -n1').toString().trim();
+    gitShaCache = _exec('git log --format=%h -n1');
   }
 
   return gitShaCache;
 }
 
 
+let stableVersion = '';
+let experimentalVersion = '';
+function _getVersionFromGit(experimental: boolean): string {
+  if (stableVersion && experimentalVersion) {
+    return experimental ? experimentalVersion : stableVersion;
+  }
+
+  const hasLocalChanges = _exec(`git status --porcelain`) != '';
+  const scmVersionTagRaw = _exec(`git describe --match v[0-9].[0-9].[0-9]* --abbrev=7 --tags`)
+    .slice(1);
+  stableVersion = scmVersionTagRaw.replace(/-([0-9]+)-g/, '+$1.')
+    + (hasLocalChanges ? '.with-local-changes' : '');
+
+  experimentalVersion = `0.${stableVersion.replace(/^(\d+)\.(\d+)/, (_, major, minor) => {
+    return '' + (parseInt(major, 10) * 100 + parseInt(minor, 10));
+  })}`;
+
+  return experimental ? experimentalVersion : stableVersion;
+}
+
+
 // All the supported packages. Go through the packages directory and create a map of
 // name => PackageInfo. This map is partial as it lacks some information that requires the
 // map itself to finish building.
@@ -213,13 +203,16 @@ export const packages: PackageMap =
         bin[binName] = p;
       });
 
+      const experimental = !!packageJson.private || !!packageJson.experimental;
+
       packages[name] = {
         build: path.join(distRoot, pkgRoot.substr(path.dirname(__dirname).length)),
         dist: path.join(distRoot, name),
         root: pkgRoot,
         relative: path.relative(path.dirname(__dirname), pkgRoot),
         main: path.resolve(pkgRoot, 'src/index.ts'),
-        private: packageJson.private,
+        private: !!packageJson.private,
+        experimental,
         // yarn doesn't take kindly to @ in tgz filenames
         // https://github.com/yarnpkg/yarn/issues/6339
         tar: path.join(distRoot, name.replace(/\/|@/g, '_') + '.tgz'),
@@ -234,9 +227,9 @@ export const packages: PackageMap =
         },
 
         dependencies: [],
-        hash: '',
-        dirty: false,
-        version: monorepoPackages[name] && monorepoPackages[name].version || '0.0.0',
+        get version() {
+          return _getVersionFromGit(experimental);
+        },
       };
 
       return packages;
@@ -252,12 +245,3 @@ for (const pkgName of Object.keys(packages)) {
         || name in (pkgJson.devDependencies || {});
   });
 }
-
-
-// Update the hash values of each.
-for (const pkgName of Object.keys(packages)) {
-  packages[pkgName].hash = _getHashOf(packages[pkgName]);
-  if (!monorepoPackages[pkgName] || packages[pkgName].hash != monorepoPackages[pkgName].hash) {
-    packages[pkgName].dirty = true;
-  }
-}

packages/angular/pwa/package.json

@@ -2,6 +2,7 @@
   "name": "@angular/pwa",
   "version": "0.0.0",
   "description": "PWA schematics for Angular",
+  "experimental": true,
   "keywords": [
     "blueprints",
     "code generation",
@@ -15,4 +16,4 @@
     "parse5-html-rewriting-stream": "5.1.0",
     "rxjs": "6.4.0"
   }
-}
+}

packages/angular_devkit/architect/package.json

@@ -2,6 +2,7 @@
   "name": "@angular-devkit/architect",
   "version": "0.0.0",
   "description": "Angular Build Facade",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {

packages/angular_devkit/architect_cli/package.json

@@ -2,6 +2,7 @@
   "name": "@angular-devkit/architect-cli",
   "version": "0.0.0",
   "description": "Angular Architect CLI",
+  "experimental": true,
   "bin": {
     "architect": "./bin/architect.js"
   },

packages/angular_devkit/build_angular/package.json

@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-angular",
   "version": "0.0.0",
   "description": "Angular Webpack Build Facade",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",

packages/angular_devkit/build_ng_packagr/package.json

@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-ng-packagr",
   "version": "0.0.0",
   "description": "Angular Build Architect for ng-packagr",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",

packages/angular_devkit/build_optimizer/package.json

@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-optimizer",
   "version": "0.0.0",
   "description": "Angular Build Optimizer",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "bin": {

packages/angular_devkit/build_webpack/package.json

@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-webpack",
   "version": "0.0.0",
   "description": "Webpack Builder for Architect",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",