@angular-devkit/build-angular 0.1100.0-rc.2 → 0.1100.2

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1100.0-rc.2",
+  "version": "0.1100.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.1100.0-rc.2",
-    "@angular-devkit/build-optimizer": "0.1100.0-rc.2",
-    "@angular-devkit/build-webpack": "0.1100.0-rc.2",
-    "@angular-devkit/core": "11.0.0-rc.2",
+    "@angular-devkit/architect": "0.1100.2",
+    "@angular-devkit/build-optimizer": "0.1100.2",
+    "@angular-devkit/build-webpack": "0.1100.2",
+    "@angular-devkit/core": "11.0.2",
     "@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.0-rc.2",
+    "@ngtools/webpack": "11.0.2",
     "ansi-colors": "4.1.1",
     "autoprefixer": "9.8.6",
     "babel-loader": "8.1.0",
@@ -28,7 +28,7 @@
     "circular-dependency-plugin": "5.2.0",
     "copy-webpack-plugin": "6.2.1",
     "core-js": "3.6.5",
-    "css-loader": "5.0.0",
+    "css-loader": "4.3.0",
     "cssnano": "4.1.10",
     "file-loader": "6.1.1",
     "find-cache-dir": "3.3.1",
@@ -80,7 +80,7 @@
   "peerDependencies": {
     "@angular/compiler-cli": "^11.0.0 || ^11.0.0-next",
     "@angular/localize": "^11.0.0 || ^11.0.0-next",
-    "karma": "^5.2.0",
+    "karma": "~5.1.0",
     "ng-packagr": "^11.0.0 || ^11.0.0-next",
     "protractor": "^7.0.0",
     "tslint": "^6.1.0",

package/src/browser/index.js

@@ -423,17 +423,17 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     for (const result of processResults) {
                         const chunk = (_a = webpackStats.chunks) === null || _a === void 0 ? void 0 : _a.find((chunk) => chunk.id.toString() === result.name);
                         if (result.original) {
-                            bundleInfoStats.push(generateBundleInfoStats(result.original, chunk));
+                            bundleInfoStats.push(generateBundleInfoStats(result.original, chunk, 'modern'));
                         }
                         if (result.downlevel) {
-                            bundleInfoStats.push(generateBundleInfoStats(result.downlevel, chunk));
+                            bundleInfoStats.push(generateBundleInfoStats(result.downlevel, chunk, 'legacy'));
                         }
                     }
                     const unprocessedChunks = ((_b = webpackStats.chunks) === null || _b === void 0 ? void 0 : _b.filter((chunk) => !processResults
                         .find((result) => chunk.id.toString() === result.name))) || [];
                     for (const chunk of unprocessedChunks) {
                         const asset = (_c = webpackStats.assets) === null || _c === void 0 ? void 0 : _c.find(a => a.name === chunk.files[0]);
-                        bundleInfoStats.push(stats_1.generateBundleStats({ ...chunk, size: asset === null || asset === void 0 ? void 0 : asset.size }, true));
+                        bundleInfoStats.push(stats_1.generateBundleStats({ ...chunk, size: asset === null || asset === void 0 ? void 0 : asset.size }));
                     }
                     // Check for budget errors and display them to the user.
                     const budgets = options.budgets || [];
@@ -550,7 +550,7 @@ function mapErrorToMessage(error) {
 function assertNever(input) {
     throw new Error(`Unexpected call to assertNever() with input: ${JSON.stringify(input, null /* replacer */, 4 /* tabSize */)}`);
 }
-function generateBundleInfoStats(bundle, chunk) {
+function generateBundleInfoStats(bundle, chunk, chunkType) {
     return stats_1.generateBundleStats({
         size: bundle.size,
         files: bundle.map ? [bundle.filename, bundle.map.filename] : [bundle.filename],
@@ -558,6 +558,7 @@ function generateBundleInfoStats(bundle, chunk) {
         entry: !!(chunk === null || chunk === void 0 ? void 0 : chunk.names.includes('runtime')),
         initial: !!(chunk === null || chunk === void 0 ? void 0 : chunk.initial),
         rendered: true,
-    }, true);
+        chunkType,
+    });
 }
 exports.default = architect_1.createBuilder(buildWebpackBrowser);

package/src/browser/schema.json

@@ -428,10 +428,12 @@
           "type": "object",
           "properties": {
             "src": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "replaceWith": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -444,10 +446,12 @@
           "type": "object",
           "properties": {
             "replace": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "with": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,

package/src/server/schema.json

@@ -259,10 +259,12 @@
           "type": "object",
           "properties": {
             "src": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "replaceWith": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -275,10 +277,12 @@
           "type": "object",
           "properties": {
             "replace": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "with": {
-              "type": "string"
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,

package/src/utils/index-file/inline-fonts.js

@@ -122,10 +122,10 @@ class InlineFontsProcessor {
             cssContent += await this.getResponse(url, "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36" /* Chrome */);
             if (this.options.minifyInlinedCSS) {
                 cssContent = cssContent
+                    // Comments.
+                    .replace(/\/\*([\s\S]*?)\*\//g, '')
                     // New lines.
                     .replace(/\n/g, '')
-                    // Comments and new lines.
-                    .replace(/\/\*\s.+\s\*\//g, '')
                     // Safe spaces.
                     .replace(/\s?[\{\:\;]\s+/g, s => s.trim());
             }

package/src/webpack/configs/dev-server.js

@@ -30,6 +30,9 @@ function getDevServerConfig(wco) {
         const parsedHost = url.parse(publicHost);
         publicHost = parsedHost.host;
     }
+    else {
+        publicHost = '0.0.0.0:0';
+    }
     if (!watch) {
         // There's no option to turn off file watching in webpack-dev-server, but
         // we can override the file watcher instead.

package/src/webpack/plugins/hmr/hmr-accept.js

@@ -34,7 +34,8 @@ function default_1(mod) {
         if (!appRef) {
             return;
         }
-        const oldInputs = document.querySelectorAll('input, textarea');
+        // Inputs that are hidden should be ignored
+        const oldInputs = document.querySelectorAll('input:not([type="hidden"]), textarea');
         const oldOptions = document.querySelectorAll('option');
         // Create new application
         appRef.components
@@ -115,8 +116,8 @@ function dispatchEvents(element) {
     element.dispatchEvent(new KeyboardEvent('keyup', { key: 'Enter' }));
 }
 function restoreFormValues(oldInputs, oldOptions) {
-    // Restore input
-    const newInputs = document.querySelectorAll('input, textarea');
+    // Restore input that are not hidden
+    const newInputs = document.querySelectorAll('input:not([type="hidden"]), textarea');
     if (newInputs.length && newInputs.length === oldInputs.length) {
         console.log('[NG HMR] Restoring input/textarea values.');
         for (let index = 0; index < newInputs.length; index++) {

package/src/webpack/plugins/karma.js

@@ -85,13 +85,14 @@ const init = (config, emitter, customFileHandlers) => {
         const hasIstanbulReporter = reporters.includes('coverage-istanbul');
         if (hasCoveragePlugin && !hasCoverageReporter) {
             reporters.push('coverage');
+            logger.warn(`There is a known issue with Karma and karma-coverage. Tests that exceed the coverage threshold will not fail. This will be fixed in Karma 5.2.x soon.`);
         }
         else if (hasIstanbulPlugin && !hasIstanbulReporter) {
             // coverage-istanbul is deprecated in favor of karma-coverage
             reporters.push('coverage-istanbul');
         }
-        else {
-            throw new Error('karma-coverage must be installed in order to run code coverage');
+        else if (!hasCoveragePlugin && !hasIstanbulPlugin) {
+            throw new Error('karma-coverage must be installed in order to run code coverage.');
         }
         if (hasIstanbulPlugin) {
             logger.warn(`'karma-coverage-istanbul-reporter' usage has been deprecated since version 11.\n` +

package/src/webpack/utils/stats.d.ts

@@ -10,9 +10,11 @@ import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
 import { Configuration, Stats } from 'webpack';
 export declare function formatSize(size: number): string;
 export declare type BundleStatsData = [files: string, names: string, size: number | string];
+export declare type ChunkType = 'modern' | 'legacy' | 'unknown';
 export interface BundleStats {
     initial: boolean;
     stats: BundleStatsData;
+    chunkType: ChunkType;
 }
 export declare function generateBundleStats(info: {
     size?: number;
@@ -21,7 +23,8 @@ export declare function generateBundleStats(info: {
     entry: boolean;
     initial: boolean;
     rendered?: boolean;
-}, colors: boolean): BundleStats;
+    chunkType?: ChunkType;
+}): BundleStats;
 export declare function statsWarningsToString(json: any, statsConfig: any): string;
 export declare function statsErrorsToString(json: any, statsConfig: any): string;
 export declare function statsHasErrors(json: any): boolean;

package/src/webpack/utils/stats.js

@@ -27,13 +27,15 @@ function formatSize(size) {
 }
 exports.formatSize = formatSize;
 ;
-function generateBundleStats(info, colors) {
+function generateBundleStats(info) {
     var _a;
     const size = typeof info.size === 'number' ? info.size : '-';
     const files = info.files.filter(f => !f.endsWith('.map')).map(f => path.basename(f)).join(', ');
     const names = ((_a = info.names) === null || _a === void 0 ? void 0 : _a.length) ? info.names.join(', ') : '-';
     const initial = !!(info.entry || info.initial);
+    const chunkType = info.chunkType || 'unknown';
     return {
+        chunkType,
         initial,
         stats: [files, names, size],
     };
@@ -46,8 +48,10 @@ function generateBuildStatsTable(data, colors, showTotalSize) {
     const dim = (x) => colors ? color_1.colors.dim(x) : x;
     const changedEntryChunksStats = [];
     const changedLazyChunksStats = [];
-    let initialTotalSize = 0;
-    for (const { initial, stats } of data) {
+    let initialModernTotalSize = 0;
+    let initialLegacyTotalSize = 0;
+    let modernFileSuffix;
+    for (const { initial, stats, chunkType } of data) {
         const [files, names, size] = stats;
         const data = [
             g(files),
@@ -57,7 +61,22 @@ function generateBuildStatsTable(data, colors, showTotalSize) {
         if (initial) {
             changedEntryChunksStats.push(data);
             if (typeof size === 'number') {
-                initialTotalSize += size;
+                switch (chunkType) {
+                    case 'modern':
+                        initialModernTotalSize += size;
+                        if (!modernFileSuffix) {
+                            const match = files.match(/-(es20\d{2}|esnext)/);
+                            modernFileSuffix = match === null || match === void 0 ? void 0 : match[1].toString().toUpperCase();
+                        }
+                        break;
+                    case 'legacy':
+                        initialLegacyTotalSize += size;
+                        break;
+                    default:
+                        initialModernTotalSize += size;
+                        initialLegacyTotalSize += size;
+                        break;
+                }
             }
         }
         else {
@@ -70,7 +89,12 @@ function generateBuildStatsTable(data, colors, showTotalSize) {
         bundleInfo.push(['Initial Chunk Files', 'Names', 'Size'].map(bold), ...changedEntryChunksStats);
         if (showTotalSize) {
             bundleInfo.push([]);
-            bundleInfo.push([' ', 'Initial Total', formatSize(initialTotalSize)].map(bold));
+            if (initialModernTotalSize === initialLegacyTotalSize) {
+                bundleInfo.push([' ', 'Initial Total', formatSize(initialModernTotalSize)].map(bold));
+            }
+            else {
+                bundleInfo.push([' ', 'Initial ES5 Total', formatSize(initialLegacyTotalSize)].map(bold), [' ', `Initial ${modernFileSuffix} Total`, formatSize(initialModernTotalSize)].map(bold));
+            }
         }
     }
     // Seperator
@@ -103,7 +127,7 @@ function statsToString(json, statsConfig, bundleState) {
             }
             const assets = json.assets.filter((asset) => chunk.files.includes(asset.name));
             const summedSize = assets.filter((asset) => !asset.name.endsWith(".map")).reduce((total, asset) => { return total + asset.size; }, 0);
-            changedChunksStats.push(generateBundleStats({ ...chunk, size: summedSize }, colors));
+            changedChunksStats.push(generateBundleStats({ ...chunk, size: summedSize }));
         }
         unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
     }