Merge pull request #5 from angular/master

Update upstream

Author: GulajavaMinistudio

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "1.3.0",
+  "version": "1.4.0-beta.0",
   "description": "CLI tool for Angular",
   "main": "packages/@angular/cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",

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

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

packages/@angular/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "1.3.0",
+  "version": "1.4.0-beta.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@angular-devkit/build-optimizer": "0.0.13",
     "@ngtools/json-schema": "1.1.0",
-    "@ngtools/webpack": "1.6.0",
+    "@ngtools/webpack": "1.7.0-beta.0",
     "autoprefixer": "^6.5.3",
     "chalk": "^2.0.1",
     "circular-dependency-plugin": "^3.0.0",

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

@@ -8,14 +8,14 @@ const ImportDependency = require('webpack/lib/dependencies/ImportDependency');
 export class NamedLazyChunksWebpackPlugin extends webpack.NamedChunksPlugin {
   constructor() {
     // Append a dot and number if the name already exists.
-    const nameMap = new Map<string, boolean>();
-    function getUniqueName(baseName: string) {
+    const nameMap = new Map<string, string>();
+    function getUniqueName(baseName: string, request: string) {
       let name = baseName;
       let num = 0;
-      while (nameMap.has(name)) {
+      while (nameMap.has(name) && nameMap.get(name) !== request) {
         name = `${baseName}.${num++}`;
       }
-      nameMap.set(name, true);
+      nameMap.set(name, request);
       return name;
     }
 
@@ -34,13 +34,13 @@ export class NamedLazyChunksWebpackPlugin extends webpack.NamedChunksPlugin {
           || chunk.blocks[0].dependencies[0] instanceof ImportDependency)
       ) {
         // 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)$/, '');
+        const request = chunk.blocks[0].dependencies[0].request;
+        const chunkName = basename(request).replace(/(\.ngfactory)?\.(js|ts)$/, '');
         if (!chunkName || chunkName === '') {
           // Bail out if something went wrong with the name.
           return null;
         }
-        return getUniqueName(chunkName);
+        return getUniqueName(chunkName, request);
       }
 
       return null;

packages/@ngtools/webpack/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "1.6.0",
+  "version": "1.7.0-beta.0",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",

scripts/test-licenses.js

@@ -74,11 +74,12 @@ const ignoredPackages = [
   '[email protected]', // Looks like MIT
   '[email protected]', // BSD, but doesn't list it in package.json
   '[email protected]', // MIT, but doesn't list it in package.json
-  'jschardet@1.4.2', // LGPL-2.1, listed as LGPL-2.1+.
+  'jschardet@1.5.1', // LGPL-2.1, listed as LGPL-2.1+.
   '[email protected]', // MIT, license but it's not listed in package.json.
   '[email protected]', // MIT, but doesn't list it in package.json
   '[email protected]', // MIT, but doesn't list it in package.json
   '[email protected]', // MIT AND Apache-2.0, but broken license field in package.json lists.
+  '[email protected]', // MIT, but doesn't list it in package.json
   '[email protected]', // MIT, but doesn't list it in package.json
   '[email protected]', // BSD, but doesn't list it in package.json
   '[email protected]', // MIT, but doesn't list it in package.json