@angular/cli 1.4.0 → 1.4.4

package/lib/cli/index.js

@@ -1,57 +1,47 @@
-/*eslint-disable no-console */
-
+"use strict";
 // Prevent the dependency validation from tripping because we don't import these. We need
 // it as a peer dependency of @angular/core.
 // require('zone.js')
-
-
-// This file hooks up on require calls to transpile TypeScript.
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
 const cli = require('../../ember-cli/lib/cli');
 const UI = require('../../ember-cli/lib/ui');
-const path = require('path');
-
 function loadCommands() {
-  return {
-    'build': require('../../commands/build').default,
-    'serve': require('../../commands/serve').default,
-    'eject': require('../../commands/eject').default,
-    'new': require('../../commands/new').default,
-    'generate': require('../../commands/generate').default,
-    'destroy': require('../../commands/destroy').default,
-    'test': require('../../commands/test').default,
-    'e2e': require('../../commands/e2e').default,
-    'help': require('../../commands/help').default,
-    'lint': require('../../commands/lint').default,
-    'version': require('../../commands/version').default,
-    'completion': require('../../commands/completion').default,
-    'doc': require('../../commands/doc').default,
-    'xi18n': require('../../commands/xi18n').default,
-
-    // Easter eggs.
-    'make-this-awesome': require('../../commands/easter-egg').default,
-
-    // Configuration.
-    'set': require('../../commands/set').default,
-    'get': require('../../commands/get').default
-  };
+    return {
+        'build': require('../../commands/build').default,
+        'serve': require('../../commands/serve').default,
+        'eject': require('../../commands/eject').default,
+        'new': require('../../commands/new').default,
+        'generate': require('../../commands/generate').default,
+        'destroy': require('../../commands/destroy').default,
+        'test': require('../../commands/test').default,
+        'e2e': require('../../commands/e2e').default,
+        'help': require('../../commands/help').default,
+        'lint': require('../../commands/lint').default,
+        'version': require('../../commands/version').default,
+        'completion': require('../../commands/completion').default,
+        'doc': require('../../commands/doc').default,
+        'xi18n': require('../../commands/xi18n').default,
+        // Easter eggs.
+        'make-this-awesome': require('../../commands/easter-egg').default,
+        // Configuration.
+        'set': require('../../commands/set').default,
+        'get': require('../../commands/get').default
+    };
 }
-
-module.exports = function(options) {
-
-  // patch UI to not print Ember-CLI warnings (which don't apply to Angular CLI)
-  UI.prototype.writeWarnLine = function () { }
-
-  options.cli = {
-    name: 'ng',
-    root: path.join(__dirname, '..', '..'),
-    npmPackage: '@angular/cli'
-  };
-
-  options.commands = loadCommands();
-
-  // ensure the environemnt variable for dynamic paths
-  process.env.PWD = path.normalize(process.env.PWD || process.cwd());
-  process.env.CLI_ROOT = process.env.CLI_ROOT || path.resolve(__dirname, '..', '..');
-
-  return cli(options);
-};
+function default_1(options) {
+    // patch UI to not print Ember-CLI warnings (which don't apply to Angular CLI)
+    UI.prototype.writeWarnLine = function () { };
+    options.cli = {
+        name: 'ng',
+        root: path.join(__dirname, '..', '..'),
+        npmPackage: '@angular/cli'
+    };
+    options.commands = loadCommands();
+    // ensure the environemnt variable for dynamic paths
+    process.env.PWD = path.normalize(process.env.PWD || process.cwd());
+    process.env.CLI_ROOT = process.env.CLI_ROOT || path.resolve(__dirname, '..', '..');
+    return cli(options);
+}
+exports.default = default_1;
+//# sourceMappingURL=/users/hansl/sources/angular-cli/lib/cli/index.js.map

