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

package/src/angular-cli-files/utilities/find-tests.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @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
+ */
+const fs_1 = require("fs");
+const glob = require("glob");
+const path_1 = require("path");
+const is_directory_1 = require("./is-directory");
+// go through all patterns and find unique list of files
+function findTests(patterns, cwd, workspaceRoot) {
+    return patterns.reduce((files, pattern) => {
+        const relativePathToMain = cwd.replace(workspaceRoot, '').substr(1); // remove leading slash
+        const tests = findMatchingTests(pattern, cwd, relativePathToMain);
+        tests.forEach(file => {
+            if (!files.includes(file)) {
+                files.push(file);
+            }
+        });
+        return files;
+    }, []);
+}
+exports.findTests = findTests;
+function findMatchingTests(pattern, cwd, relativePathToMain) {
+    // normalize pattern, glob lib only accepts forward slashes
+    pattern = pattern.replace(/\\/g, '/');
+    relativePathToMain = relativePathToMain.replace(/\\/g, '/');
+    // remove relativePathToMain to support relative paths from root
+    // such paths are easy to get when running scripts via IDEs
+    if (pattern.startsWith(relativePathToMain + '/')) {
+        pattern = pattern.substr(relativePathToMain.length + 1); // +1 to include slash
+    }
+    // special logic when pattern does not look like a glob
+    if (!glob.hasMagic(pattern)) {
+        if (is_directory_1.isDirectory(path_1.join(cwd, pattern))) {
+            pattern = `${pattern}/**/*.spec.@(ts|tsx)`;
+        }
+        else {
+            // see if matching spec file exists
+            const extension = path_1.extname(pattern);
+            const matchingSpec = `${path_1.basename(pattern, extension)}.spec${extension}`;
+            if (fs_1.existsSync(path_1.join(cwd, path_1.dirname(pattern), matchingSpec))) {
+                pattern = path_1.join(path_1.dirname(pattern), matchingSpec).replace(/\\/g, '/');
+            }
+        }
+    }
+    const files = glob.sync(pattern, {
+        cwd,
+    });
+    return files;
+}

package/src/angular-cli-files/utilities/index-file/augment-index-html.d.ts

