@angular-devkit/build-angular 0.1100.3 → 0.1100.7

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1100.3",
+  "version": "0.1100.7",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.1100.3",
-    "@angular-devkit/build-optimizer": "0.1100.3",
-    "@angular-devkit/build-webpack": "0.1100.3",
-    "@angular-devkit/core": "11.0.3",
+    "@angular-devkit/architect": "0.1100.7",
+    "@angular-devkit/build-optimizer": "0.1100.7",
+    "@angular-devkit/build-webpack": "0.1100.7",
+    "@angular-devkit/core": "11.0.7",
     "@babel/core": "7.12.3",
     "@babel/generator": "7.12.1",
     "@babel/plugin-transform-runtime": "7.12.1",
@@ -18,7 +18,7 @@
     "@babel/runtime": "7.12.1",
     "@babel/template": "7.10.4",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "11.0.3",
+    "@ngtools/webpack": "11.0.7",
     "ansi-colors": "4.1.1",
     "autoprefixer": "9.8.6",
     "babel-loader": "8.1.0",
@@ -64,7 +64,7 @@
     "speed-measure-webpack-plugin": "1.3.3",
     "style-loader": "2.0.0",
     "stylus": "0.54.8",
-    "stylus-loader": "4.1.1",
+    "stylus-loader": "4.3.1",
     "terser": "5.3.7",
     "terser-webpack-plugin": "4.2.3",
     "text-table": "0.2.0",

package/src/browser/schema.d.ts

