Merge pull request #57 from angular/master

Update upstream

Author: GulajavaMinistudio

package-lock.json

@@ -97,7 +97,7 @@
     "typescript": "~2.3.1",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.3.1",
-    "webpack": "~3.1.0",
+    "webpack": "~3.2.0",
     "webpack-dev-middleware": "^1.11.0",
     "webpack-dev-server": "~2.5.1",
     "webpack-merge": "^2.4.0",

package.json

@@ -36,13 +36,16 @@
   },
   "lint": [
     {
-      "project": "<%= sourceDir %>/tsconfig.app.json"
+      "project": "<%= sourceDir %>/tsconfig.app.json",
+      "exclude": "**/node_modules/**"
     },
     {
-      "project": "<%= sourceDir %>/tsconfig.spec.json"
+      "project": "<%= sourceDir %>/tsconfig.spec.json",
+      "exclude": "**/node_modules/**"
     },
     {
-      "project": "e2e/tsconfig.e2e.json"
+      "project": "e2e/tsconfig.e2e.json",
+      "exclude": "**/node_modules/**"
     }
   ],
   "test": {

packages/@angular/cli/blueprints/ng/files/angular-cli.json

@@ -32,7 +32,7 @@ export class CliConfig extends CliConfigBase<ConfigInterface> {
     const projectConfig = CliConfig.fromProject();
     if (projectConfig) {
       value = projectConfig.get(jsonPath);
-    } else {
+    } else if (CliConfig.globalConfigFilePath() !== CliConfig.configFilePath()) {
       const globalConfig = CliConfig.fromGlobal();
       if (globalConfig) {
         value = globalConfig.get(jsonPath);

packages/@angular/cli/models/config.ts

@@ -82,7 +82,7 @@
     "typescript": ">=2.0.0 <2.4.0",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.3.1",
-    "webpack": "~3.1.0",
+    "webpack": "~3.2.0",
     "webpack-dev-middleware": "^1.11.0",
     "webpack-dev-server": "~2.4.5",
     "webpack-merge": "^2.4.0",

packages/@angular/cli/package.json

@@ -7,7 +7,7 @@ let version;
 try {
   version = require('@angular/compiler-cli').VERSION;
 } catch (e) {
-  throw new Error('The "@angular/compiler-cli" package was not properly installed.');
+  throw new Error('The "@angular/compiler-cli" package was not properly installed. Error: ' + e);
 }
 
 // Check that Angular is also not part of this module's node_modules (it should be the project's).

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

@@ -259,6 +259,25 @@ export class AotPlugin implements Tapable {
     return result;
   }
 
+  private _getLazyRoutesFromNgtools() {
+    try {
+      return __NGTOOLS_PRIVATE_API_2.listLazyRoutes({
+        program: this._program,
+        host: this._compilerHost,
+        angularCompilerOptions: this._angularCompilerOptions,
+        entryModule: this._entryModule
+      });
+    } catch (err) {
+      // We silence the error that the @angular/router could not be found. In that case, there is
+      // basically no route supported by the app itself.
+      if (err.message.startsWith('Could not resolve module @angular/router')) {
+        return {};
+      } else {
+        throw err;
+      }
+    }
+  }
+
   // registration hook for webpack plugin
   apply(compiler: any) {
     this._compiler = compiler;
@@ -491,13 +510,8 @@ export class AotPlugin implements Tapable {
       .then(() => {
         // We need to run the `listLazyRoutes` the first time because it also navigates libraries
         // and other things that we might miss using the findLazyRoutesInAst.
-        let discoveredLazyRoutes: LazyRouteMap = this.firstRun ?
-          __NGTOOLS_PRIVATE_API_2.listLazyRoutes({
-            program: this._program,
-            host: this._compilerHost,
-            angularCompilerOptions: this._angularCompilerOptions,
-            entryModule: this._entryModule
-          })
+        let discoveredLazyRoutes: LazyRouteMap = this.firstRun
+          ? this._getLazyRoutesFromNgtools()
           : this._findLazyRoutesInAst();
 
         // Process the lazy routes discovered.

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

@@ -0,0 +1,21 @@
+import {ng} from '../../utils/process';
+import {expectFileToExist, moveFile} from '../../utils/fs';
+import {updateJsonFile} from '../../utils/project';
+import {getGlobalVariable} from '../../utils/env';
+import * as path from 'path';
+
+
+export default function() {
+  // Skip this in Appveyor tests.
+  if (getGlobalVariable('argv').appveyor) {
+    return Promise.resolve();
+  }
+
+  const tmp = getGlobalVariable('tmp-root');
+
+  return Promise.resolve()
+    .then(() => moveFile('node_modules/@angular/router', path.join(tmp, '@angular-router.backup')))
+    .then(() => ng('build'))
+    .then(() => expectFileToExist('./dist/index.html'))
+    .then(() => moveFile(path.join(tmp, '@angular-router.backup'), 'node_modules/@angular/router'));
+}

tests/e2e/tests/build/no-angular-router.ts

@@ -5480,9 +5480,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.1.0.tgz#ac0675e500db835f9ab2369d29ba096f51ad0731"
+webpack@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.2.0.tgz#8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"