@angular-devkit/build-angular 13.3.0 → 13.3.3

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.3.0",
+  "version": "13.3.3",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.1.1",
-    "@angular-devkit/architect": "0.1303.0",
-    "@angular-devkit/build-webpack": "0.1303.0",
-    "@angular-devkit/core": "13.3.0",
+    "@angular-devkit/architect": "0.1303.3",
+    "@angular-devkit/build-webpack": "0.1303.3",
+    "@angular-devkit/core": "13.3.3",
     "@babel/core": "7.16.12",
     "@babel/generator": "7.16.8",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.16.7",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "13.3.0",
+    "@ngtools/webpack": "13.3.3",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
@@ -42,7 +42,7 @@
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.0",
     "mini-css-extract-plugin": "2.5.3",
-    "minimatch": "3.0.4",
+    "minimatch": "3.0.5",
     "open": "8.4.0",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
@@ -54,7 +54,7 @@
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.49.0",
+    "sass": "1.49.9",
     "sass-loader": "12.4.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.1",

package/src/typings.d.ts

@@ -6,10 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-declare module '@discoveryjs/json-ext' {
-  export function stringifyStream(value: unknown): import('stream').Readable;
-}
-
 declare module '@babel/helper-annotate-as-pure' {
   export default function annotateAsPure(
     pathOrNode: import('@babel/types').Node | { node: import('@babel/types').Node },

package/src/webpack/configs/analytics.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAnalyticsConfig = void 0;
 const analytics_1 = require("../plugins/analytics");
 function getAnalyticsConfig(wco, context) {
-    var _a;
     if (!context.analytics) {
         return {};
     }
@@ -22,9 +21,7 @@ function getAnalyticsConfig(wco, context) {
     }
     // The category is the builder name if it's an angular builder.
     return {
-        plugins: [
-            new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category, (_a = wco.buildOptions.aot) !== null && _a !== void 0 ? _a : false),
-        ],
+        plugins: [new analytics_1.NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category)],
     };
 }
 exports.getAnalyticsConfig = getAnalyticsConfig;

package/src/webpack/configs/common.js

@@ -189,7 +189,9 @@ async function getCommonConfig(wco) {
             test: tsConfig.options.allowJs ? /\.[cm]?[tj]sx?$/ : /\.[cm]?tsx?$/,
             loader: webpack_1.AngularWebpackLoaderPath,
             // The below are known paths that are not part of the TypeScript compilation even when allowJs is enabled.
-            exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/],
+            exclude: [
+                /[\\/]node_modules[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/,
+            ],
         });
         extraPlugins.push((0, typescript_2.createIvyPlugin)(wco, aot, tsConfigPath));
     }