@@ -113,7 +113,7 @@ export interface Schema {
     ngswConfigPath?: string;
     /**
      * Enables optimization of the build output. Including minification of scripts and styles,
-     * tree-shaking, dead-code eliminiation and fonts inlining. For more information, see
+     * tree-shaking, dead-code elimination and fonts inlining. For more information, see
      * https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.
      */
     optimization?: OptimizationUnion;
@@ -161,7 +161,7 @@ export interface Schema {
      */
     showCircularDependencies?: boolean;
     /**
-     * Output sourcemaps.
+     * Output source maps.
      */
     sourceMap?: SourceMapUnion;
     /**
@@ -314,7 +314,7 @@ export interface IndexObject {
 export declare type Localize = string[] | boolean;
 /**
  * Enables optimization of the build output. Including minification of scripts and styles,
- * tree-shaking, dead-code eliminiation and fonts inlining. For more information, see
+ * tree-shaking, dead-code elimination and fonts inlining. For more information, see
  * https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.
  */
 export declare type OptimizationUnion = boolean | OptimizationClass;
@@ -338,8 +338,8 @@ export interface OptimizationClass {
 export declare type FontsUnion = boolean | FontsClass;
 export interface FontsClass {
     /**
-     * Reduce render blocking requests by inlining external fonts in the application's HTML
-     * index file. This requires internet access.
+     * Reduce render blocking requests by inlining external Google fonts and icons CSS
+     * definitions in the application's HTML index file. This requires internet access.
      */
     inline?: boolean;
 }
@@ -368,24 +368,24 @@ export interface ExtraEntryPointClass {
     input: string;
 }
 /**
- * Output sourcemaps.
+ * Output source maps.
  */
 export declare type SourceMapUnion = boolean | SourceMapClass;
 export interface SourceMapClass {
     /**
-     * Output sourcemaps used for error reporting tools.
+     * Output source maps used for error reporting tools.
      */
     hidden?: boolean;
     /**
-     * Output sourcemaps for all scripts.
+     * Output source maps for all scripts.
      */
     scripts?: boolean;
     /**
-     * Output sourcemaps for all styles.
+     * Output source maps for all styles.
      */
     styles?: boolean;
     /**
-     * Resolve vendor packages sourcemaps.
+     * Resolve vendor packages source maps.
      */
     vendor?: boolean;
 }

package/src/browser/schema.json

@@ -57,7 +57,7 @@
       "additionalProperties": false
     },
     "optimization": {
-      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code eliminiation and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.",
       "x-user-analytics": 16,
       "default": false,
       "oneOf": [
@@ -83,7 +83,7 @@
                   "properties": {
                     "inline": {
                       "type": "boolean",
-                      "description": "Reduce render blocking requests by inlining external fonts in the application's HTML index file. This requires internet access.",
+                      "description": "Reduce render blocking requests by inlining external Google fonts and icons CSS definitions in the application's HTML index file. This requires internet access.",
                       "default": true
                     }
                   },
@@ -126,7 +126,7 @@
       "default": false
     },
     "sourceMap": {
-      "description": "Output sourcemaps.",
+      "description": "Output source maps.",
       "default": true,
       "oneOf": [
         {
@@ -134,22 +134,22 @@
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "hidden": {
               "type": "boolean",
-              "description": "Output sourcemaps used for error reporting tools.",
+              "description": "Output source maps used for error reporting tools.",
               "default": false
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },

package/src/dev-server/schema.d.ts

@@ -65,7 +65,7 @@ export interface Schema {
     open?: boolean;
     /**
      * Enables optimization of the build output. Including minification of scripts and styles,
-     * tree-shaking, dead-code eliminiation, tree-shaking and fonts inlining. For more
+     * tree-shaking, dead-code elimination, tree-shaking and fonts inlining. For more
      * information, see
      * https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.
      * @deprecated Use the "optimization" option in the browser builder instead.
@@ -104,7 +104,7 @@ export interface Schema {
      */
     servePathDefaultWarning?: boolean;
     /**
-     * Output sourcemaps.
+     * Output source maps.
      * @deprecated Use the "sourceMap" option in the browser builder instead.
      */
     sourceMap?: SourceMapUnion;
@@ -136,7 +136,7 @@ export interface Schema {
 }
 /**
  * Enables optimization of the build output. Including minification of scripts and styles,
- * tree-shaking, dead-code eliminiation, tree-shaking and fonts inlining. For more
+ * tree-shaking, dead-code elimination, tree-shaking and fonts inlining. For more
  * information, see
  * https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.
  * @deprecated Use the "optimization" option in the browser builder instead.
@@ -153,25 +153,25 @@ export interface OptimizationClass {
     styles?: boolean;
 }
 /**
- * Output sourcemaps.
+ * Output source maps.
  * @deprecated Use the "sourceMap" option in the browser builder instead.
  */
 export declare type SourceMapUnion = boolean | SourceMapClass;
 export interface SourceMapClass {
     /**
-     * Output sourcemaps used for error reporting tools.
+     * Output source maps used for error reporting tools.
      */
     hidden?: boolean;
     /**
-     * Output sourcemaps for all scripts.
+     * Output source maps for all scripts.
      */
     scripts?: boolean;
     /**
-     * Output sourcemaps for all styles.
+     * Output source maps for all styles.
      */
     styles?: boolean;
     /**
-     * Resolve vendor packages sourcemaps.
+     * Resolve vendor packages source maps.
      */
     vendor?: boolean;
 }

package/src/dev-server/schema.json

@@ -105,7 +105,7 @@
       "x-deprecated": "No longer has an effect."
     },
     "optimization": {
-      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code eliminiation, tree-shaking and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, tree-shaking and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.",
       "x-user-analytics": 16,
       "oneOf": [
         {
@@ -137,29 +137,29 @@
       "x-deprecated": "Use the \"aot\" option in the browser builder instead."
     },
     "sourceMap": {
-      "description": "Output sourcemaps.",
+      "description": "Output source maps.",
       "oneOf": [
         {
           "type": "object",
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "hidden": {
               "type": "boolean",
-              "description": "Output sourcemaps used for error reporting tools.",
+              "description": "Output source maps used for error reporting tools.",
               "default": false
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },

package/src/karma/schema.d.ts

@@ -65,7 +65,7 @@ export interface Schema {
      */
     scripts?: ExtraEntryPoint[];
     /**
-     * Output sourcemaps.
+     * Output source maps.
      */
     sourceMap?: SourceMapUnion;
     /**
@@ -130,20 +130,20 @@ export interface ExtraEntryPointClass {
     input: string;
 }
 /**
- * Output sourcemaps.
+ * Output source maps.
  */
 export declare type SourceMapUnion = boolean | SourceMapClass;
 export interface SourceMapClass {
     /**
-     * Output sourcemaps for all scripts.
+     * Output source maps for all scripts.
      */
     scripts?: boolean;
     /**
-     * Output sourcemaps for all styles.
+     * Output source maps for all styles.
      */
     styles?: boolean;
     /**
-     * Resolve vendor packages sourcemaps.
+     * Resolve vendor packages source maps.
      */
     vendor?: boolean;
 }

package/src/karma/schema.json

@@ -67,7 +67,7 @@
       "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.",
+      "description": "Output source maps.",
       "default": true,
       "oneOf": [
         {
@@ -75,17 +75,17 @@
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },

package/src/server/index.js

@@ -44,7 +44,7 @@ function execute(options, context, transforms = {}) {
             context.logger.warn(core_1.tags.stripIndent `
       Warning: Turning off 'bundleDependencies' with Ivy may result in undefined behaviour
       unless 'node_modules' are transformed using the standalone Angular compatibility compiler (NGCC).
-      See: http://v9.angular.io/guide/ivy#ivy-and-universal-app-shell
+      See: https://angular.io/guide/ivy#ivy-and-universal-app-shell
     `);
         }
     }

package/src/server/schema.d.ts

@@ -69,7 +69,7 @@ export interface Schema {
     namedChunks?: boolean;
     /**
      * Enables optimization of the build output. Including minification of scripts and styles,
-     * tree-shaking and dead-code eliminiation. For more information, see
+     * tree-shaking and dead-code elimination. For more information, see
      * https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.
      */
     optimization?: OptimizationUnion;
@@ -103,7 +103,7 @@ export interface Schema {
      */
     showCircularDependencies?: boolean;
     /**
-     * Output sourcemaps.
+     * Output source maps.
      */
     sourceMap?: SourceMapUnion;
     /**
@@ -157,7 +157,7 @@ export declare enum I18NMissingTranslation {
 export declare type Localize = string[] | boolean;
 /**
  * Enables optimization of the build output. Including minification of scripts and styles,
- * tree-shaking and dead-code eliminiation. For more information, see
+ * tree-shaking and dead-code elimination. For more information, see
  * https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.
  */
 export declare type OptimizationUnion = boolean | OptimizationClass;
@@ -181,24 +181,24 @@ export declare enum OutputHashing {
     None = "none"
 }
 /**
- * Output sourcemaps.
+ * Output source maps.
  */
 export declare type SourceMapUnion = boolean | SourceMapClass;
 export interface SourceMapClass {
     /**
-     * Output sourcemaps used for error reporting tools.
+     * Output source maps used for error reporting tools.
      */
     hidden?: boolean;
     /**
-     * Output sourcemaps for all scripts.
+     * Output source maps for all scripts.
      */
     scripts?: boolean;
     /**
-     * Output sourcemaps for all styles.
+     * Output source maps for all styles.
      */
     styles?: boolean;
     /**
-     * Resolve vendor packages sourcemaps.
+     * Resolve vendor packages source maps.
      */
     vendor?: boolean;
 }

package/src/server/schema.json

@@ -29,7 +29,7 @@
       "additionalProperties": false
     },
     "optimization": {
-      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code eliminiation. For more information, see https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code elimination. For more information, see https://angular.io/guide/workspace-config#optimization-and-source-map-configuration.",
       "x-user-analytics": 16,
       "default": false,
       "oneOf": [
@@ -72,7 +72,7 @@
       "default": ""
     },
     "sourceMap": {
-      "description": "Output sourcemaps.",
+      "description": "Output source maps.",
       "default": true,
       "oneOf": [
         {
@@ -80,22 +80,22 @@
           "properties": {
             "scripts": {
               "type": "boolean",
-              "description": "Output sourcemaps for all scripts.",
+              "description": "Output source maps for all scripts.",
               "default": true
             },
             "styles": {
               "type": "boolean",
-              "description": "Output sourcemaps for all styles.",
+              "description": "Output source maps for all styles.",
               "default": true
             },
             "hidden": {
               "type": "boolean",
-              "description": "Output sourcemaps used for error reporting tools.",
+              "description": "Output source maps used for error reporting tools.",
               "default": false
             },
             "vendor": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "Resolve vendor packages source maps.",
               "default": false
             }
           },

package/src/utils/spinner.js

@@ -14,7 +14,13 @@ class Spinner {
     constructor(text) {
         /** When false, only fail messages will be displayed. */
         this.enabled = true;
-        this.spinner = ora(text);
+        this.spinner = ora({
+            text,
+            // The below 2 options are needed because otherwise CTRL+C will be delayed
+            // when the underlying process is sync.
+            hideCursor: false,
+            discardStdin: false,
+        });
     }
     set text(text) {
         this.spinner.text = text;

package/src/webpack/configs/common.js

@@ -333,6 +333,7 @@ function getCommonConfig(wco) {
                         // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
                         passes: buildOptions.buildOptimizer ? 3 : 1,
                         global_defs: angularGlobalDefinitions,
+                        pure_funcs: ['forwardRef'],
                     }),
             // We also want to avoid mangling on server.
             // Name mangling is handled within the browser builder
@@ -432,7 +433,7 @@ function getCommonConfig(wco) {
                 },
                 {
                     test: /\.m?js$/,
-                    exclude: [/[\/\\](?:core-js|\@babel|tslib)[\/\\]/, /(ngfactory|ngstyle)\.js$/],
+                    exclude: [/[\/\\](?:core-js|\@babel|tslib|web-animations-js)[\/\\]/, /(ngfactory|ngstyle)\.js$/],
                     use: [
                         ...(wco.supportES2015
                             ? []

package/src/webpack/configs/styles.js

@@ -40,6 +40,9 @@ function getStylesConfig(wco) {
                 }
                 catch (_a) { }
             }
+            if (!buildOptions.preserveSymlinks) {
+                resolvedPath = fs.realpathSync(resolvedPath);
+            }
             // Add style entry points.
             if (entryPoints[style.bundleName]) {
                 entryPoints[style.bundleName].push(resolvedPath);
@@ -118,17 +121,10 @@ function getStylesConfig(wco) {
         {
             test: /\.styl$/,
             use: [
-                {
-                    loader: require.resolve('resolve-url-loader'),
-                    options: {
-                        sourceMap: cssSourceMap,
-                    },
-                },
                 {
                     loader: require.resolve('stylus-loader'),
                     options: {
                         sourceMap: cssSourceMap,
-                        webpackImporter: false,
                         stylusOptions: {
                             compress: false,
                             sourceMap: { comment: false },

package/src/webpack/plugins/karma.d.ts

@@ -1,8 +1 @@
-/**
- * @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
- */
 export {};

package/src/webpack/plugins/karma.js

@@ -1,13 +1,4 @@
 "use strict";
-/**
- * @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
- */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const glob = require("glob");
@@ -25,6 +16,7 @@ const index_1 = require("../../utils/index");
  * require('source-map-support')
  * require('karma-source-map-support')
  */
+const KARMA_APPLICATION_PATH = '_karma_webpack_';
 let blocked = [];
 let isBlocked = false;
 let webpackMiddleware;
@@ -79,8 +71,8 @@ const init = (config, emitter, customFileHandlers) => {
         config.plugins = config.plugins || [];
         config.reporters = config.reporters || [];
         const { plugins, reporters } = config;
-        const hasCoveragePlugin = plugins.some((p) => 'reporter:coverage' in p);
-        const hasIstanbulPlugin = plugins.some((p) => 'reporter:coverage-istanbul' in p);
+        const hasCoveragePlugin = plugins.some(isPlugin('karma-coverage', 'reporter:coverage'));
+        const hasIstanbulPlugin = plugins.some(isPlugin('karma-coverage-istanbul-reporter', 'reporter:coverage-istanbul'));
         const hasCoverageReporter = reporters.includes('coverage');
         const hasIstanbulReporter = reporters.includes('coverage-istanbul');
         if (hasCoveragePlugin && !hasCoverageReporter) {
@@ -106,7 +98,7 @@ const init = (config, emitter, customFileHandlers) => {
         // Hide webpack output because its noisy.
         logLevel: 'error',
         stats: false,
-        publicPath: '/_karma_webpack_/',
+        publicPath: `/${KARMA_APPLICATION_PATH}/`,
     };
     const compilationErrorCb = (error, errors) => {
         // Notify potential listeners of the compile error
@@ -143,8 +135,8 @@ 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.path = `/${KARMA_APPLICATION_PATH}/`;
+    webpackConfig.output.publicPath = `/${KARMA_APPLICATION_PATH}/`;
     let compiler;
     try {
         compiler = webpack(webpackConfig);
@@ -191,18 +183,18 @@ const init = (config, emitter, customFileHandlers) => {
     webpackMiddleware = new webpackDevMiddleware(compiler, webpackMiddlewareConfig);
     // Forward requests to webpack server.
     customFileHandlers.push({
-        urlRegex: /^\/_karma_webpack_\/.*/,
+        urlRegex: new RegExp(`\\/${KARMA_APPLICATION_PATH}\\/.*`),
         handler: function handler(req, res) {
             webpackMiddleware(req, res, function () {
                 // Ensure script and style bundles are served.
                 // They are mentioned in the custom karma context page and we don't want them to 404.
                 const alwaysServe = [
-                    '/_karma_webpack_/runtime.js',
-                    '/_karma_webpack_/polyfills.js',
-                    '/_karma_webpack_/polyfills-es5.js',
-                    '/_karma_webpack_/scripts.js',
-                    '/_karma_webpack_/styles.js',
-                    '/_karma_webpack_/vendor.js',
+                    `/${KARMA_APPLICATION_PATH}/runtime.js`,
+                    `/${KARMA_APPLICATION_PATH}/polyfills.js`,
+                    `/${KARMA_APPLICATION_PATH}/polyfills-es5.js`,
+                    `/${KARMA_APPLICATION_PATH}/scripts.js`,
+                    `/${KARMA_APPLICATION_PATH}/styles.js`,
+                    `/${KARMA_APPLICATION_PATH}/vendor.js`,
                 ];
                 if (alwaysServe.indexOf(req.url) != -1) {
                     res.statusCode = 200;
@@ -281,17 +273,31 @@ const sourceMapReporter = function (baseReporterDecorator, config) {
 sourceMapReporter.$inject = ['baseReporterDecorator', 'config'];
 // When a request is not found in the karma server, try looking for it from the webpack server root.
 function fallbackMiddleware() {
-    return function (req, res, next) {
+    return function (request, response, next) {
         if (webpackMiddleware) {
-            const webpackUrl = '/_karma_webpack_' + req.url;
-            const webpackReq = { ...req, url: webpackUrl };
-            webpackMiddleware(webpackReq, res, next);
+            request.url = '/' + KARMA_APPLICATION_PATH + request.url;
+            webpackMiddleware(request, response, next);
         }
         else {
             next();
         }
     };
 }
+/**
+ * Returns a function that returns true if the plugin identifier matches the
+ * `moduleId` or `pluginName`. A plugin identifier can be either a string or
+ * an object according to https://karma-runner.github.io/5.2/config/plugins.html
+ * @param moduleId name of the node module (e.g. karma-coverage)
+ * @param pluginName name of the karma plugin (e.g. reporter:coverage)
+ */
+function isPlugin(moduleId, pluginName) {
+    return (plugin) => {
+        if (typeof plugin === 'string') {
+            return plugin === moduleId;
+        }
+        return pluginName in plugin;
+    };
+}
 module.exports = {
     'framework:@angular-devkit/build-angular': ['factory', init],
     'reporter:@angular-devkit/build-angular--sourcemap-reporter': ['type', sourceMapReporter],

package/src/webpack/plugins/optimize-css-webpack-plugin.js

@@ -95,7 +95,7 @@ class OptimizeCssWebpackPlugin {
                     // tslint:disable-next-line: no-any
                     cssNano.process(content, postCssOptions, cssNanoOptions)
                         .then(resolve)
-                        .catch(reject);
+                        .catch((err) => reject(new Error(`${file} ${err.message}`)));
                 });
                 for (const { text } of output.warnings()) {
                     webpack_diagnostics_1.addWarning(compilation, text);