@angular-devkit/build-angular 0.900.3 → 0.900.7

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.900.3",
+  "version": "0.900.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.900.3",
-    "@angular-devkit/build-optimizer": "0.900.3",
-    "@angular-devkit/build-webpack": "0.900.3",
-    "@angular-devkit/core": "9.0.3",
+    "@angular-devkit/architect": "0.900.7",
+    "@angular-devkit/build-optimizer": "0.900.7",
+    "@angular-devkit/build-webpack": "0.900.7",
+    "@angular-devkit/core": "9.0.7",
     "@babel/core": "7.7.7",
     "@babel/generator": "7.7.7",
     "@babel/preset-env": "7.7.7",
-    "@ngtools/webpack": "9.0.3",
+    "@ngtools/webpack": "9.0.7",
     "ajv": "6.10.2",
     "autoprefixer": "9.7.1",
     "babel-loader": "8.0.6",
-    "browserslist": "4.8.3",
+    "browserslist": "^4.9.1",
     "cacache": "13.0.1",
-    "caniuse-lite": "1.0.30001020",
+    "caniuse-lite": "^1.0.30001032",
     "cssnano": "4.1.10",
     "circular-dependency-plugin": "5.2.0",
     "coverage-istanbul-loader": "2.0.3",
     "copy-webpack-plugin": "5.1.1",
-    "core-js": "3.6.0",
+    "core-js": "3.6.4",
     "file-loader": "4.2.0",
     "find-cache-dir": "3.0.0",
     "glob": "7.1.5",

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

@@ -11,7 +11,6 @@ const build_optimizer_1 = require("@angular-devkit/build-optimizer");
 const core_1 = require("@angular-devkit/core");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const fs_1 = require("fs");
-const os_1 = require("os");
 const path = require("path");
 const typescript_1 = require("typescript");
 const webpack_1 = require("webpack");
@@ -103,10 +102,11 @@ function getCommonConfig(wco) {
                                 // The webpack.Compilation assetPath hook is a noop in 4.x so the template must be used
                                 // tslint:disable-next-line: no-any
                                 compilation.mainTemplate.hooks.assetPath.tap('build-angular', (filename, data) => {
-                                    const isMap = filename && filename.endsWith('.map');
+                                    const assetName = typeof filename === 'function' ? filename(data) : filename;
+                                    const isMap = assetName && assetName.endsWith('.map');
                                     return data.chunk && data.chunk.name === 'polyfills-es5'
                                         ? `polyfills-es5${hashFormat.chunk}.js${isMap ? '.map' : ''}`
-                                        : filename;
+                                        : assetName;
                                 });
                             });
                         },
@@ -331,14 +331,9 @@ function getCommonConfig(wco) {
             // Name mangling is handled within the browser builder
             mangle: environment_options_1.allowMangle && buildOptions.platform !== 'server' && !differentialLoadingMode,
         };
