@angular-devkit/build-angular 0.801.0-beta.3 → 0.801.2

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.801.0-beta.3",
+  "version": "0.801.2",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.801.0-beta.3",
-    "@angular-devkit/build-optimizer": "0.801.0-beta.3",
-    "@angular-devkit/build-webpack": "0.801.0-beta.3",
-    "@angular-devkit/core": "8.1.0-beta.3",
-    "@ngtools/webpack": "8.1.0-beta.3",
+    "@angular-devkit/architect": "0.801.2",
+    "@angular-devkit/build-optimizer": "0.801.2",
+    "@angular-devkit/build-webpack": "0.801.2",
+    "@angular-devkit/core": "8.1.2",
+    "@ngtools/webpack": "8.1.2",
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000974",
+    "caniuse-lite": "1.0.30000979",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
@@ -31,15 +31,15 @@
     "mini-css-extract-plugin": "0.7.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "open": "6.3.0",
+    "open": "6.4.0",
     "postcss": "7.0.17",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.21.0",
+    "sass": "1.22.2",
     "sass-loader": "7.1.0",
-    "semver": "6.1.1",
+    "semver": "6.2.0",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.35.0",
+    "webpack": "4.35.2",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
@@ -57,7 +57,7 @@
     "worker-plugin": "3.1.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
     "typescript": ">=3.1 < 3.5"
   },
   "keywords": [
@@ -83,7 +83,6 @@
   "homepage": "https://github.com/angular/angular-cli",
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged",
       "pre-push": "node ./bin/devkit-admin hooks/pre-push"
     }
   }

package/plugins/webpack/analytics.d.ts

