@angular-devkit/build-angular 13.1.0-next.0 → 13.1.0-next.1

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.1.0-next.0",
+  "version": "13.1.0-next.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.1",
-    "@angular-devkit/architect": "0.1301.0-next.0",
-    "@angular-devkit/build-webpack": "0.1301.0-next.0",
-    "@angular-devkit/core": "13.1.0-next.0",
+    "@angular-devkit/architect": "0.1301.0-next.1",
+    "@angular-devkit/build-webpack": "0.1301.0-next.1",
+    "@angular-devkit/core": "13.1.0-next.1",
     "@babel/core": "7.16.0",
     "@babel/generator": "7.16.0",
     "@babel/helper-annotate-as-pure": "7.16.0",
@@ -17,22 +17,21 @@
     "@babel/plugin-transform-async-to-generator": "7.16.0",
     "@babel/plugin-transform-runtime": "7.16.0",
     "@babel/preset-env": "7.16.0",
-    "@babel/runtime": "7.16.0",
+    "@babel/runtime": "7.16.3",
     "@babel/template": "7.16.0",
     "@discoveryjs/json-ext": "0.5.5",
-    "@ngtools/webpack": "13.1.0-next.0",
+    "@ngtools/webpack": "13.1.0-next.1",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",
-    "caniuse-lite": "^1.0.30001032",
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "9.0.1",
     "core-js": "3.19.1",
     "critters": "0.0.14",
-    "css-loader": "6.5.0",
-    "esbuild-wasm": "0.13.12",
+    "css-loader": "6.5.1",
+    "esbuild-wasm": "0.13.13",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.0",
@@ -40,8 +39,8 @@
     "less": "4.1.2",
     "less-loader": "10.2.0",
     "license-webpack-plugin": "3.0.0",
-    "loader-utils": "3.1.0",
-    "mini-css-extract-plugin": "2.4.3",
+    "loader-utils": "3.1.3",
+    "mini-css-extract-plugin": "2.4.4",
     "minimatch": "3.0.4",
     "open": "8.4.0",
     "ora": "5.4.1",
@@ -65,21 +64,21 @@
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.61.0",
+    "webpack": "5.63.0",
     "webpack-dev-middleware": "5.2.1",
     "webpack-dev-server": "4.4.0",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.0.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.13.12"
+    "esbuild": "0.13.13"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^13.0.0 || ^13.0.0-next",
-    "@angular/localize": "^13.0.0 || ^13.0.0-next",
-    "@angular/service-worker": "^13.0.0 || ^13.0.0-next",
+    "@angular/compiler-cli": "^13.0.0 || ^13.1.0-next",
+    "@angular/localize": "^13.0.0 || ^13.1.0-next",
+    "@angular/service-worker": "^13.0.0 || ^13.1.0-next",
     "karma": "^6.3.0",
-    "ng-packagr": "^13.0.0 || ^13.0.0-next",
+    "ng-packagr": "^13.0.0 || ^13.1.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0",
     "typescript": "~4.4.3"

package/src/babel/presets/application.d.ts