-        // Use up to 7 CPUs for Terser workers, but no more.
-        // Some environments, like CircleCI, report a large number of CPUs but trying to use them
-        // Will cause `Error: Call retries were exceeded` errors.
-        // https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
-        const maxCpus = Math.min(os_1.cpus().length, 7);
         extraMinimizers.push(new TerserPlugin({
             sourceMap: scriptsSourceMap,
-            parallel: maxCpus,
+            parallel: utils_1.maxWorkers,
             cache: !environment_options_1.cachingDisabled && cache_path_1.findCachePath('terser-webpack'),
             extractComments: false,
             chunkFilter: (chunk) => !globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
@@ -348,7 +343,7 @@ function getCommonConfig(wco) {
         // They are shared between ES2015 & ES5 outputs so must support ES5.
         new TerserPlugin({
             sourceMap: scriptsSourceMap,
-            parallel: maxCpus,
+            parallel: utils_1.maxWorkers,
             cache: !environment_options_1.cachingDisabled && cache_path_1.findCachePath('terser-webpack'),
             extractComments: false,
             chunkFilter: (chunk) => globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
@@ -423,14 +418,6 @@ function getCommonConfig(wco) {
                     test: /[\/\\]@angular[\/\\]core[\/\\].+\.js$/,
                     parser: { system: true },
                 },
-                {
-                    test: /[\/\\]hot[\/\\]emitter\.js$/,
-                    parser: { node: { events: true } },
-                },
-                {
-                    test: /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl\.js$/,
-                    parser: { node: { querystring: true } },
-                },
                 {
                     test: /\.js$/,
                     // Factory files are processed by BO in the rules added in typescript.ts.

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

@@ -111,6 +111,11 @@ function getStylesConfig(wco) {
                             // bootstrap-sass requires a minimum precision of 8
                             precision: 8,
                             includePaths,
+                            // Use expanded as otherwise sass will remove comments that are needed for autoprefixer
+                            // Ex: /* autoprefixer grid: autoplace */
+                            // tslint:disable-next-line: max-line-length
+                            // See: https://github.com/webpack-contrib/sass-loader/blob/45ad0be17264ceada5f0b4fb87e9357abe85c4ff/src/getSassOptions.js#L68-L70
+                            outputStyle: 'expanded',
                         },
                     },
                 },

package/src/angular-cli-files/plugins/any-component-style-budget-checker.js

@@ -7,6 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
 const schema_1 = require("../../../src/browser/schema");
 const bundle_calculator_1 = require("../utilities/bundle-calculator");
 const PLUGIN_NAME = 'AnyComponentStyleBudgetChecker';
@@ -27,8 +28,15 @@ class AnyComponentStyleBudgetChecker {
                 if (!parentCompilation) {
                     return;
                 }
+                const cssExtensions = [
+                    '.css',
+                    '.scss',
+                    '.less',
+                    '.styl',
+                    '.sass',
+                ];
                 const componentStyles = Object.keys(compilation.assets)
-                    .filter((name) => name.endsWith('.css'))
+                    .filter((name) => cssExtensions.includes(path.extname(name)))
                     .map((name) => ({
                     size: compilation.assets[name].size(),
                     label: name,

package/src/angular-cli-files/utilities/bundle-calculator.js

@@ -120,16 +120,15 @@ class Calculator {
         else {
             // No differential builds, get the chunk size by summing its assets.
             return chunk.files
-                .filter((file) => !file.endsWith('.map'))
-                .map((file) => {
+                .filter(file => !file.endsWith('.map'))
+                .map(file => {
                 const asset = this.assets.find((asset) => asset.name === file);
                 if (!asset) {
                     throw new Error(`Could not find asset for file: ${file}`);
                 }
-                return asset;
+                return asset.size;
             })
-                .map((asset) => asset.size)
-                .reduce((l, r) => l + r);
+                .reduce((l, r) => l + r, 0);
         }
     }
 }
@@ -147,8 +146,8 @@ class BundleCalculator extends Calculator {
         const buildSizes = Object.values(DifferentialBuildType).map((buildType) => {
             const size = this.chunks
                 .filter(chunk => chunk.names.indexOf(budgetName) !== -1)
-                .map((chunk) => this.calculateChunkSize(chunk, buildType))
-                .reduce((l, r) => l + r);
+                .map(chunk => this.calculateChunkSize(chunk, buildType))
+                .reduce((l, r) => l + r, 0);
             return { size, label: `${this.budget.name}-${buildType}` };
         });
         // If this bundle was not actually generated by a differential build, then
@@ -171,8 +170,8 @@ class InitialCalculator extends Calculator {
                 label: `initial-${buildType}`,
                 size: this.chunks
                     .filter(chunk => chunk.initial)
-                    .map((chunk) => this.calculateChunkSize(chunk, buildType))
-                    .reduce((l, r) => l + r),
+                    .map(chunk => this.calculateChunkSize(chunk, buildType))
+                    .reduce((l, r) => l + r, 0),
             };
         });
         // If this bundle was not actually generated by a differential build, then
@@ -191,7 +190,7 @@ class InitialCalculator extends Calculator {
 class AllScriptCalculator extends Calculator {
     calculate() {
         const size = this.assets
-            .filter((asset) => asset.name.endsWith('.js'))
+            .filter(asset => asset.name.endsWith('.js'))
             .map(asset => asset.size)
             .reduce((total, size) => total + size, 0);
         return [{ size, label: 'total scripts' }];

package/src/browser/index.js

@@ -136,6 +136,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
         }).pipe(
         // tslint:disable-next-line: no-big-function
         operators_1.concatMap(async (buildEvent) => {
+            var _a, _b;
             const { webpackStats: webpackRawStats, success, emittedFiles = [] } = buildEvent;
             if (!webpackRawStats) {
                 throw new Error('Webpack stats build result is required.');
@@ -245,7 +246,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                                     fs.unlinkSync(filename + '.map');
                                 }
                             }
-                            catch (_a) { }
+                            catch (_c) { }
                         }
                         if (es5Polyfills) {
                             fs.unlinkSync(filename);
@@ -467,9 +468,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     for (const [locale, outputPath] of outputPaths.entries()) {
                         let localeBaseHref;
                         if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-                            localeBaseHref = path.posix.join(options.baseHref || '', i18n.locales[locale].baseHref === undefined
-                                ? `/${locale}/`
-                                : i18n.locales[locale].baseHref);
+                            localeBaseHref = utils_1.urlJoin(options.baseHref || '', (_a = i18n.locales[locale].baseHref, (_a !== null && _a !== void 0 ? _a : `/${locale}/`)));
                         }
                         try {
                             await generateIndex(outputPath, options, root, files, noModuleFiles, moduleFiles, transforms.indexHtml, 
@@ -485,9 +484,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     for (const [locale, outputPath] of outputPaths.entries()) {
                         let localeBaseHref;
                         if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-                            localeBaseHref = path.posix.join(options.baseHref || '', i18n.locales[locale].baseHref === undefined
-                                ? `/${locale}/`
-                                : i18n.locales[locale].baseHref);
+                            localeBaseHref = utils_1.urlJoin(options.baseHref || '', (_b = i18n.locales[locale].baseHref, (_b !== null && _b !== void 0 ? _b : `/${locale}/`)));
                         }
                         try {
                             await service_worker_1.augmentAppWithServiceWorker(host, root, core_1.normalize(projectRoot), core_1.normalize(outputPath), localeBaseHref || options.baseHref || '/', options.ngswConfigPath);

package/src/browser/schema.json

@@ -211,7 +211,7 @@
           "minItems": 1,
           "items": {
             "type": "string",
-            "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?(-x(-[a-zA-Z0-9]{1,8})+)?$"
           }
         }
       ]

package/src/dev-server/index.js

@@ -412,19 +412,31 @@ function _addLiveReload(options, browserOptions, webpackConfig, clientAddress, l
     if (webpackConfig.plugins === undefined) {
         webpackConfig.plugins = [];
     }
-    // Enable the internal node plugins but no individual shims
-    // This is needed to allow module specific rules to include node shims
+    // Workaround node shim hoisting issues with live reload client
     // Only needed in dev server mode to support live reload capabilities in all package managers
-    if (webpackConfig.node === false) {
-        webpackConfig.node = {
-            global: false,
-            process: false,
-            __filename: false,
-            __dirname: false,
-            Buffer: false,
-            setImmediate: false,
-        };
-    }
+    const webpackPath = path.dirname(require.resolve('webpack/package.json'));
+    const nodeLibsBrowserPath = require.resolve('node-libs-browser', { paths: [webpackPath] });
+    const nodeLibsBrowser = require(nodeLibsBrowserPath);
+    webpackConfig.plugins.push(new webpack.NormalModuleReplacementPlugin(/^events|url|querystring$/, (resource) => {
+        if (!resource.issuer) {
+            return;
+        }
+        if (/[\/\\]hot[\/\\]emitter\.js$/.test(resource.issuer)) {
+            if (resource.request === 'events') {
+                resource.request = nodeLibsBrowser.events;
+            }
+        }
+        else if (/[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl\.js$/.test(resource.issuer)) {
+            switch (resource.request) {
+                case 'url':
+                    resource.request = nodeLibsBrowser.url;
+                    break;
+                case 'querystring':
+                    resource.request = nodeLibsBrowser.querystring;
+                    break;
+            }
+        }
+    }));
     // This allows for live reload of page when changes are made to repo.
     // https://webpack.js.org/configuration/dev-server/#devserver-inline
     let webpackDevServerPath;

package/src/server/schema.json

@@ -175,7 +175,7 @@
           "minItems": 1,
           "items": {
             "type": "string",
-            "pattern": "^[a-z]{2}(-[a-zA-Z]{2,})?$"
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?(-x(-[a-zA-Z0-9]{1,8})+)?$"
           }
         }
       ]

package/src/utils/action-executor.js

@@ -12,6 +12,7 @@ const os = require("os");
 const path = require("path");
 const v8 = require("v8");
 const action_cache_1 = require("./action-cache");
+const workers_1 = require("./workers");
 const hasThreadSupport = (() => {
     try {
         require('worker_threads');
@@ -49,6 +50,7 @@ class BundleActionExecutor {
         return (this.largeWorker = new jest_worker_1.default(workerFile, {
             exposedMethods: ['process', 'inlineLocales'],
             setupArgs: [[...serialize(this.workerOptions)]],
+            numWorkers: workers_1.maxWorkers,
         }));
     }
     ensureSmall() {

package/src/utils/i18n-options.js

@@ -140,7 +140,16 @@ async function configureI18nBuild(context, options) {
             if (!i18n.inlineLocales.has(locale)) {
                 continue;
             }
-            const localeDataPath = findLocaleDataPath(locale, localeDataBasePath);
+            let localeDataPath = findLocaleDataPath(locale, localeDataBasePath);
+            if (!localeDataPath) {
+                const [first] = locale.split('-');
+                if (first) {
+                    localeDataPath = findLocaleDataPath(first.toLowerCase(), localeDataBasePath);
+                    if (localeDataPath) {
+                        context.logger.warn(`Locale data for '${locale}' cannot be found.  Using locale data for '${first}'.`);
+                    }
+                }
+            }
             if (!localeDataPath) {
                 context.logger.warn(`Locale data for '${locale}' cannot be found.  No locale data will be included for this locale.`);
             }
@@ -233,8 +242,14 @@ function findLocaleDataBasePath(projectRoot) {
     }
 }
 function findLocaleDataPath(locale, basePath) {
-    const localeDataPath = path.join(basePath, locale + '.js');
+    // Remove private use subtags
+    const scrubbedLocale = locale.replace(/-x(-[a-zA-Z0-9]{1,8})+$/, '');
+    const localeDataPath = path.join(basePath, scrubbedLocale + '.js');
     if (!fs.existsSync(localeDataPath)) {
+        if (scrubbedLocale === 'en-US') {
+            // fallback to known existing en-US locale data as of 9.0
+            return findLocaleDataPath('en-US-POSIX', basePath);
+        }
         return null;
     }
     return localeDataPath;

package/src/utils/index.d.ts

@@ -14,3 +14,5 @@ export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';
 export * from './normalize-optimization';
 export * from './normalize-builder-schema';
+export * from './url';
+export * from './workers';

package/src/utils/index.js

@@ -19,3 +19,5 @@ __export(require("./normalize-asset-patterns"));
 __export(require("./normalize-source-maps"));
 __export(require("./normalize-optimization"));
 __export(require("./normalize-builder-schema"));
+__export(require("./url"));
+__export(require("./workers"));

package/src/utils/process-bundle.js

@@ -59,6 +59,16 @@ async function process(options) {
     let downlevelCode;
     let downlevelMap;
     if (downlevel) {
+        const { supportedBrowsers: targets = [] } = options;
+        // todo: revisit this in version 10, when we update our defaults browserslist
+        // Without this workaround bundles will not be downlevelled because Babel doesn't know handle to 'op_mini all'
+        // See: https://github.com/babel/babel/issues/11155
+        if (Array.isArray(targets) && targets.includes('op_mini all')) {
+            targets.push('ie_mob 11');
+        }
+        else if ('op_mini' in targets) {
+            targets['ie_mob'] = '11';
+        }
         // Downlevel the bundle
         const transformResult = await core_1.transformAsync(sourceCode, {
             filename,
@@ -72,7 +82,7 @@ async function process(options) {
                     require.resolve('@babel/preset-env'),
                     {
                         // browserslist-compatible query or object of minimum environment versions to support
-                        targets: options.supportedBrowsers,
+                        targets,
                         // modules aren't needed since the bundles use webpack's custom module loading
                         modules: false,
                         // 'transform-typeof-symbol' generates slower code

package/src/utils/url.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @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 declare function urlJoin(...parts: string[]): string;

package/src/utils/url.js

@@ -0,0 +1,17 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+function urlJoin(...parts) {
+    const [p, ...rest] = parts;
+    // Remove trailing slash from first part
+    // Join all parts with `/`
+    // Dedupe double slashes from path names
+    return p.replace(/\/$/, '') + ('/' + rest.join('/')).replace(/\/\/+/g, '/');
+}
+exports.urlJoin = urlJoin;

package/src/utils/workers.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @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
+ */
+/**
+ * Use CPU count -1 with limit to 7 for workers not to clog the system.
+ * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
+ * This cause `Error: Call retries were exceeded` errors when trying to use them.
+ *
+ * See:
+ *
+ * https://github.com/nodejs/node/issues/28762
+ *
+ * https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
+ *
+ * https://github.com/angular/angular-cli/issues/16860#issuecomment-588828079
+ *
+ */
+export declare const maxWorkers: number;

package/src/utils/workers.js

@@ -0,0 +1,25 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = require("os");
+/**
+ * Use CPU count -1 with limit to 7 for workers not to clog the system.
+ * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
+ * This cause `Error: Call retries were exceeded` errors when trying to use them.
+ *
+ * See:
+ *
+ * https://github.com/nodejs/node/issues/28762
+ *
+ * https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
+ *
+ * https://github.com/angular/angular-cli/issues/16860#issuecomment-588828079
+ *
+ */
+exports.maxWorkers = Math.max(Math.min(os_1.cpus().length, 8) - 1, 1);