package/lib/cli/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["lib/cli/index.ts"],"names":[],"mappings":";AAAA,yFAAyF;AACzF,4CAA4C;AAC5C,qBAAqB;;AAErB,6BAA6B;AAE7B,MAAM,GAAG,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAC/C,MAAM,EAAE,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAG7C;IACE,MAAM,CAAC;QACL,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAChD,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,UAAU,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC,OAAO;QACtD,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO;QACpD,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,MAAM,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO;QAC9C,SAAS,EAAE,OAAO,CAAC,wBAAwB,CAAC,CAAC,OAAO;QACpD,YAAY,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO;QAC1D,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,OAAO,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO;QAEhD,eAAe;QACf,mBAAmB,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC,OAAO;QAEjE,iBAAiB;QACjB,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;QAC5C,KAAK,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO;KAC7C,CAAC;AACJ,CAAC;AAED,mBAAwB,OAAY;IAElC,8EAA8E;IAC9E,EAAE,CAAC,SAAS,CAAC,aAAa,GAAG,cAAc,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,GAAG;QACZ,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;QACtC,UAAU,EAAE,cAAc;KAC3B,CAAC;IAEF,OAAO,CAAC,QAAQ,GAAG,YAAY,EAAE,CAAC;IAElC,oDAAoD;IACpD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEnF,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACtB,CAAC;AAlBD,4BAkBC"}

package/models/webpack-config.d.ts

@@ -1,21 +1,17 @@
 import { BuildOptions } from './build-options';