@@ -29,6 +29,7 @@ export declare function countOccurrences(source: string, match: string, wordBrea
 declare class AnalyticsBuildStats {
     errors: string[];
     numberOfNgOnInit: number;
+    numberOfComponents: number;
     initialChunkSize: number;
     totalChunkCount: number;
     totalChunkSize: number;
@@ -55,6 +56,7 @@ export declare class NgBuildAnalyticsPlugin {
     protected _reportBuildMetrics(stats: Stats): void;
     protected _reportRebuildMetrics(stats: Stats): void;
     protected _checkTsNormalModule(module: NormalModule): void;
+    protected _checkNgFactoryNormalModule(module: NormalModule): void;
     protected _collectErrors(stats: Stats): void;
     protected _collectBundleStats(json: any): void;
     /************************************************************************************************

package/plugins/webpack/analytics.js

@@ -56,6 +56,7 @@ class AnalyticsBuildStats {
     constructor() {
         this.errors = [];
         this.numberOfNgOnInit = 0;
+        this.numberOfComponents = 0;
         this.initialChunkSize = 0;
         this.totalChunkCount = 0;
         this.totalChunkSize = 0;
@@ -87,6 +88,7 @@ class NgBuildAnalyticsPlugin {
         const metrics = [];
         metrics[core_1.analytics.NgCliAnalyticsMetrics.BuildTime] = (endTime - startTime);
         metrics[core_1.analytics.NgCliAnalyticsMetrics.NgOnInitCount] = this._stats.numberOfNgOnInit;
+        metrics[core_1.analytics.NgCliAnalyticsMetrics.NgComponentCount] = this._stats.numberOfComponents;
         metrics[core_1.analytics.NgCliAnalyticsMetrics.InitialChunkSize] = this._stats.initialChunkSize;
         metrics[core_1.analytics.NgCliAnalyticsMetrics.TotalChunkCount] = this._stats.totalChunkCount;
         metrics[core_1.analytics.NgCliAnalyticsMetrics.TotalChunkSize] = this._stats.totalChunkSize;
@@ -100,8 +102,10 @@ class NgBuildAnalyticsPlugin {
     }
     _getDimensions(stats) {
         const dimensions = [];
-        // Adding commas before and after so the regex are easier to define.
-        dimensions[core_1.analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
+        if (this._stats.errors.length) {
+            // Adding commas before and after so the regex are easier to define filters.
+            dimensions[core_1.analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
+        }
         return dimensions;
     }
     _reportBuildMetrics(stats) {
@@ -116,10 +120,25 @@ class NgBuildAnalyticsPlugin {
     }
     _checkTsNormalModule(module) {
         if (module._source) {
+            // PLEASE REMEMBER:
             // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
             // Just count the ngOnInit occurences. Comments/Strings/calls occurences should be sparse
             // so we just consider them within the margin of error. We do break on word break though.
             this._stats.numberOfNgOnInit += countOccurrences(module._source.source(), 'ngOnInit', true);
+            // Count the number of `Component({` strings (case sensitive), which happens in __decorate().
+            // This does not include View Engine AOT compilation, we use the ngfactory for it.
+            this._stats.numberOfComponents += countOccurrences(module._source.source(), ' Component({');
+            // For Ivy we just count ngComponentDef.
+            this._stats.numberOfComponents += countOccurrences(module._source.source(), 'ngComponentDef', true);
+        }
+    }
+    _checkNgFactoryNormalModule(module) {
+        if (module._source) {
+            // PLEASE REMEMBER:
+            // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
+            // Count the number of `.ɵccf(` strings (case sensitive). They're calls to components
+            // factories.
+            this._stats.numberOfComponents += countOccurrences(module._source.source(), '.ɵccf(');
         }
     }
     _collectErrors(stats) {
@@ -198,9 +217,12 @@ class NgBuildAnalyticsPlugin {
             return;
         }
         // Check that it's a source file from the project.
-        if (module.constructor === NormalModule && module.resource.endsWith('.ts')) {
+        if (module.resource.endsWith('.ts')) {
             this._checkTsNormalModule(module);
         }
+        else if (module.resource.endsWith('.ngfactory.js')) {
+            this._checkNgFactoryNormalModule(module);
+        }
     }
     _compilation(compiler, compilation) {
         this._reset();

package/src/angular-cli-files/models/es5-polyfills.js

@@ -8,6 +8,7 @@
 
 // ES2015 symbol capabilities
 import 'core-js/modules/es.symbol';
+import 'core-js/modules/es.symbol.iterator';
 
 // ES2015 function capabilities
 import 'core-js/modules/es.function.bind';

package/src/angular-cli-files/models/webpack-configs/common.js

@@ -48,8 +48,7 @@ function getCommonConfig(wco) {
         const buildBrowserFeatures = new build_browser_features_1.BuildBrowserFeatures(projectRoot, tsConfig.options.target || typescript_1.ScriptTarget.ES5);
         if ((buildOptions.scriptTargetOverride || tsConfig.options.target) === typescript_1.ScriptTarget.ES5) {
             if (buildOptions.es5BrowserSupport ||
-                (buildOptions.es5BrowserSupport === undefined &&
-                    buildBrowserFeatures.isEs5SupportNeeded())) {
+                (buildOptions.es5BrowserSupport === undefined && buildBrowserFeatures.isEs5SupportNeeded())) {
                 // The nomodule polyfill needs to be inject prior to any script and be
                 // outside of webpack compilation because otherwise webpack will cause the
                 // script to be wrapped in window["webpackJsonp"] which causes this to fail.
@@ -95,15 +94,14 @@ function getCommonConfig(wco) {
     const hashFormat = utils_1.getOutputHashFormat(buildOptions.outputHashing || 'none');
     // process global scripts
     if (buildOptions.scripts.length > 0) {
-        const globalScriptsByBundleName = utils_1.normalizeExtraEntryPoints(buildOptions.scripts, 'scripts')
-            .reduce((prev, curr) => {
+        const globalScriptsByBundleName = utils_1.normalizeExtraEntryPoints(buildOptions.scripts, 'scripts').reduce((prev, curr) => {
             const bundleName = curr.bundleName;
             const resolvedPath = path.resolve(root, curr.input);
-            const existingEntry = prev.find((el) => el.bundleName === bundleName);
+            const existingEntry = prev.find(el => el.bundleName === bundleName);
             if (existingEntry) {
-                if (existingEntry.lazy && !curr.lazy) {
+                if (existingEntry.inject && !curr.inject) {
                     // All entries have to be lazy for the bundle to be lazy.
-                    throw new Error(`The ${curr.bundleName} bundle is mixing lazy and non-lazy scripts.`);
+                    throw new Error(`The ${curr.bundleName} bundle is mixing injected and non-injected scripts.`);
                 }
                 existingEntry.paths.push(resolvedPath);
             }
@@ -111,15 +109,15 @@ function getCommonConfig(wco) {
                 prev.push({
                     bundleName,
                     paths: [resolvedPath],
-                    lazy: curr.lazy || false,
+                    inject: curr.inject,
                 });
             }
             return prev;
         }, []);
         // Add a new asset for each entry.
-        globalScriptsByBundleName.forEach((script) => {
+        globalScriptsByBundleName.forEach(script => {
             // Lazy scripts don't get a hash, otherwise they can't be loaded by name.
-            const hash = script.lazy ? '' : hashFormat.script;
+            const hash = script.inject ? hashFormat.script : '';
             const bundleName = script.bundleName;
             extraPlugins.push(new scripts_webpack_plugin_1.ScriptsWebpackPlugin({
                 name: bundleName,
@@ -165,14 +163,14 @@ function getCommonConfig(wco) {
         }));
     }
     if (buildOptions.statsJson) {
-        extraPlugins.push(new class {
+        extraPlugins.push(new (class {
             apply(compiler) {
                 compiler.hooks.emit.tap('angular-cli-stats', compilation => {
                     const data = JSON.stringify(compilation.getStats().toJson('verbose'));
                     compilation.assets[`stats${targetInFileName}.json`] = new webpack_sources_1.RawSource(data);
                 });
             }
-        });
+        })());
     }
     if (buildOptions.namedChunks) {
         extraPlugins.push(new named_chunks_plugin_1.NamedLazyChunksPlugin());
@@ -219,7 +217,7 @@ function getCommonConfig(wco) {
         extraMinimizers.push(new cleancss_webpack_plugin_1.CleanCssWebpackPlugin({
             sourceMap: stylesSourceMap,
             // component styles retain their original file name
-            test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
+            test: file => /\.(?:css|scss|sass|less|styl)$/.test(file),
         }));
     }
     if (scriptsOptimization) {
@@ -249,15 +247,17 @@ function getCommonConfig(wco) {
             },
             // On server, we don't want to compress anything. We still set the ngDevMode = false for it
             // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
-            compress: (buildOptions.platform == 'server' ? {
-                global_defs: angularGlobalDefinitions,
-            } : {
-                pure_getters: buildOptions.buildOptimizer,
-                // PURE comments work best with 3 passes.
-                // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
-                passes: buildOptions.buildOptimizer ? 3 : 1,
-                global_defs: angularGlobalDefinitions,
-            }),
+            compress: buildOptions.platform == 'server'
+                ? {
+                    global_defs: angularGlobalDefinitions,
+                }
+                : {
+                    pure_getters: buildOptions.buildOptimizer,
+                    // PURE comments work best with 3 passes.
+                    // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
+                    passes: buildOptions.buildOptimizer ? 3 : 1,
+                    global_defs: angularGlobalDefinitions,
+                },
             // We also want to avoid mangling on server.
             ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
         };
@@ -277,18 +277,13 @@ function getCommonConfig(wco) {
     `);
     }
     return {
-        mode: scriptsOptimization || stylesOptimization
-            ? 'production'
-            : 'development',
+        mode: scriptsOptimization || stylesOptimization ? 'production' : 'development',
         devtool: false,
         profile: buildOptions.statsJson,
         resolve: {
             extensions: ['.ts', '.tsx', '.mjs', '.js'],
             symlinks: !buildOptions.preserveSymlinks,
-            modules: [
-                wco.tsConfig.options.baseUrl || projectRoot,
-                'node_modules',
-            ],
+            modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
             alias,
         },
         resolveLoader: {

package/src/angular-cli-files/models/webpack-configs/styles.js

@@ -26,6 +26,7 @@ const postcssImports = require('postcss-import');
  * require('node-sass')
  * require('sass-loader')
  */
+// tslint:disable-next-line:no-big-function
 function getStylesConfig(wco) {
     const { root, buildOptions } = wco;
     const entryPoints = {};
@@ -37,7 +38,7 @@ function getStylesConfig(wco) {
     const postcssPluginCreator = function (loader) {
         return [
             postcssImports({
-                resolve: (url) => url.startsWith('~') ? url.substr(1) : url,
+                resolve: (url) => (url.startsWith('~') ? url.substr(1) : url),
                 load: (filename) => {
                     return new Promise((resolve, reject) => {
                         loader.fs.readFile(filename, (err, data) => {
@@ -65,9 +66,9 @@ function getStylesConfig(wco) {
     // use includePaths from appConfig
     const includePaths = [];
     let lessPathOptions = {};
-    if (buildOptions.stylePreprocessorOptions
-        && buildOptions.stylePreprocessorOptions.includePaths
-        && buildOptions.stylePreprocessorOptions.includePaths.length > 0) {
+    if (buildOptions.stylePreprocessorOptions &&
+        buildOptions.stylePreprocessorOptions.includePaths &&
+        buildOptions.stylePreprocessorOptions.includePaths.length > 0) {
         buildOptions.stylePreprocessorOptions.includePaths.forEach((includePath) => includePaths.push(path.resolve(root, includePath)));
         lessPathOptions = {
             paths: includePaths,
@@ -85,8 +86,8 @@ function getStylesConfig(wco) {
             else {
                 entryPoints[style.bundleName] = [resolvedPath];
             }
-            // Add lazy styles to the list.
-            if (style.lazy) {
+            // Add non injected styles to the list.
+            if (!style.inject) {
                 chunkNames.push(style.bundleName);
             }
             // Add global css paths.
@@ -116,7 +117,8 @@ function getStylesConfig(wco) {
         { test: /\.css$/, use: [] },
         {
             test: /\.scss$|\.sass$/,
-            use: [{
+            use: [
+                {
                     loader: 'sass-loader',
                     options: {
                         implementation: sassImplementation,
@@ -126,28 +128,33 @@ function getStylesConfig(wco) {
                         precision: 8,
                         includePaths,
                     },
-                }],
+                },
+            ],
         },
         {
             test: /\.less$/,
-            use: [{
+            use: [
+                {
                     loader: 'less-loader',
                     options: {
                         sourceMap: cssSourceMap,
                         javascriptEnabled: true,
                         ...lessPathOptions,
                     },
-                }],
+                },
+            ],
         },
         {
             test: /\.styl$/,
-            use: [{
+            use: [
+                {
                     loader: 'stylus-loader',
                     options: {
                         sourceMap: cssSourceMap,
                         paths: includePaths,
                     },
-                }],
+                },
+            ],
         },
     ];
     // load component css as raw strings
@@ -181,10 +188,9 @@ function getStylesConfig(wco) {
                         options: {
                             ident: buildOptions.extractCss ? 'extracted' : 'embedded',
                             plugins: postcssPluginCreator,
-                            sourceMap: cssSourceMap
-                                && !buildOptions.extractCss
-                                && !buildOptions.sourceMap.hidden
-                                ? 'inline' : cssSourceMap,
+                            sourceMap: cssSourceMap && !buildOptions.extractCss && !buildOptions.sourceMap.hidden
+                                ? 'inline'
+                                : cssSourceMap,
                         },
                     },
                     ...use,

package/src/angular-cli-files/models/webpack-configs/utils.d.ts

@@ -15,9 +15,8 @@ export interface HashFormat {
     script: string;
 }
 export declare function getOutputHashFormat(option: string, length?: number): HashFormat;
-export declare type NormalizedEntryPoint = ExtraEntryPointClass & {
-    bundleName: string;
-};
+declare type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export declare type NormalizedEntryPoint = Required<Omit<ExtraEntryPointClass, 'lazy'>>;
 export declare function normalizeExtraEntryPoints(extraEntryPoints: ExtraEntryPoint[], defaultBundleName: string): NormalizedEntryPoint[];
 export declare function getSourceMapDevTool(scriptsSourceMap: boolean, stylesSourceMap: boolean, hiddenSourceMap?: boolean, inlineSourceMap?: boolean): SourceMapDevToolPlugin;
 /**
@@ -25,3 +24,4 @@ export declare function getSourceMapDevTool(scriptsSourceMap: boolean, stylesSou
  */
 export declare function getEsVersionForFileName(scriptTargetOverride: ScriptTarget | undefined, esVersionInFileName?: boolean): string;
 export declare function isPolyfillsEntry(name: string): boolean;
+export {};

package/src/angular-cli-files/models/webpack-configs/utils.js

@@ -17,8 +17,18 @@ function getOutputHashFormat(option, length = 20) {
     const hashFormats = {
         none: { chunk: '', extract: '', file: '', script: '' },
         media: { chunk: '', extract: '', file: `.[hash:${length}]`, script: '' },
-        bundles: { chunk: `.[chunkhash:${length}]`, extract: `.[contenthash:${length}]`, file: '', script: `.[hash:${length}]` },
-        all: { chunk: `.[chunkhash:${length}]`, extract: `.[contenthash:${length}]`, file: `.[hash:${length}]`, script: `.[hash:${length}]` },
+        bundles: {
+            chunk: `.[chunkhash:${length}]`,
+            extract: `.[contenthash:${length}]`,
+            file: '',
+            script: `.[hash:${length}]`,
+        },
+        all: {
+            chunk: `.[chunkhash:${length}]`,
+            extract: `.[contenthash:${length}]`,
+            file: `.[hash:${length}]`,
+            script: `.[hash:${length}]`,
+        },
     };
     /* tslint:enable:max-line-length */
     return hashFormats[option] || hashFormats['none'];
@@ -28,21 +38,23 @@ function normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName) {
     return extraEntryPoints.map(entry => {
         let normalizedEntry;
         if (typeof entry === 'string') {
-            normalizedEntry = { input: entry, lazy: false, bundleName: defaultBundleName };
+            normalizedEntry = { input: entry, inject: true, bundleName: defaultBundleName };
         }
         else {
+            const { lazy, inject = true, ...newEntry } = entry;
+            const injectNormalized = entry.lazy !== undefined ? !entry.lazy : inject;
             let bundleName;
             if (entry.bundleName) {
                 bundleName = entry.bundleName;
             }
-            else if (entry.lazy) {
+            else if (!injectNormalized) {
                 // Lazy entry points use the file name as bundle name.
                 bundleName = core_1.basename(core_1.normalize(entry.input.replace(/\.(js|css|scss|sass|less|styl)$/i, '')));
             }
             else {
                 bundleName = defaultBundleName;
             }
-            normalizedEntry = { ...entry, bundleName };
+            normalizedEntry = { ...newEntry, inject: injectNormalized, bundleName };
         }
         return normalizedEntry;
     });
@@ -59,6 +71,7 @@ function getSourceMapDevTool(scriptsSourceMap, stylesSourceMap, hiddenSourceMap
     return new webpack_1.SourceMapDevToolPlugin({
         filename: inlineSourceMap ? undefined : '[file].map',
         include,
+        moduleFilenameTemplate: '[namespace]/[resource-path]',
         append: hiddenSourceMap ? false : undefined,
     });
 }
@@ -67,8 +80,9 @@ exports.getSourceMapDevTool = getSourceMapDevTool;
  * Returns an ES version file suffix to differentiate between various builds.
  */
 function getEsVersionForFileName(scriptTargetOverride, esVersionInFileName = false) {
-    return scriptTargetOverride && esVersionInFileName ?
-        '-' + typescript_1.ScriptTarget[scriptTargetOverride].toLowerCase() : '';
+    return scriptTargetOverride && esVersionInFileName
+        ? '-' + typescript_1.ScriptTarget[scriptTargetOverride].toLowerCase()
+        : '';
 }
 exports.getEsVersionForFileName = getEsVersionForFileName;
 function isPolyfillsEntry(name) {

package/src/angular-cli-files/plugins/index-html-webpack-plugin.d.ts

@@ -1,4 +1,5 @@
 import { Compiler } from 'webpack';
+import { CrossOriginValue } from '../utilities/index-file/augment-index-html';
 import { IndexHtmlTransform } from '../utilities/index-file/write-index-html';
 export interface IndexHtmlWebpackPluginOptions {
     input: string;
@@ -8,7 +9,9 @@ export interface IndexHtmlWebpackPluginOptions {
     deployUrl?: string;
     sri: boolean;
     noModuleEntrypoints: string[];
+    moduleEntrypoints: string[];
     postTransform?: IndexHtmlTransform;
+    crossOrigin?: CrossOriginValue;
 }
 export declare class IndexHtmlWebpackPlugin {
     private _options;

package/src/angular-cli-files/plugins/index-html-webpack-plugin.js

@@ -29,6 +29,7 @@ class IndexHtmlWebpackPlugin {
             output: 'index.html',
             entrypoints: ['polyfills', 'main'],
             noModuleEntrypoints: [],
+            moduleEntrypoints: [],
             sri: false,
             ...options,
         };
@@ -37,14 +38,13 @@ class IndexHtmlWebpackPlugin {
         compiler.hooks.emit.tapPromise('index-html-webpack-plugin', async (compilation) => {
             // Get input html file
             const inputContent = await readFile(this._options.input, compilation);
-            compilation
-                .fileDependencies.add(this._options.input);
+            compilation.fileDependencies.add(this._options.input);
             // Get all files for selected entrypoints
             const files = [];
             const noModuleFiles = [];
+            const moduleFiles = [];
             for (const [entryName, entrypoint] of compilation.entrypoints) {
-                const entryFiles = (entrypoint && entrypoint.getFiles() || [])
-                    .map((f) => ({
+                const entryFiles = ((entrypoint && entrypoint.getFiles()) || []).map((f) => ({
                     name: entryName,
                     file: f,
                     extension: path.extname(f),
@@ -52,6 +52,9 @@ class IndexHtmlWebpackPlugin {
                 if (this._options.noModuleEntrypoints.includes(entryName)) {
                     noModuleFiles.push(...entryFiles);
                 }
+                else if (this._options.moduleEntrypoints.includes(entryName)) {
+                    moduleFiles.push(...entryFiles);
+                }
                 else {
                     files.push(...entryFiles);
                 }
@@ -63,9 +66,11 @@ class IndexHtmlWebpackPlugin {
                 baseHref: this._options.baseHref,
                 deployUrl: this._options.deployUrl,
                 sri: this._options.sri,
+                crossOrigin: this._options.crossOrigin,
                 files,
                 noModuleFiles,
                 loadOutputFile,
+                moduleFiles,
                 entrypoints: this._options.entrypoints,
             });
             if (this._options.postTransform) {

package/src/angular-cli-files/plugins/karma.js

@@ -125,7 +125,6 @@ const init = (config, emitter, customFileHandlers) => {
     // Files need to be served from a custom path for Karma.
     webpackConfig.output.path = '/_karma_webpack_/';
     webpackConfig.output.publicPath = '/_karma_webpack_/';
-    webpackConfig.output.devtoolModuleFilenameTemplate = '[namespace]/[resource-path]?[loaders]';
     let compiler;
     try {
         compiler = webpack(webpackConfig);

package/src/angular-cli-files/plugins/single-test-transform.d.ts

@@ -0,0 +1,28 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { logging } from '@angular-devkit/core';
+import { loader } from 'webpack';
+export interface SingleTestTransformLoaderOptions {
+    files: string[];
+    logger: logging.Logger;
+}
+export declare const SingleTestTransformLoader: string;
+/**
+ * This loader transforms the default test file to only run tests
+ * for some specs instead of all specs.
+ * It works by replacing the known content of the auto-generated test file:
+ *   const context = require.context('./', true, /\.spec\.ts$/);
+ *   context.keys().map(context);
+ * with:
+ *   const context = { keys: () => ({ map: (_a) => { } }) };
+ *   context.keys().map(context);
+ * So that it does nothing.
+ * Then it adds import statements for each file in the files options
+ * array to import them directly, and thus run the tests there.
+ */
+export default function loader(this: loader.LoaderContext, source: string): string;

package/src/angular-cli-files/plugins/single-test-transform.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const loader_utils_1 = require("loader-utils");
+const path_1 = require("path");
+exports.SingleTestTransformLoader = require.resolve(path_1.join(__dirname, 'single-test-transform'));
+/**
+ * This loader transforms the default test file to only run tests
+ * for some specs instead of all specs.
+ * It works by replacing the known content of the auto-generated test file:
+ *   const context = require.context('./', true, /\.spec\.ts$/);
+ *   context.keys().map(context);
+ * with:
+ *   const context = { keys: () => ({ map: (_a) => { } }) };
+ *   context.keys().map(context);
+ * So that it does nothing.
+ * Then it adds import statements for each file in the files options
+ * array to import them directly, and thus run the tests there.
+ */
+function loader(source) {
+    const options = loader_utils_1.getOptions(this);
+    const lineSeparator = process.platform === 'win32' ? '\r\n' : '\n';
+    const targettedImports = options.files
+        .map(path => `require('./${path.replace('.' + path_1.extname(path), '')}');`)
+        .join(lineSeparator);
+    // TODO: maybe a documented 'marker/comment' inside test.ts would be nicer?
+    const regex = /require\.context\(.*/;
+    // signal the user that expected content is not present
+    if (!regex.test(source)) {
+        const message = [
+            `The 'include' option requires that the 'main' file for tests include the line below:`,
+            `const context = require.context('./', true, /\.spec\.ts$/);`,
+            `Arguments passed to require.context are not strict and can be changed`,
+        ];
+        options.logger.error(message.join(lineSeparator));
+    }
+    const mockedRequireContext = '{ keys: () => ({ map: (_a) => { } }) };' + lineSeparator;
+    source = source.replace(regex, mockedRequireContext + targettedImports);
+    return source;
+}
+exports.default = loader;

package/src/angular-cli-files/utilities/find-tests.d.ts

@@ -0,0 +1 @@
+export declare function findTests(patterns: string[], cwd: string, workspaceRoot: string): string[];