Merge pull request #53 from angular/master

Update upstream

Author: GulajavaMinistudio

.travis.yml

@@ -13,14 +13,6 @@ env:
     - DBUS_SESSION_BUS_ADDRESS=/dev/null
 
 
-matrix:
-  allow_failures:
-    - env: nightly
-    - env: ng2
-    - node_js: "7"
-    - node_js: "8"
-
-
 matrix:
   fast_finish: true
   allow_failures:
@@ -40,12 +32,20 @@ matrix:
       env: test
     - node_js: "6"
       os: linux
-      script: node tests/run_e2e.js "--glob=tests/build/**"
-      env: build
+      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=0 --nosilent
+      env: e2e-0
+    - node_js: "6"
+      os: linux
+      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=1 --nosilent
+      env: e2e-1
+    - node_js: "6"
+      os: linux
+      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=2 --nosilent
+      env: e2e-2
     - node_js: "6"
       os: linux
-      script: travis_wait 120 node tests/run_e2e.js "--ignore=**/tests/build/**"
-      env: e2e
+      script: node tests/run_e2e.js "--ignore=**/tests/build/**" --nb-shards=4 --shard=3 --nosilent
+      env: e2e-3
     - node_js: "6"
       os: linux
       script: node tests/run_e2e.js --eject "--glob=tests/build/**"
@@ -56,25 +56,34 @@ matrix:
       os: linux
       script: node tests/run_e2e.js --ng2 "--glob=tests/{build,test,misc}/**"
       env: ng2
+      on:
+        all_branches: true
     - node_js: "6"
       os: linux
       script: node tests/run_e2e.js "--nightly --glob=tests/{build,test,misc}/**"
       env: nightly
+      on:
+        all_branches: true
     - node_js: "7"
       os: linux
       script: node tests/run_e2e.js "--glob=tests/{build,test,misc}/**"
       env: node7
+      on:
+        all_branches: true
     - node_js: "8"
       os: linux
       script: node tests/run_e2e.js "--glob=tests/build/**"
       env: node8
+      on:
+        all_branches: true
 
     - stage: deploy
       script: skip
       env: builds
       deploy:
       - provider: script
         script: node scripts/git-builds.js
+        skip_cleanup: true
         on:
           all_branches: true
     - stage: deploy
@@ -83,6 +92,7 @@ matrix:
       deploy:
       - provider: script
         script: node scripts/publish/publish.js
+        skip_cleanup: true
         on:
           tags: true
 

packages/@angular/cli/plugins/named-lazy-chunks-webpack-plugin.ts

@@ -1,5 +1,8 @@
 import * as webpack from 'webpack';