@@ -34,6 +34,7 @@ export interface ApplicationPresetOptions {
     forceAsyncTransformation?: boolean;
     instrumentCode?: {
         includedBasePath: string;
+        inputSourceMap: unknown;
     };
     optimize?: {
         looseEnums: boolean;

package/src/babel/presets/application.js

@@ -101,7 +101,7 @@ function createNgtscLogger(reporter) {
     };
 }
 function default_1(api, options) {
-    var _a;
+    var _a, _b;
     const presets = [];
     const plugins = [];
     let needRuntimeTransform = false;
@@ -160,7 +160,10 @@ function default_1(api, options) {
     if (options.instrumentCode) {
         plugins.push([
             require('babel-plugin-istanbul').default,
-            { inputSourceMap: false, cwd: options.instrumentCode.includedBasePath },
+            {
+                inputSourceMap: (_b = options.instrumentCode.inputSourceMap) !== null && _b !== void 0 ? _b : false,
+                cwd: options.instrumentCode.includedBasePath,
+            },
         ]);
     }
     if (needRuntimeTransform) {

package/src/babel/webpack-loader.js

@@ -51,7 +51,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
         inputSourceMap: false,
     });
     return {
-        async customOptions(options, { source }) {
+        async customOptions(options, { source, map }) {
             var _a, _b;
             const { i18n, scriptTarget, aot, optimize, instrumentCode, ...rawOptions } = options;
             // Must process file if plugins are added
@@ -140,6 +140,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 // `babel-plugin-istanbul` has it's own includes but we do the below so that we avoid running the the loader.
                 customOptions.instrumentCode = {
                     includedBasePath: instrumentCode.includedBasePath,
+                    inputSourceMap: map,
                 };
                 shouldProcess = true;
             }

package/src/builders/browser/index.js

@@ -46,6 +46,7 @@ const output_paths_1 = require("../../utils/output-paths");
 const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
 const service_worker_1 = require("../../utils/service-worker");
 const spinner_1 = require("../../utils/spinner");
+const supported_browsers_1 = require("../../utils/supported-browsers");
 const version_1 = require("../../utils/version");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const configs_1 = require("../../webpack/configs");
@@ -97,8 +98,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     return (0, rxjs_1.from)(context.getProjectMetadata(projectName)).pipe((0, operators_1.switchMap)(async (projectMetadata) => {
         var _a;
         const sysProjectRoot = (0, core_1.getSystemPath)((0, core_1.resolve)((0, core_1.normalize)(context.workspaceRoot), (0, core_1.normalize)((_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '')));
-        const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(sysProjectRoot);
-        checkInternetExplorerSupport(buildBrowserFeatures.supportedBrowsers, context.logger);
+        checkInternetExplorerSupport(sysProjectRoot, context.logger);
         return {
             ...(await initialize(options, context, transforms.webpackConfiguration)),
             cacheOptions: (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, context.workspaceRoot),
@@ -290,7 +290,8 @@ function mapEmittedFilesToFileInfo(files = []) {
     }
     return filteredFiles;
 }
-function checkInternetExplorerSupport(supportedBrowsers, logger) {
+function checkInternetExplorerSupport(projectRoot, logger) {
+    const supportedBrowsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot);
     if (supportedBrowsers.some((b) => b === 'ie 9' || b === 'ie 10' || b === 'ie 11')) {
         logger.warn(`Warning: Support was requested for Internet Explorer in the project's browserslist configuration. ` +
             'Internet Explorer is no longer officially supported.' +

package/src/utils/build-options.d.ts

@@ -61,6 +61,7 @@ export interface BuildOptions {
     cache: NormalizedCachedOptions;
     codeCoverage?: boolean;
     codeCoverageExclude?: string[];
+    supportedBrowsers: string[];
 }
 export interface WebpackDevServerOptions extends BuildOptions, Omit<DevServerSchema, 'optimization' | 'sourceMap' | 'browserTarget'> {
 }

package/src/utils/index.d.ts

@@ -5,7 +5,6 @@
  * 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 * from './build-browser-features';
 export * from './default-progress';
 export * from './delete-output-dir';
 export * from './run-module-as-observable-fork';

package/src/utils/index.js

@@ -17,7 +17,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./build-browser-features"), exports);
 __exportStar(require("./default-progress"), exports);
 __exportStar(require("./delete-output-dir"), exports);
 __exportStar(require("./run-module-as-observable-fork"), exports);

package/src/utils/normalize-builder-schema.js

@@ -14,6 +14,7 @@ const normalize_cache_1 = require("./normalize-cache");
 const normalize_file_replacements_1 = require("./normalize-file-replacements");
 const normalize_optimization_1 = require("./normalize-optimization");
 const normalize_source_maps_1 = require("./normalize-source-maps");
+const supported_browsers_1 = require("./supported-browsers");
 function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata) {
     const normalizedSourceMapOptions = (0, normalize_source_maps_1.normalizeSourceMaps)(options.sourceMap || false);
     return {
@@ -37,6 +38,7 @@ function normalizeBrowserSchema(root, projectRoot, sourceRoot, options, metadata
         // A value of 0 is falsy and will disable polling rather then enable
         // 500 ms is a sensible default in this case
         poll: options.poll === 0 ? 500 : options.poll,
+        supportedBrowsers: (0, supported_browsers_1.getSupportedBrowsers)((0, core_1.getSystemPath)(projectRoot)),
     };
 }
 exports.normalizeBrowserSchema = normalizeBrowserSchema;

package/src/utils/supported-browsers.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google LLC 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 getSupportedBrowsers(projectRoot: string): string[];

package/src/utils/supported-browsers.js

@@ -0,0 +1,26 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSupportedBrowsers = void 0;
+const browserslist_1 = __importDefault(require("browserslist"));
+function getSupportedBrowsers(projectRoot) {
+    browserslist_1.default.defaults = [
+        'last 1 Chrome version',
+        'last 1 Firefox version',
+        'last 2 Edge major versions',
+        'last 2 Safari major versions',
+        'last 2 iOS major versions',
+        'Firefox ESR',
+    ];
+    return (0, browserslist_1.default)(undefined, { path: projectRoot });
+}
+exports.getSupportedBrowsers = getSupportedBrowsers;

package/src/webpack/configs/common.js

@@ -36,7 +36,6 @@ const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
 const webpack_2 = require("webpack");
 const webpack_subresource_integrity_1 = require("webpack-subresource-integrity");
-const utils_1 = require("../../utils");
 const environment_options_1 = require("../../utils/environment-options");
 const load_esm_1 = require("../../utils/load-esm");
 const plugins_1 = require("../plugins");
@@ -61,7 +60,6 @@ async function getCommonConfig(wco) {
     const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, VERSION: NG_VERSION, } = (compilerCliModule.GLOBAL_DEFS_FOR_TERSER ? compilerCliModule : compilerCliModule.default);
     // determine hashing format
     const hashFormat = (0, helpers_1.getOutputHashFormat)(buildOptions.outputHashing || 'none');
-    const buildBrowserFeatures = new utils_1.BuildBrowserFeatures(projectRoot);
     if (buildOptions.progress) {
         extraPlugins.push(new progress_plugin_1.ProgressPlugin(platform));
     }
@@ -270,6 +268,9 @@ async function getCommonConfig(wco) {
             /Failed to parse source map from/,
             // https://github.com/webpack-contrib/postcss-loader/blob/bd261875fdf9c596af4ffb3a1a73fe3c549befda/src/index.js#L153-L158
             /Add postcss as project dependency/,
+            // esbuild will issue a warning, while still hoists the @charset at the very top.
+            // This is caused by a bug in css-loader https://github.com/webpack-contrib/css-loader/issues/1212
+            /"@charset" must be the first rule in the file/,
         ],
         module: {
             // Show an error for missing exports instead of a warning.
@@ -324,7 +325,7 @@ async function getCommonConfig(wco) {
             level: verbose ? 'verbose' : 'error',
         },
         stats: (0, helpers_1.getStatsOptions)(verbose),
-        cache: (0, helpers_1.getCacheSettings)(wco, buildBrowserFeatures.supportedBrowsers, NG_VERSION.full),
+        cache: (0, helpers_1.getCacheSettings)(wco, NG_VERSION.full),
         optimization: {
             minimizer: extraMinimizers,
             moduleIds: 'deterministic',

package/src/webpack/configs/styles.js

@@ -30,7 +30,6 @@ exports.getStylesConfig = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const sass_service_1 = require("../../sass/sass-service");
-const build_browser_features_1 = require("../../utils/build-browser-features");
 const plugins_1 = require("../plugins");
 const css_optimizer_plugin_1 = require("../plugins/css-optimizer-plugin");
 const helpers_1 = require("../utils/helpers");
@@ -134,9 +133,8 @@ function getStylesConfig(wco) {
             extraPostcssPlugins.push(require(tailwindPackagePath)({ config: tailwindConfigPath }));
         }
     }
-    const { supportedBrowsers } = new build_browser_features_1.BuildBrowserFeatures(wco.projectRoot);
     const postcssPresetEnvPlugin = postcssPresetEnv({
-        browsers: supportedBrowsers,
+        browsers: buildOptions.supportedBrowsers,
         autoprefixer: true,
         stage: 3,
     });
@@ -361,7 +359,7 @@ function getStylesConfig(wco) {
             minimizer: buildOptions.optimization.styles.minify
                 ? [
                     new css_optimizer_plugin_1.CssOptimizerPlugin({
-                        supportedBrowsers,
+                        supportedBrowsers: buildOptions.supportedBrowsers,
                     }),
                 ]
                 : undefined,

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

@@ -140,7 +140,6 @@ function restoreFormValues(oldInputs, oldOptions) {
                 case 'date':
                 case 'datetime-local':
                 case 'email':
-                case 'file':
                 case 'hidden':
                 case 'month':
                 case 'number':
@@ -155,6 +154,10 @@ function restoreFormValues(oldInputs, oldOptions) {
                 case 'week':
                     newElement.value = oldElement.value;
                     break;
+                case 'file':
+                    // Ignored due: Uncaught DOMException: Failed to set the 'value' property on 'HTMLInputElement':
+                    // This input element accepts a filename, which may only be programmatically set to the empty string.
+                    break;
                 default:
                     console.warn('[NG HMR] Unknown input type ' + oldElement.type + '.');
                     continue;

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

@@ -20,7 +20,7 @@ export declare type NormalizedEntryPoint = Required<ExtraEntryPointClass>;
 export declare function normalizeExtraEntryPoints(extraEntryPoints: ExtraEntryPoint[], defaultBundleName: string): NormalizedEntryPoint[];
 export declare function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath: string) => string;
 export declare function getInstrumentationExcludedPaths(sourceRoot: string, excludedPaths: string[]): Set<string>;
-export declare function getCacheSettings(wco: WebpackConfigOptions, supportedBrowsers: string[], angularVersion: string): WebpackOptionsNormalized['cache'];
+export declare function getCacheSettings(wco: WebpackConfigOptions, angularVersion: string): WebpackOptionsNormalized['cache'];
 export declare function globalScriptsByBundleName(root: string, scripts: ExtraEntryPoint[]): {
     bundleName: string;
     inject: boolean;

package/src/webpack/utils/helpers.js

@@ -109,7 +109,7 @@ function getInstrumentationExcludedPaths(sourceRoot, excludedPaths) {
     return excluded;
 }
 exports.getInstrumentationExcludedPaths = getInstrumentationExcludedPaths;
-function getCacheSettings(wco, supportedBrowsers, angularVersion) {
+function getCacheSettings(wco, angularVersion) {
     const { enabled, path: cacheDirectory } = wco.buildOptions.cache;
     if (enabled) {
         const packageVersion = require('../../../package.json').version;
@@ -131,7 +131,6 @@ function getCacheSettings(wco, supportedBrowsers, angularVersion) {
                 // https://github.com/angular/angular-cli/blob/736a5f89deaca85f487b78aec9ff66d4118ceb6a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts#L264-L265
                 outputPath: undefined,
             }))
-                .update(supportedBrowsers.join(''))
                 .digest('hex'),
         };
     }

package/src/utils/build-browser-features.d.ts

@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 class BuildBrowserFeatures {
-    private projectRoot;
-    readonly supportedBrowsers: string[];
-    constructor(projectRoot: string);
-    /**
-     * True, when a browser feature is supported partially or fully.
-     */
-    isFeatureSupported(featureId: string): boolean;
-}

package/src/utils/build-browser-features.js

@@ -1,54 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC 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
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuildBrowserFeatures = void 0;
-const browserslist_1 = __importDefault(require("browserslist"));
-const caniuse_lite_1 = require("caniuse-lite");
-class BuildBrowserFeatures {
-    constructor(projectRoot) {
-        // By default, browserslist defaults are too inclusive
-        // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
-        this.projectRoot = projectRoot;
-        // We change the default query to browsers that Angular support.
-        // https://angular.io/guide/browser-support
-        browserslist_1.default.defaults = [
-            'last 1 Chrome version',
-            'last 1 Firefox version',
-            'last 2 Edge major versions',
-            'last 2 Safari major versions',
-            'last 2 iOS major versions',
-            'Firefox ESR',
-        ];
-        this.supportedBrowsers = (0, browserslist_1.default)(undefined, { path: this.projectRoot });
-    }
-    /**
-     * True, when a browser feature is supported partially or fully.
-     */
-    isFeatureSupported(featureId) {
-        // y: feature is fully available
-        // n: feature is unavailable
-        // a: feature is partially supported
-        // x: feature is prefixed
-        const criteria = ['y', 'a'];
-        const data = (0, caniuse_lite_1.feature)(caniuse_lite_1.features[featureId]);
-        return !this.supportedBrowsers.some((browser) => {
-            const [agentId, version] = browser.split(' ');
-            const browserData = data.stats[agentId];
-            const featureStatus = (browserData && browserData[version]);
-            // We are only interested in the first character
-            // Ex: when 'a #4 #5', we only need to check for 'a'
-            // as for such cases we should polyfill these features as needed
-            return !featureStatus || !criteria.includes(featureStatus.charAt(0));
-        });
-    }
-}
-exports.BuildBrowserFeatures = BuildBrowserFeatures;