-export interface WebpackConfigOptions {
+export interface WebpackConfigOptions<T extends BuildOptions = BuildOptions> {
     projectRoot: string;
-    buildOptions: BuildOptions;
+    buildOptions: T;
     appConfig: any;
 }
-export declare class NgCliWebpackConfig {
+export declare class NgCliWebpackConfig<T extends BuildOptions = BuildOptions> {
     config: any;
-    wco: WebpackConfigOptions;
-    constructor(buildOptions: BuildOptions, appConfig: any);
+    wco: WebpackConfigOptions<T>;
+    constructor(buildOptions: T, appConfig: any);
     buildConfig(): any;
-    getTargetConfig(webpackConfigOptions: WebpackConfigOptions): any;
+    getTargetConfig(webpackConfigOptions: WebpackConfigOptions<T>): any;
     validateBuildOptions(buildOptions: BuildOptions): void;
-    addTargetDefaults(buildOptions: BuildOptions): BuildOptions;
-    mergeConfigs(buildOptions: BuildOptions, appConfig: any, projectRoot: string): {
-        outputPath: string;
-        deployUrl: any;
-        baseHref: any;
-    } & BuildOptions;
+    addTargetDefaults(buildOptions: T): T;
+    mergeConfigs(buildOptions: T, appConfig: any, projectRoot: string): T;
     addAppConfigDefaults(appConfig: any): any;
 }

package/models/webpack-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-config.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-config.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-config.ts"],"names":[],"mappings":";;AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC9C,qCAAqC;AAErC,uDAS2B;AAC3B,6BAA6B;AAQ7B;IAGE,YAAY,YAAe,EAAE,SAAc;QAEzC,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAExC,MAAM,UAAU,GAAG,kBAAS,CAAC,cAAc,EAAE,CAAC;QAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE7C,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACjD,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACpD,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,GAAG,GAAG,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IACtD,CAAC;IAEM,WAAW;QAChB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,KAAK,QAAQ;YAC7D,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,kCAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,cAAc,GAAG;YACnB,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,cAAc;YACd,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;SAC/B,CAAC;QAEF,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5D,MAAM,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG;kBACrD,8BAAY,CAAC,IAAI,CAAC,GAAG,CAAC;kBACtB,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9B,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEM,eAAe,CAAC,oBAA6C;QAClE,MAAM,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;YACjD,KAAK,aAAa;gBAChB,MAAM,CAAC,8BAAY,CAAC,oBAAoB,CAAC,CAAC;YAC5C,KAAK,YAAY;gBACf,MAAM,CAAC,+BAAa,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,yBAAyB;IAClB,oBAAoB,CAAC,YAA0B;QACpD,YAAY,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,IAAI,aAAa,CAAC;QAC3D,EAAE,CAAC,CAAC,YAAY,CAAC,MAAM,KAAK,aAAa,IAAI,YAAY,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC;YAClF,MAAM,IAAI,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC9F,CAAC;QAED,EAAE,CAAC,CAAC,YAAY,CAAC,cAAc;eAC1B,CAAC,CAAC,YAAY,CAAC,GAAG,IAAI,YAAY,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IAED,qCAAqC;IAC9B,iBAAiB,CAAC,YAAe;QACtC,MAAM,cAAc,GAAgD;YAClE,WAAW,EAAE;gBACX,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,OAAO;gBACtB,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,KAAK;gBACjB,WAAW,EAAE,IAAI;gBACjB,GAAG,EAAE,KAAK;aACX;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,MAAM;gBACnB,aAAa,EAAE,KAAK;gBACpB,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,IAAI;gBAChB,WAAW,EAAE,KAAK;gBAClB,GAAG,EAAE,IAAI;aACV;SACF,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;IAC9E,CAAC;IAED,0CAA0C;IACnC,YAAY,CAAC,YAAe,EAAE,SAAc,EAAE,WAAmB;QACtE,MAAM,gBAAgB,GAA0B;YAC9C,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC;YACvD,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAC3D,CAAC;IAEM,oBAAoB,CAAC,SAAc;QACxC,MAAM,iBAAiB,GAAQ;YAC7B,YAAY,EAAE,SAAS,CAAC,QAAQ;YAChC,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,EAAE;SACX,CAAC;QAEF,8EAA8E;QAC9E,GAAG,CAAC,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YAC/C,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,CAAC,SAAS,CAAC;IACnB,CAAC;CACF;AA9GD,gDA8GC"}

package/models/webpack-configs/common.js

@@ -10,6 +10,7 @@ const is_directory_1 = require("../../utilities/is-directory");
 const ConcatPlugin = require('webpack-concat-plugin');
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
+const SilentError = require('silent-error');
 /**
  * Enumerate loaders and their dependencies from this file to let the dependency validator
  * know they are used.
@@ -78,6 +79,12 @@ function getCommonConfig(wco) {
             asset.input = path.resolve(appRoot, asset.input || '');
             asset.output = asset.output || '';
             asset.glob = asset.glob || '';
+            // Prevent asset configurations from writing outside of the output path
+            const fullOutputPath = path.resolve(buildOptions.outputPath, asset.output);
+            if (!fullOutputPath.startsWith(path.resolve(buildOptions.outputPath))) {
+                const message = 'An asset cannot be written to a location outside of the output path.';
+                throw new SilentError(message);
+            }
             // Ensure trailing slash.
             if (is_directory_1.isDirectory(path.resolve(asset.input))) {
                 asset.input += '/';

package/models/webpack-configs/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/common.ts"],"names":[],"mappings":"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"}

package/models/webpack-configs/development.d.ts

@@ -1,5 +1,5 @@
 import { NamedModulesPlugin } from 'webpack';
 import { WebpackConfigOptions } from '../webpack-config';
-export declare const getDevConfig: (_wco: WebpackConfigOptions) => {
+export declare function getDevConfig(_wco: WebpackConfigOptions): {
     plugins: NamedModulesPlugin[];
 };

package/models/webpack-configs/development.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const webpack_1 = require("webpack");
-exports.getDevConfig = function (_wco) {
+function getDevConfig(_wco) {
     return {
         plugins: [new webpack_1.NamedModulesPlugin()]
     };
-};
+}
+exports.getDevConfig = getDevConfig;
 //# sourceMappingURL=/users/hansl/sources/angular-cli/models/webpack-configs/development.js.map

package/models/webpack-configs/development.js.map

@@ -1 +1 @@
-{"version":3,"file":"development.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/development.ts"],"names":[],"mappings":";;AAAA,qCAA6C;AAIhC,QAAA,YAAY,GAAG,UAAU,IAA0B;IAC9D,MAAM,CAAC;QACL,OAAO,EAAE,CAAC,IAAI,4BAAkB,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"development.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/development.ts"],"names":[],"mappings":";;AAAA,qCAA6C;AAI7C,sBAA6B,IAA0B;IACrD,MAAM,CAAC;QACL,OAAO,EAAE,CAAC,IAAI,4BAAkB,EAAE,CAAC;KACpC,CAAC;AACJ,CAAC;AAJD,oCAIC"}

package/models/webpack-configs/production.d.ts

@@ -1,5 +1,5 @@
 import { WebpackConfigOptions } from '../webpack-config';
-export declare const getProdConfig: (wco: WebpackConfigOptions) => {
+export declare function getProdConfig(wco: WebpackConfigOptions): {
     entry: {
         [key: string]: string[];
     };

package/models/webpack-configs/production.js

@@ -9,7 +9,7 @@ const license_webpack_plugin_1 = require("license-webpack-plugin");
 const build_optimizer_1 = require("@angular-devkit/build-optimizer");
 const static_asset_1 = require("../../plugins/static-asset");
 const glob_copy_webpack_plugin_1 = require("../../plugins/glob-copy-webpack-plugin");
-exports.getProdConfig = function (wco) {
+function getProdConfig(wco) {
     const { projectRoot, buildOptions, appConfig } = wco;
     let extraPlugins = [];
     let entryPoints = {};
@@ -111,5 +111,6 @@ exports.getProdConfig = function (wco) {
             })
         ])
     };
-};
+}
+exports.getProdConfig = getProdConfig;
 //# sourceMappingURL=/users/hansl/sources/angular-cli/models/webpack-configs/production.js.map

package/models/webpack-configs/production.js.map

@@ -1 +1 @@
-{"version":3,"file":"production.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/production.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"production.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/production.ts"],"names":[],"mappings":"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"}

package/models/webpack-configs/server.d.ts

@@ -3,7 +3,7 @@ import { WebpackConfigOptions } from '../webpack-config';
  * Returns a partial specific to creating a bundle for node
  * @param _wco Options which are include the build options and app config
  */
-export declare const getServerConfig: (_wco: WebpackConfigOptions) => {
+export declare function getServerConfig(_wco: WebpackConfigOptions): {
     target: string;
     output: {
         libraryTarget: string;

package/models/webpack-configs/server.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Returns a partial specific to creating a bundle for node
  * @param _wco Options which are include the build options and app config
  */
-exports.getServerConfig = function (_wco) {
+function getServerConfig(_wco) {
     return {
         target: 'node',
         output: {
@@ -36,5 +36,6 @@ exports.getServerConfig = function (_wco) {
             }
         ]
     };
-};
+}
+exports.getServerConfig = getServerConfig;
 //# sourceMappingURL=/users/hansl/sources/angular-cli/models/webpack-configs/server.js.map

package/models/webpack-configs/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/server.ts"],"names":[],"mappings":";;AAEA;;;GAGG;AACU,QAAA,eAAe,GAAG,UAAU,IAA0B;IACjE,MAAM,CAAC;QACL,MAAM,EAAE,MAAM;QACd,MAAM,EAAE;YACN,aAAa,EAAE,UAAU;SAC1B;QACD,SAAS,EAAE;YACT,WAAW;YACX,UAAU,CAAM,EAAE,OAAY,EAAE,QAA6C;gBAC3E,8CAA8C;gBAC9C,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBAChC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,CAAC;gBAED,IAAI,CAAC;oBACH,yCAAyC;oBACzC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACnC,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC3B,qBAAqB;wBACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBAC1B,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACN,wCAAwC;wBACxC,QAAQ,EAAE,CAAC;oBACb,CAAC;gBACH,CAAC;gBAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACX,oDAAoD;oBACpD,QAAQ,EAAE,CAAC;gBACb,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/server.ts"],"names":[],"mappings":";;AAEA;;;GAGG;AACH,yBAAgC,IAA0B;IACxD,MAAM,CAAC;QACL,MAAM,EAAE,MAAM;QACd,MAAM,EAAE;YACN,aAAa,EAAE,UAAU;SAC1B;QACD,SAAS,EAAE;YACT,WAAW;YACX,UAAU,CAAM,EAAE,OAAY,EAAE,QAA6C;gBAC3E,8CAA8C;gBAC9C,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;oBAChC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,CAAC;gBAED,IAAI,CAAC;oBACH,yCAAyC;oBACzC,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACnC,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC3B,qBAAqB;wBACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBAC1B,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACN,wCAAwC;wBACxC,QAAQ,EAAE,CAAC;oBACb,CAAC;gBACH,CAAC;gBAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACX,oDAAoD;oBACpD,QAAQ,EAAE,CAAC;gBACb,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AA/BD,0CA+BC"}

package/models/webpack-configs/styles.js

@@ -85,10 +85,14 @@ function getStylesConfig(wco) {
     const hashFormat = utils_1.getOutputHashFormat(buildOptions.outputHashing);
     // use includePaths from appConfig
     const includePaths = [];
+    let lessPathOptions;
     if (appConfig.stylePreprocessorOptions
         && appConfig.stylePreprocessorOptions.includePaths
         && appConfig.stylePreprocessorOptions.includePaths.length > 0) {
         appConfig.stylePreprocessorOptions.includePaths.forEach((includePath) => includePaths.push(path.resolve(appRoot, includePath)));
+        lessPathOptions = {
+            paths: includePaths,
+        };
     }
     // process global styles
     if (appConfig.styles.length > 0) {
@@ -115,10 +119,7 @@ function getStylesConfig(wco) {
         },
         { test: /\.less$/, use: [{
                     loader: 'less-loader',
-                    options: {
-                        sourceMap: cssSourceMap,
-                        paths: includePaths
-                    }
+                    options: Object.assign({ sourceMap: cssSourceMap }, lessPathOptions)
                 }]
         },
         {

package/models/webpack-configs/styles.js.map

@@ -1 +1 @@
-{"version":3,"file":"styles.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/styles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"styles.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/styles.ts"],"names":[],"mappings":"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"}

package/models/webpack-configs/test.d.ts

@@ -1,5 +1,6 @@
 import * as webpack from 'webpack';
 import { WebpackTestOptions } from '../webpack-test-config';
+import { WebpackConfigOptions } from '../webpack-config';
 /**
  * Enumerate loaders and their dependencies from this file to let the dependency validator
  * know they are used.
@@ -7,7 +8,7 @@ import { WebpackTestOptions } from '../webpack-test-config';
  * require('istanbul-instrumenter-loader')
  *
  */
-export declare function getTestConfig(testConfig: WebpackTestOptions): {
+export declare function getTestConfig(wco: WebpackConfigOptions<WebpackTestOptions>): {
     devtool: string;
     entry: {
         main: string;

package/models/webpack-configs/test.js

@@ -11,14 +11,12 @@ const config_1 = require("../config");
  * require('istanbul-instrumenter-loader')
  *
  */
-function getTestConfig(testConfig) {
-    const configPath = config_1.CliConfig.configFilePath();
-    const projectRoot = path.dirname(configPath);
-    const appConfig = config_1.CliConfig.fromProject().config.apps[0];
+function getTestConfig(wco) {
+    const { projectRoot, buildOptions, appConfig } = wco;
     const nodeModules = path.resolve(projectRoot, 'node_modules');
     const extraRules = [];
     const extraPlugins = [];
-    if (testConfig.codeCoverage && config_1.CliConfig.fromProject()) {
+    if (buildOptions.codeCoverage && config_1.CliConfig.fromProject()) {
         const codeCoverageExclude = config_1.CliConfig.fromProject().get('test.codeCoverage.exclude');
         let exclude = [
             /\.(e2e|spec)\.ts$/,
@@ -40,7 +38,7 @@ function getTestConfig(testConfig) {
         });
     }
     return {
-        devtool: testConfig.sourcemaps ? 'inline-source-map' : 'eval',
+        devtool: buildOptions.sourcemaps ? 'inline-source-map' : 'eval',
         entry: {
             main: path.resolve(projectRoot, appConfig.root, appConfig.test)
         },

package/models/webpack-configs/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/test.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,6BAA6B;AAC7B,mCAAmC;AAEnC,sCAAsC;AAItC;;;;;;GAMG;AAGH,uBAA8B,UAA8B;IAE1D,MAAM,UAAU,GAAG,kBAAS,CAAC,cAAc,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,SAAS,GAAG,kBAAS,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAU,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAU,EAAE,CAAC;IAE/B,EAAE,CAAC,CAAC,UAAU,CAAC,YAAY,IAAI,kBAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACvD,MAAM,mBAAmB,GAAG,kBAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACrF,IAAI,OAAO,GAAwB;YACjC,mBAAmB;YACnB,cAAc;SACf,CAAC;QAEF,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACxB,mBAAmB,CAAC,OAAO,CAAC,CAAC,WAAmB;gBAC9C,MAAM,YAAY,GAAG,IAAI;qBACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qBAC1D,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,8BAA8B;YAC1D,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC5B,OAAO,EAAE,MAAM;YACf,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC;QACL,OAAO,EAAE,UAAU,CAAC,UAAU,GAAG,mBAAmB,GAAG,MAAM;QAC7D,KAAK,EAAE;YACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;SAChE;QACD,MAAM,EAAE;YACN,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;SAC7B;QACD,OAAO,EAAE;YACP,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBACtC,SAAS,EAAE,QAAQ;gBACnB,IAAI,EAAE,QAAQ;aACf,CAAC;YACF,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBACtC,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,CAAC,MAAM,CAAC;gBAChB,SAAS,EAAE,CAAC,MAAW,KAAK,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;aACvF,CAAC;SACH,CAAC,MAAM,CAAC,YAAY,CAAC;KACvB,CAAC;AACJ,CAAC;AArDD,sCAqDC"}
+{"version":3,"file":"test.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/test.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,6BAA6B;AAC7B,mCAAmC;AAEnC,sCAAsC;AAKtC;;;;;;GAMG;AAGH,uBAA8B,GAA6C;IACzE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC;IAErD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAU,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAU,EAAE,CAAC;IAE/B,EAAE,CAAC,CAAC,YAAY,CAAC,YAAY,IAAI,kBAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QACzD,MAAM,mBAAmB,GAAG,kBAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;QACrF,IAAI,OAAO,GAAwB;YACjC,mBAAmB;YACnB,cAAc;SACf,CAAC;QAEF,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACxB,mBAAmB,CAAC,OAAO,CAAC,CAAC,WAAmB;gBAC9C,MAAM,YAAY,GAAG,IAAI;qBACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;qBAC1D,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;gBACrC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC;QAED,UAAU,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,8BAA8B;YAC1D,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC5B,OAAO,EAAE,MAAM;YACf,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC;QACL,OAAO,EAAE,YAAY,CAAC,UAAU,GAAG,mBAAmB,GAAG,MAAM;QAC/D,KAAK,EAAE;YACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC;SAChE;QACD,MAAM,EAAE;YACN,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;SAC7B;QACD,OAAO,EAAE;YACP,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBACtC,SAAS,EAAE,QAAQ;gBACnB,IAAI,EAAE,QAAQ;aACf,CAAC;YACF,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBACtC,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,CAAC,MAAM,CAAC;gBAChB,SAAS,EAAE,CAAC,MAAW,KAAK,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;aACvF,CAAC;SACH,CAAC,MAAM,CAAC,YAAY,CAAC;KACvB,CAAC;AACJ,CAAC;AAnDD,sCAmDC"}

package/models/webpack-configs/typescript.d.ts

@@ -1,6 +1,6 @@
 import { AotPlugin } from '@ngtools/webpack';
 import { WebpackConfigOptions } from '../webpack-config';
-export declare const getNonAotConfig: (wco: WebpackConfigOptions) => {
+export declare function getNonAotConfig(wco: WebpackConfigOptions): {
     module: {
         rules: {
             test: RegExp;
@@ -9,7 +9,7 @@ export declare const getNonAotConfig: (wco: WebpackConfigOptions) => {
     };
     plugins: AotPlugin[];
 };
-export declare const getAotConfig: (wco: WebpackConfigOptions) => {
+export declare function getAotConfig(wco: WebpackConfigOptions): {
     module: {
         rules: {
             test: RegExp;
@@ -18,7 +18,7 @@ export declare const getAotConfig: (wco: WebpackConfigOptions) => {
     };
     plugins: AotPlugin[];
 };
-export declare const getNonAotTestConfig: (wco: WebpackConfigOptions) => {
+export declare function getNonAotTestConfig(wco: WebpackConfigOptions): {
     module: {
         rules: {
             test: RegExp;

package/models/webpack-configs/typescript.js

@@ -64,15 +64,16 @@ function _createAotPlugin(wco, options) {
         exclude: []
     }, options));
 }
-exports.getNonAotConfig = function (wco) {
+function getNonAotConfig(wco) {
     const { appConfig, projectRoot } = wco;
     const tsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
     return {
         module: { rules: [{ test: /\.ts$/, loader: webpackLoader }] },
         plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true })]
     };
-};
-exports.getAotConfig = function (wco) {
+}
+exports.getNonAotConfig = getNonAotConfig;
+function getAotConfig(wco) {
     const { projectRoot, buildOptions, appConfig } = wco;
     const tsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
     const testTsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.testTsconfig);
@@ -96,8 +97,9 @@ exports.getAotConfig = function (wco) {
         module: { rules: [{ test: /\.ts$/, use: [...boLoader, webpackLoader] }] },
         plugins: [_createAotPlugin(wco, pluginOptions)]
     };
-};
-exports.getNonAotTestConfig = function (wco) {
+}
+exports.getAotConfig = getAotConfig;
+function getNonAotTestConfig(wco) {
     const { projectRoot, appConfig } = wco;
     const tsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.testTsconfig);
     const appTsConfigPath = path.resolve(projectRoot, appConfig.root, appConfig.tsconfig);
@@ -110,5 +112,6 @@ exports.getNonAotTestConfig = function (wco) {
         module: { rules: [{ test: /\.ts$/, loader: webpackLoader }] },
         plugins: [_createAotPlugin(wco, pluginOptions)]
     };
-};
+}
+exports.getNonAotTestConfig = getNonAotTestConfig;
 //# sourceMappingURL=/users/hansl/sources/angular-cli/models/webpack-configs/typescript.js.map

package/models/webpack-configs/typescript.js.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/typescript.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typescript.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-configs/typescript.ts"],"names":[],"mappings":"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"}

package/models/webpack-test-config.d.ts

@@ -3,8 +3,7 @@ import { NgCliWebpackConfig } from './webpack-config';
 export interface WebpackTestOptions extends BuildOptions {
     codeCoverage?: boolean;
 }
-export declare class WebpackTestConfig extends NgCliWebpackConfig {
-    private testOptions;
+export declare class WebpackTestConfig extends NgCliWebpackConfig<WebpackTestOptions> {
     constructor(testOptions: WebpackTestOptions, appConfig: any);
     buildConfig(): any;
 }

package/models/webpack-test-config.js

@@ -6,15 +6,14 @@ const webpack_configs_1 = require("./webpack-configs");
 class WebpackTestConfig extends webpack_config_1.NgCliWebpackConfig {
     constructor(testOptions, appConfig) {
         super(testOptions, appConfig);
-        this.testOptions = testOptions;
     }
     buildConfig() {
-        let webpackConfigs = [
+        const webpackConfigs = [
             webpack_configs_1.getCommonConfig(this.wco),
             webpack_configs_1.getStylesConfig(this.wco),
             this.getTargetConfig(this.wco),
             webpack_configs_1.getNonAotTestConfig(this.wco),
-            webpack_configs_1.getTestConfig(this.testOptions)
+            webpack_configs_1.getTestConfig(this.wco)
         ];
         this.config = webpackMerge(webpackConfigs);
         return this.config;

package/models/webpack-test-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-test-config.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-test-config.ts"],"names":[],"mappings":";;AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAG9C,qDAAsD;AACtD,uDAK2B;AAK3B,uBAA+B,SAAQ,mCAAkB;IACvD,YAAoB,WAA+B,EAAE,SAAc;QACjE,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QADZ,gBAAW,GAAX,WAAW,CAAoB;IAEnD,CAAC;IAEM,WAAW;QAChB,IAAI,cAAc,GAAG;YACnB,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YAC9B,qCAAmB,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7B,+BAAa,CAAC,IAAI,CAAC,WAAW,CAAC;SAChC,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;QAE3C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AAlBD,8CAkBC"}
+{"version":3,"file":"webpack-test-config.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["models/webpack-test-config.ts"],"names":[],"mappings":";;AAAA,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAG9C,qDAAsD;AACtD,uDAK2B;AAK3B,uBAA+B,SAAQ,mCAAsC;IAC3E,YAAY,WAA+B,EAAE,SAAc;QACzD,KAAK,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IAChC,CAAC;IAEM,WAAW;QAChB,MAAM,cAAc,GAAG;YACrB,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,iCAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;YAC9B,qCAAmB,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7B,+BAAa,CAAC,IAAI,CAAC,GAAG,CAAC;SACxB,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;QAE3C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;CACF;AAlBD,8CAkBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "1.4.0",
+  "version": "1.4.4",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -27,11 +27,11 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/build-optimizer": "~0.0.18",
-    "@angular-devkit/schematics": "~0.0.21",
+    "@angular-devkit/build-optimizer": "~0.0.23",
+    "@angular-devkit/schematics": "~0.0.25",
     "@ngtools/json-schema": "1.1.0",
-    "@ngtools/webpack": "1.7.0",
-    "@schematics/angular": "~0.0.30",
+    "@ngtools/webpack": "1.7.2",
+    "@schematics/angular": "~0.0.38",
     "autoprefixer": "^6.5.3",
     "chalk": "^2.0.1",
     "circular-dependency-plugin": "^3.0.0",
@@ -46,10 +46,7 @@
     "extract-text-webpack-plugin": "3.0.0",
     "file-loader": "^0.10.0",
     "fs-extra": "^4.0.0",
-    "get-caller-file": "^1.0.0",
     "glob": "^7.0.3",
-    "heimdalljs": "^0.2.4",
-    "heimdalljs-logger": "^0.1.9",
     "html-webpack-plugin": "^2.29.0",
     "karma-source-map-support": "^1.2.0",
     "less": "^2.7.2",

package/plugins/insert-concat-assets-webpack-plugin.js

@@ -20,6 +20,12 @@ class InsertConcatAssetsWebpackPlugin {
                         // Something went wrong and the asset was not correctly added.
                         throw new Error(`Cannot find file for ${entryName} script.`);
                     }
+                    if (htmlPluginData.assets.publicPath) {
+                        if (htmlPluginData.assets.publicPath.endsWith('/')) {
+                            return htmlPluginData.assets.publicPath + fileName;
+                        }
+                        return htmlPluginData.assets.publicPath + '/' + fileName;
+                    }
                     return fileName;
                 });
                 let insertAt = 0;

package/plugins/insert-concat-assets-webpack-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"insert-concat-assets-webpack-plugin.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["plugins/insert-concat-assets-webpack-plugin.ts"],"names":[],"mappings":";AAAA,gDAAgD;;AAEhD;IAOE,YAAoB,UAAoB;QAApB,eAAU,GAAV,UAAU,CAAU;QANxC,0CAA0C;QAClC,gBAAW,GAAG;YACpB,wCAAwC;YACxC,qCAAqC;SACtC,CAAC;IAE0C,CAAC;IAE7C,KAAK,CAAC,QAAa;QACjB,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,WAAgB;YAC9C,WAAW,CAAC,MAAM,CAAC,4CAA4C,EAC7D,CAAC,cAAmB,EAAE,QAAa;gBAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS;oBAC9C,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,aAAa;2BAC/C,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;oBAEpD,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;wBACd,8DAA8D;wBAC9D,MAAM,IAAI,KAAK,CAAC,wBAAwB,SAAS,UAAU,CAAC,CAAC;oBAC/D,CAAC;oBAED,MAAM,CAAC,QAAQ,CAAC;gBAClB,CAAC,CAAC,CAAC;gBAEH,IAAI,QAAQ,GAAG,CAAC,CAAC;gBAEjB,oFAAoF;gBACpF,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;oBAChC,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAU,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC/E,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;wBACjB,QAAQ,GAAG,KAAK,GAAG,CAAC,CAAC;wBACrB,KAAK,CAAC;oBACR,CAAC;gBACH,CAAC;gBAED,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;gBAC3D,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1CD,0EA0CC"}
+{"version":3,"file":"insert-concat-assets-webpack-plugin.js","sourceRoot":"/users/hansl/sources/angular-cli/","sources":["plugins/insert-concat-assets-webpack-plugin.ts"],"names":[],"mappings":";AAAA,gDAAgD;;AAGhD;IAOE,YAAoB,UAAoB;QAApB,eAAU,GAAV,UAAU,CAAU;QANxC,0CAA0C;QAClC,gBAAW,GAAG;YACpB,wCAAwC;YACxC,qCAAqC;SACtC,CAAC;IAE0C,CAAC;IAE7C,KAAK,CAAC,QAAa;QACjB,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,WAAgB;YAC9C,WAAW,CAAC,MAAM,CAAC,4CAA4C,EAC7D,CAAC,cAAmB,EAAE,QAAa;gBAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS;oBAC9C,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,aAAa;2BAC/C,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;oBAEpD,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;wBACd,8DAA8D;wBAC9D,MAAM,IAAI,KAAK,CAAC,wBAAwB,SAAS,UAAU,CAAC,CAAC;oBAC/D,CAAC;oBAED,EAAE,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;wBACrC,EAAE,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;4BACnD,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC;wBACrD,CAAC;wBACD,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,GAAG,GAAG,GAAG,QAAQ,CAAC;oBAC3D,CAAC;oBACD,MAAM,CAAC,QAAQ,CAAC;gBAClB,CAAC,CAAC,CAAC;gBAEH,IAAI,QAAQ,GAAG,CAAC,CAAC;gBAEjB,oFAAoF;gBACpF,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;oBAChC,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAU,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC/E,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;wBACjB,QAAQ,GAAG,KAAK,GAAG,CAAC,CAAC;wBACrB,KAAK,CAAC;oBACR,CAAC;gBACH,CAAC;gBAED,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;gBAC3D,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAhDD,0EAgDC"}