@@ -6,12 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export declare type LoadOutputFileFunctionType = (file: string) => Promise<string>;
+export declare type CrossOriginValue = 'none' | 'anonymous' | 'use-credentials';
 export interface AugmentIndexHtmlOptions {
     input: string;
     inputContent: string;
     baseHref?: string;
     deployUrl?: string;
     sri: boolean;
+    /** crossorigin attribute setting of elements that provide CORS support */
+    crossOrigin?: CrossOriginValue;
     files: FileInfo[];
     /** Files that should be added using 'nomodule'. */
     noModuleFiles?: FileInfo[];

package/src/angular-cli-files/utilities/index-file/augment-index-html.js

@@ -17,7 +17,11 @@ const parse5 = require('parse5');
  * bundles for differential serving.
  */
 async function augmentIndexHtml(params) {
-    const { loadOutputFile, files, noModuleFiles = [], moduleFiles = [], entrypoints, } = params;
+    const { loadOutputFile, files, noModuleFiles = [], moduleFiles = [], entrypoints } = params;
+    let { crossOrigin = 'none' } = params;
+    if (params.sri && crossOrigin === 'none') {
+        crossOrigin = 'anonymous';
+    }
     const stylesheets = new Set();
     const scripts = new Set();
     // Sort files in the order we want to insert them by entrypoint and dedupes duplicates
@@ -83,6 +87,9 @@ async function augmentIndexHtml(params) {
         const attrs = [
             { name: 'src', value: (params.deployUrl || '') + script },
         ];
+        if (crossOrigin !== 'none') {
+            attrs.push({ name: 'crossorigin', value: crossOrigin });
+        }
         // We want to include nomodule or module when a file is not common amongs all
         // such as runtime.js
         const scriptPredictor = ({ file }) => file === script;
@@ -104,7 +111,7 @@ async function augmentIndexHtml(params) {
             attrs.push(..._generateSriAttributes(content));
         }
         const attributes = attrs
-            .map(attr => attr.value === null ? attr.name : `${attr.name}="${attr.value}"`)
+            .map(attr => (attr.value === null ? attr.name : `${attr.name}="${attr.value}"`))
             .join(' ');
         scriptElements += `<script ${attributes}></script>`;
     }
@@ -148,6 +155,9 @@ async function augmentIndexHtml(params) {
             { name: 'rel', value: 'stylesheet' },
             { name: 'href', value: (params.deployUrl || '') + stylesheet },
         ];
+        if (crossOrigin !== 'none') {
+            attrs.push({ name: 'crossorigin', value: crossOrigin });
+        }
         if (params.sri) {
             const content = await loadOutputFile(stylesheet);
             attrs.push(..._generateSriAttributes(content));
@@ -164,8 +174,5 @@ function _generateSriAttributes(content) {
     const hash = crypto_1.createHash(algo)
         .update(content, 'utf8')
         .digest('base64');
-    return [
-        { name: 'integrity', value: `${algo}-${hash}` },
-        { name: 'crossorigin', value: 'anonymous' },
-    ];
+    return [{ name: 'integrity', value: `${algo}-${hash}` }];
 }

package/src/angular-cli-files/utilities/index-file/write-index-html.d.ts

@@ -9,6 +9,7 @@ import { EmittedFiles } from '@angular-devkit/build-webpack';
 import { Path, virtualFs } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { ExtraEntryPoint } from '../../../browser/schema';
+import { CrossOriginValue } from './augment-index-html';
 export interface WriteIndexHtmlOptions {
     host: virtualFs.Host;
     outputPath: Path;
@@ -22,6 +23,7 @@ export interface WriteIndexHtmlOptions {
     scripts?: ExtraEntryPoint[];
     styles?: ExtraEntryPoint[];
     postTransform?: IndexHtmlTransform;
+    crossOrigin?: CrossOriginValue;
 }
 export declare type IndexHtmlTransform = (content: string) => Promise<string>;
-export declare function writeIndexHtml({ host, outputPath, indexPath, files, noModuleFiles, moduleFiles, baseHref, deployUrl, sri, scripts, styles, postTransform, }: WriteIndexHtmlOptions): Observable<void>;
+export declare function writeIndexHtml({ host, outputPath, indexPath, files, noModuleFiles, moduleFiles, baseHref, deployUrl, sri, scripts, styles, postTransform, crossOrigin, }: WriteIndexHtmlOptions): Observable<void>;

package/src/angular-cli-files/utilities/index-file/write-index-html.js

@@ -13,24 +13,25 @@ const operators_1 = require("rxjs/operators");
 const package_chunk_sort_1 = require("../package-chunk-sort");
 const strip_bom_1 = require("../strip-bom");
 const augment_index_html_1 = require("./augment-index-html");
-function writeIndexHtml({ host, outputPath, indexPath, files = [], noModuleFiles = [], moduleFiles = [], baseHref, deployUrl, sri = false, scripts = [], styles = [], postTransform, }) {
-    return host.read(indexPath)
-        .pipe(operators_1.map(content => strip_bom_1.stripBom(core_1.virtualFs.fileBufferToString(content))), operators_1.switchMap(content => augment_index_html_1.augmentIndexHtml({
+function writeIndexHtml({ host, outputPath, indexPath, files = [], noModuleFiles = [], moduleFiles = [], baseHref, deployUrl, sri = false, scripts = [], styles = [], postTransform, crossOrigin, }) {
+    return host.read(indexPath).pipe(operators_1.map(content => strip_bom_1.stripBom(core_1.virtualFs.fileBufferToString(content))), operators_1.switchMap(content => augment_index_html_1.augmentIndexHtml({
         input: core_1.getSystemPath(outputPath),
         inputContent: content,
         baseHref,
         deployUrl,
+        crossOrigin,
         sri,
         entrypoints: package_chunk_sort_1.generateEntryPoints({ scripts, styles }),
         files: filterAndMapBuildFiles(files, ['.js', '.css']),
         noModuleFiles: filterAndMapBuildFiles(noModuleFiles, '.js'),
         moduleFiles: filterAndMapBuildFiles(moduleFiles, '.js'),
         loadOutputFile: async (filePath) => {
-            return host.read(core_1.join(outputPath, filePath))
+            return host
+                .read(core_1.join(outputPath, filePath))
                 .pipe(operators_1.map(data => core_1.virtualFs.fileBufferToString(data)))
                 .toPromise();
         },
-    })), operators_1.switchMap(content => postTransform ? postTransform(content) : rxjs_1.of(content)), operators_1.map(content => core_1.virtualFs.stringToFileBuffer(content)), operators_1.switchMap(content => host.write(core_1.join(outputPath, core_1.basename(indexPath)), content)));
+    })), operators_1.switchMap(content => (postTransform ? postTransform(content) : rxjs_1.of(content))), operators_1.map(content => core_1.virtualFs.stringToFileBuffer(content)), operators_1.switchMap(content => host.write(core_1.join(outputPath, core_1.basename(indexPath)), content)));
 }
 exports.writeIndexHtml = writeIndexHtml;
 function filterAndMapBuildFiles(files, extensionFilter) {

package/src/angular-cli-files/utilities/package-chunk-sort.js

@@ -5,7 +5,7 @@ function generateEntryPoints(appConfig) {
     // Add all styles/scripts, except lazy-loaded ones.
     const extraEntryPoints = (extraEntryPoints, defaultBundleName) => {
         const entryPoints = utils_1.normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName)
-            .filter(entry => !entry.lazy)
+            .filter(entry => entry.inject)
             .map(entry => entry.bundleName);
         // remove duplicates
         return [...new Set(entryPoints)];
@@ -19,7 +19,9 @@ function generateEntryPoints(appConfig) {
         ...extraEntryPoints(appConfig.scripts, 'scripts'),
         'main',
     ];
-    const duplicates = [...new Set(entryPoints.filter(x => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x)))];
+    const duplicates = [
+        ...new Set(entryPoints.filter(x => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x))),
+    ];
     if (duplicates.length > 0) {
         throw new Error(`Multiple bundles have been named the same: '${duplicates.join(`', '`)}'.`);
     }

package/src/browser/index.js

@@ -61,13 +61,12 @@ function getAnalyticsConfig(wco, context) {
         let category = 'build';
         if (context.builder) {
             // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
-            category = context.builder.builderName.split(':')[1];
+            category =
+                context.builder.builderName.split(':')[1] || context.builder.builderName || 'build';
         }
         // The category is the builder name if it's an angular builder.
         return {
-            plugins: [
-                new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category),
-            ],
+            plugins: [new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category)],
         };
     }
     return {};
@@ -97,11 +96,11 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     const root = core_1.normalize(context.workspaceRoot);
     // Check Angular version.
     version_1.assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
-    const loggingFn = transforms.logging
-        || createBrowserLoggingCallback(!!options.verbose, context.logger);
+    const loggingFn = transforms.logging || createBrowserLoggingCallback(!!options.verbose, context.logger);
     return rxjs_1.from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(operators_1.switchMap(({ workspace, config: configs }) => {
         const projectName = context.target
-            ? context.target.project : workspace.getDefaultProjectName();
+            ? context.target.project
+            : workspace.getDefaultProjectName();
         if (!projectName) {
             throw new Error('Must either have a target from the context or a default project.');
         }
@@ -109,7 +108,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
         const tsConfig = read_tsconfig_1.readTsconfig(options.tsConfig, context.workspaceRoot);
         const target = tsConfig.options.target || typescript_1.ScriptTarget.ES5;
         const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(core_1.getSystemPath(projectRoot), target);
-        if (target > typescript_1.ScriptTarget.ES2015 && buildBrowserFeatures.isDifferentialLoadingNeeded()) {
+        const isDifferentialLoadingNeeded = buildBrowserFeatures.isDifferentialLoadingNeeded();
+        if (target > typescript_1.ScriptTarget.ES2015 && isDifferentialLoadingNeeded) {
             context.logger.warn(core_1.tags.stripIndent `
           WARNING: Using differential loading with targets ES5 and ES2016 or higher may
           cause problems. Browsers with support for ES2015 will load the ES2016+ scripts
@@ -133,14 +133,20 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                 let noModuleFiles;
                 let moduleFiles;
                 let files;
-                const [ES5Result, ES2015Result] = buildEvents;
+                const [firstBuild, secondBuild] = buildEvents;
                 if (buildEvents.length === 2) {
-                    noModuleFiles = ES5Result.emittedFiles;
-                    moduleFiles = ES2015Result.emittedFiles || [];
+                    moduleFiles = firstBuild.emittedFiles || [];
+                    noModuleFiles = secondBuild.emittedFiles;
+                    files = moduleFiles.filter(x => x.extension === '.css');
+                }
+                else if (options.watch && isDifferentialLoadingNeeded) {
+                    // differential loading is not enabled in watch mode
+                    // but we still want to use module type tags
+                    moduleFiles = firstBuild.emittedFiles || [];
                     files = moduleFiles.filter(x => x.extension === '.css');
                 }
                 else {
-                    const { emittedFiles = [] } = ES5Result;
+                    const { emittedFiles = [] } = firstBuild;
                     files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
                     noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
                 }
@@ -157,8 +163,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     scripts: options.scripts,
                     styles: options.styles,
                     postTransform: transforms.indexHtml,
-                })
-                    .pipe(operators_1.map(() => ({ success: true })), operators_1.catchError(error => rxjs_1.of({ success: false, error: mapErrorToMessage(error) })));
+                    crossOrigin: options.crossOrigin,
+                }).pipe(operators_1.map(() => ({ success: true })), operators_1.catchError(error => rxjs_1.of({ success: false, error: mapErrorToMessage(error) })));
             }
             else {
                 return rxjs_1.of({ success });

package/src/browser/schema.d.ts

@@ -27,6 +27,10 @@ export interface Schema {
      * Use a separate bundle containing code used across multiple bundles.
      */
     commonChunk?: boolean;
+    /**
+     * Define the crossorigin attribute setting of elements that provide CORS support.
+     */
+    crossOrigin?: CrossOrigin;
     /**
      * Delete the output path before building.
      */
@@ -277,6 +281,14 @@ export declare enum Type {
     Bundle = "bundle",
     Initial = "initial"
 }
+/**
+ * Define the crossorigin attribute setting of elements that provide CORS support.
+ */
+export declare enum CrossOrigin {
+    Anonymous = "anonymous",
+    None = "none",
+    UseCredentials = "use-credentials"
+}
 export interface FileReplacement {
     replace?: string;
     replaceWith?: string;
@@ -312,6 +324,10 @@ export interface ExtraEntryPointClass {
      * The bundle name for this extra entry point.
      */
     bundleName?: string;
+    /**
+     * If the bundle will be referenced in the HTML file.
+     */
+    inject?: boolean;
     /**
      * The file to include.
      */

package/src/browser/schema.js

@@ -14,6 +14,15 @@ var Type;
     Type["Bundle"] = "bundle";
     Type["Initial"] = "initial";
 })(Type = exports.Type || (exports.Type = {}));
+/**
+ * Define the crossorigin attribute setting of elements that provide CORS support.
+ */
+var CrossOrigin;
+(function (CrossOrigin) {
+    CrossOrigin["Anonymous"] = "anonymous";
+    CrossOrigin["None"] = "none";
+    CrossOrigin["UseCredentials"] = "use-credentials";
+})(CrossOrigin = exports.CrossOrigin || (exports.CrossOrigin = {}));
 /**
  * Define the output filename cache-busting hashing mode.
  */

package/src/browser/schema.json

@@ -319,6 +319,16 @@
     "webWorkerTsConfig": {
       "type": "string",
       "description": "TypeScript configuration for Web Worker modules."
+    },
+    "crossOrigin": {
+      "type": "string",
+      "description": "Define the crossorigin attribute setting of elements that provide CORS support.",
+      "default": "none",
+      "enum": [
+        "none",
+        "anonymous",
+        "use-credentials"
+      ]
     }
   },
   "additionalProperties": false,
@@ -418,7 +428,13 @@
             "lazy": {
               "type": "boolean",
               "description": "If the bundle will be lazy loaded.",
-              "default": false
+              "default": false,
+              "x-deprecated": "Use 'inject' option with 'false' value instead."
+            },
+            "inject": {
+              "type": "boolean",
+              "description": "If the bundle will be referenced in the HTML file.",
+              "default": true
             }
           },
           "additionalProperties": false,

package/src/dev-server/index.js

@@ -15,11 +15,13 @@ const fs_1 = require("fs");
 const path = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const ts = require("typescript");
 const url = require("url");
 const webpack = require("webpack");
 const index_html_webpack_plugin_1 = require("../angular-cli-files/plugins/index-html-webpack-plugin");
 const check_port_1 = require("../angular-cli-files/utilities/check-port");
 const package_chunk_sort_1 = require("../angular-cli-files/utilities/package-chunk-sort");
+const read_tsconfig_1 = require("../angular-cli-files/utilities/read-tsconfig");
 const browser_1 = require("../browser");
 const utils_1 = require("../utils");
 const version_1 = require("../utils/version");
@@ -53,8 +55,7 @@ function serveWebpackBrowser(options, context, transforms = {}) {
     const root = context.workspaceRoot;
     let first = true;
     const host = new node_1.NodeJsSyncHost();
-    const loggingFn = transforms.logging
-        || browser_1.createBrowserLoggingCallback(!!options.verbose, context.logger);
+    const loggingFn = transforms.logging || browser_1.createBrowserLoggingCallback(!!options.verbose, context.logger);
     async function setup() {
         // Get the browser configuration from the target name.
         const rawBrowserOptions = await context.getTargetOptions(browserTarget);
@@ -73,13 +74,19 @@ function serveWebpackBrowser(options, context, transforms = {}) {
         // No differential loading for dev-server, hence there is just one config
         let webpackConfig = webpackConfigResult.config[0];
         const port = await check_port_1.checkPort(options.port || 0, options.host || 'localhost', 4200);
-        const webpackDevServerConfig = webpackConfig.devServer = buildServerConfig(root, options, browserOptions, context.logger);
+        const webpackDevServerConfig = (webpackConfig.devServer = buildServerConfig(root, options, browserOptions, context.logger));
         if (transforms.webpackConfiguration) {
             webpackConfig = await transforms.webpackConfiguration(webpackConfig);
         }
-        return { browserOptions, webpackConfig, webpackDevServerConfig, port };
+        return {
+            browserOptions,
+            webpackConfig,
+            webpackDevServerConfig,
+            port,
+            workspace: webpackConfigResult.workspace,
+        };
     }
-    return rxjs_1.from(setup()).pipe(operators_1.switchMap(({ browserOptions, webpackConfig, webpackDevServerConfig, port }) => {
+    return rxjs_1.from(setup()).pipe(operators_1.switchMap(({ browserOptions, webpackConfig, webpackDevServerConfig, port, workspace }) => {
         options.port = port;
         // Resolve public host and client address.
         let clientAddress = url.parse(`${options.ssl ? 'https' : 'http'}://0.0.0.0:0`);
@@ -112,16 +119,32 @@ function serveWebpackBrowser(options, context, transforms = {}) {
             });
         }
         if (browserOptions.index) {
-            const { scripts = [], styles = [], index, baseHref } = browserOptions;
+            const { scripts = [], styles = [], index, baseHref, tsConfig } = browserOptions;
+            const projectName = context.target
+                ? context.target.project
+                : workspace.getDefaultProjectName();
+            if (!projectName) {
+                throw new Error('Must either have a target from the context or a default project.');
+            }
+            const projectRoot = core_1.resolve(workspace.root, core_1.normalize(workspace.getProject(projectName).root));
+            const { options: compilerOptions } = read_tsconfig_1.readTsconfig(tsConfig, context.workspaceRoot);
+            const target = compilerOptions.target || ts.ScriptTarget.ES5;
+            const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(core_1.getSystemPath(projectRoot), target);
+            const entrypoints = package_chunk_sort_1.generateEntryPoints({ scripts, styles });
+            const moduleEntrypoints = buildBrowserFeatures.isDifferentialLoadingNeeded()
+                ? package_chunk_sort_1.generateEntryPoints({ scripts: [], styles })
+                : [];
             webpackConfig.plugins.push(new index_html_webpack_plugin_1.IndexHtmlWebpackPlugin({
                 input: path.resolve(root, index),
                 output: path.basename(index),
                 baseHref,
-                entrypoints: package_chunk_sort_1.generateEntryPoints({ scripts, styles }),
+                moduleEntrypoints,
+                entrypoints,
                 deployUrl: browserOptions.deployUrl,
                 sri: browserOptions.subresourceIntegrity,
                 noModuleEntrypoints: ['polyfills-es5'],
                 postTransform: transforms.indexHtml,
+                crossOrigin: browserOptions.crossOrigin,
             }));
         }
         const normalizedOptimization = utils_1.normalizeOptimization(browserOptions.optimization);
@@ -196,17 +219,18 @@ function buildServerConfig(workspaceRoot, serverOptions, browserOptions, logger)
         host: serverOptions.host,
         port: serverOptions.port,
         headers: { 'Access-Control-Allow-Origin': '*' },
-        historyApiFallback: !!browserOptions.index && {
-            index: `${servePath}/${path.basename(browserOptions.index)}`,
-            disableDotRule: true,
-            htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-            rewrites: [
-                {
-                    from: new RegExp(`^(?!${servePath})/.*`),
-                    to: context => url.format(context.parsedUrl),
-                },
-            ],
-        },
+        historyApiFallback: !!browserOptions.index &&
+            {
+                index: `${servePath}/${path.basename(browserOptions.index)}`,
+                disableDotRule: true,
+                htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+                rewrites: [
+                    {
+                        from: new RegExp(`^(?!${servePath})/.*`),
+                        to: context => url.format(context.parsedUrl),
+                    },
+                ],
+            },
         stats: false,
         compress: styles || scripts,
         watchOptions: {
@@ -282,10 +306,12 @@ function _addLiveReload(options, browserOptions, webpackConfig, clientAddress, l
     }
     // If a custom path is provided the webpack dev server client drops the sockjs-node segment.
     // This adds it back so that behavior is consistent when using a custom URL path
+    let sockjsPath = '';
     if (clientAddress.pathname) {
         clientAddress.pathname = path.posix.join(clientAddress.pathname, 'sockjs-node');
+        sockjsPath = '&sockPath=' + clientAddress.pathname;
     }
-    const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}`];
+    const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}${sockjsPath}`];
     if (options.hmr) {
         const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
         logger.warn(core_1.tags.oneLine `NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.`);
@@ -375,9 +401,7 @@ function _findDefaultServePath(baseHref, deployUrl) {
     // normalize baseHref
     // for ng serve the starting base is always `/` so a relative
     // and root relative value are identical
-    const baseHrefParts = (baseHref || '')
-        .split('/')
-        .filter(part => part !== '');
+    const baseHrefParts = (baseHref || '').split('/').filter(part => part !== '');
     if (baseHref && !baseHref.endsWith('/')) {
         baseHrefParts.pop();
     }

package/src/karma/index.js

@@ -8,14 +8,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * found in the LICENSE file at https://angular.io/license
  */
 const architect_1 = require("@angular-devkit/architect");
+const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const webpack_configs_1 = require("../angular-cli-files/models/webpack-configs");
+const single_test_transform_1 = require("../angular-cli-files/plugins/single-test-transform");
+const find_tests_1 = require("../angular-cli-files/utilities/find-tests");
 const version_1 = require("../utils/version");
 const webpack_browser_config_1 = require("../utils/webpack-browser-config");
 async function initialize(options, context, webpackConfigurationTransformer) {
-    const { config } = await webpack_browser_config_1.generateBrowserWebpackConfigFromContext(
+    const { config, workspace } = await webpack_browser_config_1.generateBrowserWebpackConfigFromContext(
     // only two properties are missing:
     // * `outputPath` which is fixed for tests
     // * `budgets` which might be incorrect due to extra dev libs
@@ -29,6 +32,7 @@ async function initialize(options, context, webpackConfigurationTransformer) {
     // tslint:disable-next-line:no-implicit-dependencies
     const karma = await Promise.resolve().then(() => require('karma'));
     return [
+        workspace,
         karma,
         webpackConfigurationTransformer ? await webpackConfigurationTransformer(config[0]) : config[0],
     ];
@@ -36,7 +40,7 @@ async function initialize(options, context, webpackConfigurationTransformer) {
 function execute(options, context, transforms = {}) {
     // Check Angular version.
     version_1.assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
-    return rxjs_1.from(initialize(options, context, transforms.webpackConfiguration)).pipe(operators_1.switchMap(([karma, webpackConfig]) => new rxjs_1.Observable(subscriber => {
+    return rxjs_1.from(initialize(options, context, transforms.webpackConfiguration)).pipe(operators_1.switchMap(([workspace, karma, webpackConfig]) => new rxjs_1.Observable(subscriber => {
         const karmaOptions = {};
         if (options.watch !== undefined) {
             karmaOptions.singleRun = !options.watch;
@@ -54,6 +58,30 @@ function execute(options, context, transforms = {}) {
                 karmaOptions.reporters = reporters;
             }
         }
+        // prepend special webpack loader that will transform test.ts
+        if (webpackConfig &&
+            webpackConfig.module &&
+            options.include &&
+            options.include.length > 0) {
+            const mainFilePath = core_1.getSystemPath(core_1.join(workspace.root, options.main));
+            const files = find_tests_1.findTests(options.include, path_1.dirname(mainFilePath), core_1.getSystemPath(workspace.root));
+            // early exit, no reason to start karma
+            if (!files.length) {
+                subscriber.error(`Specified patterns: "${options.include.join(', ')}" did not match any spec files`);
+                return;
+            }
+            webpackConfig.module.rules.unshift({
+                test: path => path === mainFilePath,
+                use: {
+                    // cannot be a simple path as it differs between environments
+                    loader: single_test_transform_1.SingleTestTransformLoader,
+                    options: {
+                        files,
+                        logger: context.logger,
+                    },
+                },
+            });
+        }
         // Assign additional karmaConfig options to the local ngapp config
         karmaOptions.configFile = path_1.resolve(context.workspaceRoot, options.karmaConfig);
         karmaOptions.buildWebpack = {

package/src/karma/schema.d.ts

@@ -31,6 +31,15 @@ export interface Schema {
      * Replace files with other files in the build.
      */
     fileReplacements?: FileReplacement[];
+    /**
+     * Globs of files to include, relative to workspace or project root.
+     * There are 2 special cases:
+     * - when a path to directory is provided, all spec files ending ".spec.@(ts|tsx)" will be
+     * included
+     * - when a path to a file is provided, and a matching spec file exists it will be included
+     * instead
+     */
+    include?: string[];
     /**
      * The name of the Karma configuration file.
      */
@@ -124,6 +133,10 @@ export interface ExtraEntryPointClass {
      * The bundle name for this extra entry point.
      */
     bundleName?: string;
+    /**
+     * If the bundle will be referenced in the HTML file.
+     */
+    inject?: boolean;
     /**
      * The file to include.
      */

package/src/karma/schema.json

@@ -63,6 +63,13 @@
       "type": "string",
       "description": "Defines the build environment."
     },
+    "include": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "Globs of files to include, relative to workspace or project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead"
+    },
     "sourceMap": {
       "description": "Output sourcemaps.",
       "default": true,
@@ -251,7 +258,13 @@
             "lazy": {
               "type": "boolean",
               "description": "If the bundle will be lazy loaded.",
-              "default": false
+              "default": false,
+              "x-deprecated": "Use 'inject' option with 'false' value instead."
+            },
+            "inject": {
+              "type": "boolean",
+              "description": "If the bundle will be referenced in the HTML file.",
+              "default": true
             }
           },
           "additionalProperties": false,

package/src/utils/webpack-browser-config.js

@@ -27,7 +27,7 @@ async function generateWebpackConfig(context, workspaceRoot, projectRoot, source
         && buildBrowserFeatures.isDifferentialLoadingNeeded();
     const scriptTargets = [scriptTarget];
     if (differentialLoading) {
-        scriptTargets.unshift(ts.ScriptTarget.ES5);
+        scriptTargets.push(ts.ScriptTarget.ES5);
     }
     // For differential loading, we can have several targets
     return scriptTargets.map(scriptTarget => {

package/test/utils.d.ts

@@ -8,6 +8,7 @@
 import { Architect, BuilderOutput, ScheduleOptions, Target } from '@angular-devkit/architect';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import { Path, experimental, json, virtualFs } from '@angular-devkit/core';
+export declare const ivyEnabled: boolean;
 export declare const workspaceRoot: Path;
 export declare const host: TestProjectHost;
 export declare const outputPath: Path;
@@ -43,7 +44,7 @@ export declare function createArchitect(workspaceRoot: Path): Promise<{
 export declare function browserBuild(architect: Architect, host: virtualFs.Host, target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<{
     output: BuilderOutput;
     files: {
-        [file: string]: string;
+        [file: string]: Promise<string>;
     };
 }>;
 export declare const lazyModuleFiles: {