build: use devkit snapshots for e2e

Author: filipesilva

tests/e2e/setup/015-build.ts

@@ -12,7 +12,9 @@ export default function() {
     return;
   }
 
-  return npm('run', 'build', '--', '--local', argv.devkit ? '--devkit=' + argv.devkit : undefined)
+  const devkitArg = argv.devkit ? '--devkit=' + argv.devkit : '--devkit-snapshots';
+
+  return npm('run', 'build', '--', '--local', devkitArg)
     .then(() => {
       if (!argv.nightly && !argv['ng-sha']) {
         return;

tests/e2e/setup/500-create-project.ts

@@ -8,6 +8,7 @@ import {
   useCIDefaults,
   useBuiltPackages,
   useDevKit,
+  useDevKitSnapshots,
   updateJsonFile,
 } from '../utils/project';
 import {gitClean, gitCommit} from '../utils/git';
@@ -32,7 +33,7 @@ export default async function() {
 
   return Promise.resolve()
     .then(() => useBuiltPackages())
-    .then(() => argv.devkit && useDevKit(argv.devkit))
+    .then(() => argv.devkit ? useDevKit(argv.devkit) : useDevKitSnapshots())
     .then(() => useCIChrome('e2e'))
     .then(() => useCIChrome('src'))
     .then(() => argv['ng-version'] ? useNgVersion(argv['ng-version']) : Promise.resolve())

tests/e2e/utils/project.ts

@@ -35,6 +35,7 @@ export function createProject(name: string, ...args: string[]) {
   const argv: any = getGlobalVariable('argv');
 
   return Promise.resolve()
+    .then(() => useDevKitSnapshots())
     .then(() => process.chdir(getGlobalVariable('tmp-root')))
     .then(() => ng('new', name, '--skip-install', ...args))
     .then(() => process.chdir(name))
@@ -75,6 +76,16 @@ export function useDevKit(devkitRoot: string) {
     });
 }
 
+export function useDevKitSnapshots() {
+  return updateJsonFile('package.json', json => {
+    json['devDependencies']['@angular-devkit/build-angular'] =
+      'github:angular/angular-devkit-build-angular-builds';
+    // By adding build-ng-packagr preemptively, adding a lib will not update it.
+    json['devDependencies']['@angular-devkit/build-ng-packagr'] =
+      'github:angular/angular-devkit-build-ng-packagr-builds';
+  });
+}
+
 export function useBuiltPackages() {
   return Promise.resolve()
     .then(() => updateJsonFile('package.json', json => {

tools/publish/src/build.ts

@@ -58,7 +58,7 @@ function getDeps(pkg: any): any {
 
 
 export default function build(packagesToBuild: string[],
-                              opts: { local: boolean, devkit: string },
+                              opts: { local: boolean, devkit: string, 'devkit-snapshots': boolean },
                               logger: logging.Logger): Promise<void> {
   const { packages, tools } = require('../../../lib/packages');
 
@@ -269,6 +269,17 @@ export default function build(packagesToBuild: string[],
               json['devDependencies'][packageName] = devkitPackages[packageName].tar;
             }
           }
+        } else if (opts['devkit-snapshots']) {
+          // Use snapshots for devkit packages.
+          logger.info('Using snapshots of devkit packages.');
+          json['dependencies']['@angular-devkit/architect'] =
+            'github:angular/angular-devkit-architect-builds';
+          json['dependencies']['@angular-devkit/core'] =
+            'github:angular/angular-devkit-core-builds';
+          json['dependencies']['@angular-devkit/schematics'] =
+            'github:angular/angular-devkit-schematics-builds';
+          json['dependencies']['@schematics/angular'] = 'github:angular/schematics-angular-builds';
+          json['dependencies']['@schematics/update'] = 'github:angular/schematics-update-builds';
         }
 
         fs.writeFileSync(pkg.distPackageJson, JSON.stringify(json, null, 2));