@@ -303,7 +305,7 @@ async function getCommonConfig(wco) {
                     // The below is needed due to a bug in `@babel/runtime`. See: https://github.com/babel/babel/issues/12824
                     resolve: { fullySpecified: false },
                     exclude: [
-                        /[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill|whatwg-url)[/\\]/,
+                        /[\\/]node_modules[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill|whatwg-url)[/\\]/,
                     ],
                     use: [
                         {
@@ -332,6 +334,7 @@ async function getCommonConfig(wco) {
             asyncWebAssembly: true,
         },
         infrastructureLogging: {
+            debug: verbose,
             level: verbose ? 'verbose' : 'error',
         },
         stats: (0, helpers_1.getStatsOptions)(verbose),

package/src/webpack/configs/styles.js

@@ -98,16 +98,14 @@ function getStylesConfig(wco) {
         wco.logger.warn('Stylus usage is deprecated and will be removed in a future major version. ' +
             'To opt-out of the deprecated behaviour, please migrate to another stylesheet language.');
     }
-    const sassImplementation = getSassImplementation();
-    if (sassImplementation instanceof sass_service_1.SassWorkerImplementation) {
-        extraPlugins.push({
-            apply(compiler) {
-                compiler.hooks.shutdown.tap('sass-worker', () => {
-                    sassImplementation === null || sassImplementation === void 0 ? void 0 : sassImplementation.close();
-                });
-            },
-        });
-    }
+    const sassImplementation = new sass_service_1.SassWorkerImplementation();
+    extraPlugins.push({
+        apply(compiler) {
+            compiler.hooks.shutdown.tap('sass-worker', () => {
+                sassImplementation.close();
+            });
+        },
+    });
     const assetNameTemplate = (0, helpers_1.assetNameTemplateFactory)(hashFormat);
     const extraPostcssPlugins = [];
     // Attempt to setup Tailwind CSS
@@ -374,12 +372,3 @@ function getStylesConfig(wco) {
     };
 }
 exports.getStylesConfig = getStylesConfig;
-function getSassImplementation() {
-    const { webcontainer } = process.versions;
-    // When `webcontainer` is a truthy it means that we are running in a StackBlitz webcontainer.
-    // `SassWorkerImplementation` uses `receiveMessageOnPort` Node.js `worker_thread` API to ensure sync behavior which is ~2x faster.
-    // However, it is non trivial to support this in a webcontainer and while slower we choose to use `dart-sass`
-    // which in Webpack uses the slower async path.
-    // We should periodically check with StackBlitz folks (Mark Whitfeld / Dominic Elm) to determine if this workaround is still needed.
-    return webcontainer ? require('sass') : new sass_service_1.SassWorkerImplementation();
-}

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

@@ -40,10 +40,9 @@ export declare class NgBuildAnalyticsPlugin {
     protected _projectRoot: string;
     protected _analytics: analytics.Analytics;
     protected _category: string;
-    private aotEnabled;
     protected _built: boolean;
     protected _stats: AnalyticsBuildStats;
-    constructor(_projectRoot: string, _analytics: analytics.Analytics, _category: string, aotEnabled: boolean);
+    constructor(_projectRoot: string, _analytics: analytics.Analytics, _category: string);
     protected _reset(): void;
     protected _getMetrics(stats: Stats): (string | number)[];
     protected _getDimensions(): (string | number | boolean)[];

package/src/webpack/plugins/analytics.js

@@ -73,11 +73,10 @@ class AnalyticsBuildStats {
  * Analytics plugin that reports the analytics we want from the CLI.
  */
 class NgBuildAnalyticsPlugin {
-    constructor(_projectRoot, _analytics, _category, aotEnabled) {
+    constructor(_projectRoot, _analytics, _category) {
         this._projectRoot = _projectRoot;
         this._analytics = _analytics;
         this._category = _category;
-        this.aotEnabled = aotEnabled;
         this._built = false;
         this._stats = new AnalyticsBuildStats();
     }
@@ -108,7 +107,6 @@ class NgBuildAnalyticsPlugin {
             // Adding commas before and after so the regex are easier to define filters.
             dimensions[core_1.analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
         }
-        dimensions[core_1.analytics.NgCliAnalyticsDimensions.AotEnabled] = this.aotEnabled;
         return dimensions;
     }
     _reportBuildMetrics(stats) {

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

@@ -52,9 +52,10 @@ class CssOptimizerPlugin {
                         const cachedOutput = await cacheItem.getPromise();
                         if (cachedOutput) {
                             await this.addWarnings(compilation, cachedOutput.warnings);
-                            compilation.updateAsset(name, cachedOutput.source, {
+                            compilation.updateAsset(name, cachedOutput.source, (assetInfo) => ({
+                                ...assetInfo,
                                 minimized: true,
-                            });
+                            }));
                             continue;
                         }
                     }
@@ -65,7 +66,10 @@ class CssOptimizerPlugin {
                     const optimizedAsset = map
                         ? new SourceMapSource(code, name, map)
                         : new OriginalSource(code, name);
-                    compilation.updateAsset(name, optimizedAsset, { minimized: true });
+                    compilation.updateAsset(name, optimizedAsset, (assetInfo) => ({
+                        ...assetInfo,
+                        minimized: true,
+                    }));
                     await (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.storePromise({
                         source: optimizedAsset,
                         warnings,

package/src/webpack/plugins/javascript-optimizer-plugin.js

@@ -61,9 +61,10 @@ class JavaScriptOptimizerPlugin {
                         cacheItem = cache.getItemCache(name, eTag);
                         const cachedOutput = await cacheItem.getPromise();
                         if (cachedOutput) {
-                            compilation.updateAsset(name, cachedOutput.source, {
+                            compilation.updateAsset(name, cachedOutput.source, (assetInfo) => ({
+                                ...assetInfo,
                                 minimized: true,
-                            });
+                            }));
                             continue;
                         }
                     }
@@ -137,7 +138,10 @@ class JavaScriptOptimizerPlugin {
                             const optimizedAsset = map
                                 ? new SourceMapSource(code, name, map)
                                 : new OriginalSource(code, name);
-                            compilation.updateAsset(name, optimizedAsset, { minimized: true });
+                            compilation.updateAsset(name, optimizedAsset, (assetInfo) => ({
+                                ...assetInfo,
+                                minimized: true,
+                            }));
                             return cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.storePromise({
                                 source: optimizedAsset,
                             });

package/src/webpack/plugins/transfer-size-plugin.js

@@ -31,9 +31,10 @@ class TransferSizePlugin {
                     }
                     actions.push(brotliCompressAsync(scriptAsset.source.source())
                         .then((result) => {
-                        compilation.updateAsset(assetName, (s) => s, {
+                        compilation.updateAsset(assetName, (s) => s, (assetInfo) => ({
+                            ...assetInfo,
                             estimatedTransferSize: result.length,
-                        });
+                        }));
                     })
                         .catch((error) => {
                         compilation.warnings.push(new compilation.compiler.webpack.WebpackError(`Unable to calculate estimated transfer size for '${assetName}'. Reason: ${error.message}`));