-
+import { basename } from 'path';
+const AsyncDependenciesBlock = require('webpack/lib/AsyncDependenciesBlock');
+const ContextElementDependency = require('webpack/lib/dependencies/ContextElementDependency');
+const ImportDependency = require('webpack/lib/dependencies/ImportDependency');
 
 // This just extends webpack.NamedChunksPlugin to prevent name collisions.
 export class NamedLazyChunksWebpackPlugin extends webpack.NamedChunksPlugin {
@@ -22,15 +25,22 @@ export class NamedLazyChunksWebpackPlugin extends webpack.NamedChunksPlugin {
         return chunk.name;
       }
 
-      // Try to figure out if it's a lazy loaded route.
+      // Try to figure out if it's a lazy loaded route or import().
       if (chunk.blocks
         && chunk.blocks.length > 0
-        && chunk.blocks[0].dependencies
-        && chunk.blocks[0].dependencies.length > 0
-        && chunk.blocks[0].dependencies[0].lazyRouteChunkName
+        && chunk.blocks[0] instanceof AsyncDependenciesBlock
+        && chunk.blocks[0].dependencies.length === 1
+        && (chunk.blocks[0].dependencies[0] instanceof ContextElementDependency
+          || chunk.blocks[0].dependencies[0] instanceof ImportDependency)
       ) {
-        // lazyRouteChunkName was added by @ngtools/webpack.
-        return getUniqueName(chunk.blocks[0].dependencies[0].lazyRouteChunkName);
+        // Create chunkname from file request, stripping ngfactory and extension.
+        const req = chunk.blocks[0].dependencies[0].request;
+        const chunkName = basename(req).replace(/(\.ngfactory)?\.(js|ts)$/, '');
+        if (!chunkName || chunkName === '') {
+          // Bail out if something went wrong with the name.
+          return null;
+        }
+        return getUniqueName(chunkName);
       }
 
       return null;

packages/@ngtools/webpack/src/plugin.ts

@@ -310,11 +310,7 @@ export class AotPlugin implements Tapable {
               .map((key) => {
                 const value = this._lazyRoutes[key];
                 if (value !== null) {
-                  const dep = new ContextElementDependency(value, key);
-                  // lazyRouteChunkName is used by webpack.NamedChunksPlugin to give the
-                  // lazy loaded chunk a name.
-                  dep.lazyRouteChunkName = path.basename(key, '.ts');
-                  return dep;
+                  return new ContextElementDependency(value, key);
                 } else {
                   return null;
                 }

tests/e2e/tests/misc/lazy-module.ts

@@ -28,10 +28,10 @@ export default function() {
       oldNumberOfFiles = currentNumberOfDistFiles;
 
       if (!distFiles.includes('lazy.module.chunk.js')){
-        throw new Error('The bundle for the lazy module did not have a name.');
+        throw new Error('The chunk for the lazy module did not have a name.');
       }
       if (!distFiles.includes('lazy.module.0.chunk.js')){
-        throw new Error('The bundle for the lazy module did not use a unique name.');
+        throw new Error('The chunk for the lazy module did not use a unique name.');
       }
     })
     // verify System.import still works
@@ -43,11 +43,15 @@ export default function() {
       System.import('./lazy-' + lazyFile);
     `))
     .then(() => ng('build'))
-    .then(() => readdirSync('dist').length)
-    .then(currentNumberOfDistFiles => {
+    .then(() => readdirSync('dist'))
+    .then((distFiles) => {
+      const currentNumberOfDistFiles = distFiles.length;
       if (oldNumberOfFiles >= currentNumberOfDistFiles) {
         throw new Error('A bundle for the lazy file was not created.');
       }
+      if (!distFiles.includes('lazy-file.chunk.js')) {
+        throw new Error('The chunk for the lazy file did not have a name.');
+      }
       oldNumberOfFiles = currentNumberOfDistFiles;
     })
     // verify 'import *' syntax doesn't break lazy modules

tests/e2e/utils/process.ts

@@ -139,11 +139,12 @@ export function silentExecAndWaitForOutputToMatch(cmd: string, args: string[], m
 
 let npmInstalledEject = false;
 export function ng(...args: string[]) {
+  const argv = getGlobalVariable('argv');
+  const maybeSilentNg = argv['nosilent'] ? noSilentNg : silentNg;
   if (['build', 'serve', 'test', 'e2e', 'xi18n'].indexOf(args[0]) != -1) {
     // If we have the --eject, use webpack for the test.
-    const argv = getGlobalVariable('argv');
     if (args[0] == 'build' && argv.eject) {
-      return silentNg('eject', ...args.slice(1), '--force')
+      return maybeSilentNg('eject', ...args.slice(1), '--force')
         .then(() => {
           if (!npmInstalledEject) {
             npmInstalledEject = true;
@@ -153,14 +154,22 @@ export function ng(...args: string[]) {
         })
         .then(() => rimraf('dist'))
         .then(() => _exec({silent: true}, 'node_modules/.bin/webpack', []));
+    } else if (args[0] == 'e2e') {
+      // Wait 1 second before running any end-to-end test.
+      return new Promise(resolve => setTimeout(resolve, 1000))
+        .then(() => maybeSilentNg(...args));
     }
 
-    return silentNg(...args);
+    return maybeSilentNg(...args);
   } else {
-    return _exec({}, 'ng', args);
+    return noSilentNg(...args);
   }
 }
 
+export function noSilentNg(...args: string[]) {
+  return _exec({}, 'ng', args);
+}
+
 export function silentNg(...args: string[]) {
   return _exec({silent: true}, 'ng', args);
 }

tests/e2e_runner.ts

@@ -28,6 +28,7 @@ Error.stackTraceLimit = Infinity;
  *   --nobuild        Skip building the packages. Use with --nolink and --reuse to quickly
  *                    rerun tests.
  *   --nolink         Skip linking your local @angular/cli directory. Can save a few seconds.
+ *   --nosilent       Never silence ng commands.
  *   --ng-sha=SHA     Use a specific ng-sha. Similar to nightly but point to a master SHA instead
  *                    of using the latest.
  *   --glob           Run tests matching this glob pattern (relative to tests/e2e/).
@@ -36,11 +37,24 @@ Error.stackTraceLimit = Infinity;
  *   --reuse=/path    Use a path instead of create a new project. That project should have been
  *                    created, and npm installed. Ideally you want a project created by a previous
  *                    run of e2e.
+ *   --nb-shards      Total number of shards that this is part of. Default is 2 if --shard is
+ *                    passed in.
+ *   --shard          Index of this processes' shard.
  * If unnamed flags are passed in, the list of tests will be filtered to include only those passed.
  */
 const argv = minimist(process.argv.slice(2), {
-  'boolean': ['debug', 'nolink', 'nightly', 'noproject', 'verbose', 'eject', 'appveyor'],
-  'string': ['glob', 'ignore', 'reuse', 'ng-sha', ]
+  'boolean': [
+    'appveyor',
+    'debug',
+    'eject',
+    'nightly',
+    'nolink',
+    'nosilent',
+    'noproject',
+    'verbose',
+  ],
+  'string': ['glob', 'ignore', 'reuse', 'ng-sha', ],
+  'number': ['nb-shards', 'shard']
 });
 
 
@@ -73,7 +87,6 @@ ConsoleLoggerStack.start(new IndentLogger('name'))
 
 const testGlob = argv.glob || 'tests/**/*.ts';
 let currentFileName = null;
-let index = 0;
 
 const e2eRoot = path.join(__dirname, 'e2e');
 const allSetups = glob.sync(path.join(e2eRoot, 'setup/**/*.ts'), { nodir: true })
@@ -83,20 +96,26 @@ const allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore:
   .map(name => path.relative(e2eRoot, name))
   .sort();
 
-const testsToRun = allSetups
-  .concat(allTests
-    .filter(name => {
-      // Check for naming tests on command line.
-      if (argv._.length == 0) {
-        return true;
-      }
+const shardId = ('shard' in argv) ? argv['shard'] : null;
+const nbShards = (shardId === null ? 1 : argv['nb-shards']) || 2;
+const tests = allTests
+  .filter(name => {
+    // Check for naming tests on command line.
+    if (argv._.length == 0) {
+      return true;
+    }
+
+    return argv._.some(argName => {
+      return path.join(process.cwd(), argName) == path.join(__dirname, 'e2e', name)
+        || argName == name
+        || argName == name.replace(/\.ts$/, '');
+    });
+  });
 
-      return argv._.some(argName => {
-        return path.join(process.cwd(), argName) == path.join(__dirname, 'e2e', name)
-          || argName == name
-          || argName == name.replace(/\.ts$/, '');
-      });
-    }));
+// Remove tests that are not part of this shard.
+const shardedTests = tests
+  .filter((name, i) => (shardId === null || (i % nbShards) == shardId));
+const testsToRun = allSetups.concat(shardedTests);
 
 
 /**
@@ -111,7 +130,7 @@ if (testsToRun.length == allTests.length) {
 
 setGlobalVariable('argv', argv);
 
-testsToRun.reduce((previous, relativeName) => {
+testsToRun.reduce((previous, relativeName, testIndex) => {
   // Make sure this is a windows compatible path.
   let absoluteName = path.join(e2eRoot, relativeName);
   if (/^win/.test(process.platform)) {
@@ -131,7 +150,7 @@ testsToRun.reduce((previous, relativeName) => {
     let clean = true;
     let previousDir = null;
     return Promise.resolve()
-      .then(() => printHeader(currentFileName))
+      .then(() => printHeader(currentFileName, testIndex))
       .then(() => previousDir = process.cwd())
       .then(() => ConsoleLoggerStack.push(currentFileName))
       .then(() => fn(() => clean = false))
@@ -196,9 +215,14 @@ function isTravis() {
   return process.env['TRAVIS'];
 }
 
-function printHeader(testName) {
-  const text = `${++index} of ${testsToRun.length}`;
-  console.log(green(`Running "${bold(blue(testName))}" (${bold(white(text))})...`));
+function printHeader(testName: string, testIndex: number) {
+  const text = `${testIndex + 1} of ${testsToRun.length}`;
+  const fullIndex = (testIndex < allSetups.length ? testIndex
+      : (testIndex - allSetups.length) * nbShards + shardId + allSetups.length) + 1;
+  const length = tests.length + allSetups.length;
+  const shard = shardId === null ? ''
+      : yellow(` [${shardId}:${nbShards}]` + bold(` (${fullIndex}/${length})`));
+  console.log(green(`Running "${bold(blue(testName))}" (${bold(white(text))}${shard})...`));
 
   if (isTravis()) {
     console.log(`travis_fold:start:${encode(testName)}`);