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

package/package.json

@@ -1,38 +1,37 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.0.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.1300.0",
-    "@angular-devkit/build-webpack": "0.1300.0",
-    "@angular-devkit/core": "13.0.0",
-    "@babel/core": "7.15.8",
-    "@babel/generator": "7.15.8",
-    "@babel/helper-annotate-as-pure": "7.15.4",
-    "@babel/plugin-proposal-async-generator-functions": "7.15.8",
-    "@babel/plugin-transform-async-to-generator": "7.14.5",
-    "@babel/plugin-transform-runtime": "7.15.8",
-    "@babel/preset-env": "7.15.8",
-    "@babel/runtime": "7.15.4",
-    "@babel/template": "7.15.4",
+    "@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",
+    "@babel/plugin-proposal-async-generator-functions": "7.16.0",
+    "@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.3",
+    "@babel/template": "7.16.0",
     "@discoveryjs/json-ext": "0.5.5",
-    "@ngtools/webpack": "13.0.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.0",
+    "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.0.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.60.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");
@@ -59,12 +60,8 @@ async function initialize(options, context, webpackConfigurationTransform) {
     const adjustedOptions = options.watch ? options : { ...options, assets: [] };
     const { config, projectRoot, projectSourceRoot, i18n, target } = await (0, webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext)(adjustedOptions, context, (wco) => [
         (0, configs_1.getCommonConfig)(wco),
-        (0, configs_1.getBrowserConfig)(wco),
         (0, configs_1.getStylesConfig)(wco),
-        (0, configs_1.getStatsConfig)(wco),
         (0, configs_1.getAnalyticsConfig)(wco, context),
-        (0, configs_1.getTypeScriptConfig)(wco),
-        wco.buildOptions.webWorkerTsConfig ? (0, configs_1.getWorkerConfig)(wco) : {},
     ]);
     // Validate asset option values if processed directly
     if (((_a = options.assets) === null || _a === void 0 ? void 0 : _a.length) && !((_b = adjustedOptions.assets) === null || _b === void 0 ? void 0 : _b.length)) {
@@ -101,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),
@@ -294,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/builders/dev-server/index.js

@@ -124,12 +124,8 @@ function serveWebpackBrowser(options, context, transforms = {}) {
         const { config, projectRoot, i18n } = await (0, webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext)(browserOptions, context, (wco) => [
             (0, configs_1.getDevServerConfig)(wco),
             (0, configs_1.getCommonConfig)(wco),
-            (0, configs_1.getBrowserConfig)(wco),
             (0, configs_1.getStylesConfig)(wco),
-            (0, configs_1.getStatsConfig)(wco),
             (0, configs_1.getAnalyticsConfig)(wco, context),
-            (0, configs_1.getTypeScriptConfig)(wco),
-            browserOptions.webWorkerTsConfig ? (0, configs_1.getWorkerConfig)(wco) : {},
         ], options);
         if (!config.devServer) {
             throw new Error('Webpack Dev Server configuration was not set.');

package/src/builders/extract-i18n/index.js

@@ -166,6 +166,7 @@ async function execute(options, context, transforms) {
         subresourceIntegrity: false,
         outputHashing: schema_1.OutputHashing.None,
         namedChunks: true,
+        allowedCommonJsDependencies: undefined,
     };
     const { config, projectRoot } = await (0, webpack_browser_config_1.generateBrowserWebpackConfigFromContext)(builderOptions, context, (wco) => {
         var _a;
@@ -174,10 +175,6 @@ async function execute(options, context, transforms) {
         const partials = [
             { plugins: [new NoEmitPlugin()] },
             (0, configs_1.getCommonConfig)(wco),
-            (0, configs_1.getBrowserConfig)(wco),
-            (0, configs_1.getTypeScriptConfig)(wco),
-            (0, configs_1.getWorkerConfig)(wco),
-            (0, configs_1.getStatsConfig)(wco),
         ];
         // Add Ivy application file extractor support
         partials.unshift({

package/src/builders/karma/index.d.ts

@@ -8,7 +8,7 @@
 import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import { ConfigOptions } from 'karma';
 import { Observable } from 'rxjs';
-import * as webpack from 'webpack';
+import { Configuration } from 'webpack';
 import { ExecutionTransformer } from '../../transforms';
 import { Schema as KarmaBuilderOptions } from './schema';
 export declare type KarmaConfigOptions = ConfigOptions & {
@@ -19,7 +19,7 @@ export declare type KarmaConfigOptions = ConfigOptions & {
  * @experimental Direct usage of this function is considered experimental.
  */
 export declare function execute(options: KarmaBuilderOptions, context: BuilderContext, transforms?: {
-    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+    webpackConfiguration?: ExecutionTransformer<Configuration>;
     karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions;
 }): Observable<BuilderOutput>;
 export { KarmaBuilderOptions };

package/src/builders/karma/index.js

@@ -59,13 +59,7 @@ async function initialize(options, context, webpackConfigurationTransformer) {
         // https://github.com/webpack/webpack-dev-middleware/blob/698c9ae5e9bb9a013985add6189ff21c1a1ec185/src/index.js#L65
         // https://github.com/webpack/webpack/blob/cde1b73e12eb8a77eb9ba42e7920c9ec5d29c2c9/lib/Compiler.js#L379-L388
         watch: true,
-    }, context, (wco) => [
-        (0, configs_1.getCommonConfig)(wco),
-        (0, configs_1.getStylesConfig)(wco),
-        (0, configs_1.getTypeScriptConfig)(wco),
-        (0, configs_1.getTestConfig)(wco),
-        (0, configs_1.getWorkerConfig)(wco),
-    ]);
+    }, context, (wco) => [(0, configs_1.getCommonConfig)(wco), (0, configs_1.getStylesConfig)(wco)]);
     const karma = await Promise.resolve().then(() => __importStar(require('karma')));
     return [
         karma,

package/src/builders/server/index.js

@@ -109,13 +109,7 @@ async function initialize(options, context, webpackConfigurationTransform) {
         buildOptimizer: false,
         aot: true,
         platform: 'server',
-    }, context, (wco) => [
-        (0, configs_1.getCommonConfig)(wco),
-        (0, configs_1.getServerConfig)(wco),
-        (0, configs_1.getStylesConfig)(wco),
-        (0, configs_1.getStatsConfig)(wco),
-        (0, configs_1.getTypeScriptConfig)(wco),
-    ]);
+    }, context, (wco) => [(0, configs_1.getCommonConfig)(wco), (0, configs_1.getStylesConfig)(wco)]);
     let transformedConfig;
     if (webpackConfigurationTransform) {
         transformedConfig = await webpackConfigurationTransform(config);

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

@@ -59,10 +59,9 @@ export interface BuildOptions {
     inlineStyleLanguage?: InlineStyleLanguage;
     allowedCommonJsDependencies?: string[];
     cache: NormalizedCachedOptions;
-}
-export interface WebpackTestOptions extends BuildOptions {
     codeCoverage?: boolean;
     codeCoverageExclude?: string[];
+    supportedBrowsers: string[];
 }
 export interface WebpackDevServerOptions extends BuildOptions, Omit<DevServerSchema, 'optimization' | 'sourceMap' | 'browserTarget'> {
 }

package/src/utils/i18n-inlining.js

@@ -32,7 +32,7 @@ const path = __importStar(require("path"));
 const action_executor_1 = require("./action-executor");
 const copy_assets_1 = require("./copy-assets");
 const spinner_1 = require("./spinner");
-function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, outputPath, es5, missingTranslation) {
+function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, outputPath, es5, missingTranslation, context) {
     const options = [];
     const originalFiles = [];
     for (const emittedFile of emittedFiles) {
@@ -51,16 +51,31 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
             setLocale: emittedFile.name === 'main' || emittedFile.name === 'vendor',
         };
         originalFiles.push(originalPath);
+        // Remove temporary original file as the content has now been read
+        try {
+            fs.unlinkSync(originalPath);
+        }
+        catch (e) {
+            context.logger.debug(`Unable to delete i18n temporary file [${originalPath}]: ${e.toString()}`);
+        }
         try {
             const originalMapPath = originalPath + '.map';
             action.map = fs.readFileSync(originalMapPath, 'utf8');
             originalFiles.push(originalMapPath);
+            // Remove temporary original map file as the content has now been read
+            try {
+                fs.unlinkSync(originalMapPath);
+            }
+            catch (e) {
+                context.logger.debug(`Unable to delete i18n temporary file [${originalMapPath}]: ${e.toString()}`);
+            }
         }
         catch (err) {
             if (err.code !== 'ENOENT') {
                 throw err;
             }
         }
+        context.logger.debug(`i18n file queued for processing: ${action.filename}`);
         options.push(action);
     }
     return { options, originalFiles };
@@ -71,8 +86,9 @@ async function i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPat
     const spinner = new spinner_1.Spinner();
     spinner.start('Generating localized bundles...');
     try {
-        const { options, originalFiles: processedFiles } = emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, baseOutputPath, es5, missingTranslation);
+        const { options, originalFiles: processedFiles } = emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, baseOutputPath, es5, missingTranslation, context);
         for await (const result of executor.inlineAll(options)) {
+            context.logger.debug(`i18n file processed: ${result.file}`);
             for (const diagnostic of result.diagnostics) {
                 spinner.stop();
                 if (diagnostic.type === 'error') {

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/{webpack/configs/worker.d.ts → utils/supported-browsers.d.ts}

@@ -5,6 +5,4 @@
  * 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
  */
-import { Configuration } from 'webpack';
-import { WebpackConfigOptions } from '../../utils/build-options';
-export declare function getWorkerConfig(wco: WebpackConfigOptions): Configuration;
+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.d.ts

@@ -6,5 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Configuration } from 'webpack';
-import { WebpackConfigOptions, WebpackTestOptions } from '../../utils/build-options';
-export declare function getCommonConfig(wco: WebpackConfigOptions<WebpackTestOptions>): Promise<Configuration>;
+import { WebpackConfigOptions } from '../../utils/build-options';
+export declare function getCommonConfig(wco: WebpackConfigOptions): Promise<Configuration>;