@angular-devkit/build-angular 13.3.6 → 13.3.7

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.3.6",
+  "version": "13.3.7",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1303.6",
-    "@angular-devkit/build-webpack": "0.1303.6",
-    "@angular-devkit/core": "13.3.6",
+    "@angular-devkit/architect": "0.1303.7",
+    "@angular-devkit/build-webpack": "0.1303.7",
+    "@angular-devkit/core": "13.3.7",
     "@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.6",
+    "@ngtools/webpack": "13.3.7",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

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

@@ -30,11 +30,13 @@ class CssOptimizerPlugin {
     apply(compiler) {
         const { OriginalSource, SourceMapSource } = compiler.webpack.sources;
         compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+            const logger = compilation.getLogger('build-angular.CssOptimizerPlugin');
             compilation.hooks.processAssets.tapPromise({
                 name: PLUGIN_NAME,
                 stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
             }, async (compilationAssets) => {
                 const cache = compilation.options.cache && compilation.getCache(PLUGIN_NAME);
+                logger.time('optimize css assets');
                 for (const assetName of Object.keys(compilationAssets)) {
                     if (!/\.(?:css|scss|sass|less|styl)$/.test(assetName)) {
                         continue;
@@ -51,6 +53,7 @@ class CssOptimizerPlugin {
                         cacheItem = cache.getItemCache(name, eTag);
                         const cachedOutput = await cacheItem.getPromise();
                         if (cachedOutput) {
+                            logger.debug(`${name} restored from cache`);
                             await this.addWarnings(compilation, cachedOutput.warnings);
                             compilation.updateAsset(name, cachedOutput.source, (assetInfo) => ({
                                 ...assetInfo,
@@ -61,7 +64,10 @@ class CssOptimizerPlugin {
                     }
                     const { source, map: inputMap } = styleAssetSource.sourceAndMap();
                     const input = typeof source === 'string' ? source : source.toString();
+                    const optimizeAssetLabel = `optimize asset: ${asset.name}`;
+                    logger.time(optimizeAssetLabel);
                     const { code, warnings, map } = await this.optimize(input, asset.name, inputMap, this.targets);
+                    logger.timeEnd(optimizeAssetLabel);
                     await this.addWarnings(compilation, warnings);
                     const optimizedAsset = map
                         ? new SourceMapSource(code, name, map)
@@ -75,6 +81,7 @@ class CssOptimizerPlugin {
                         warnings,
                     }));
                 }
+                logger.timeEnd('optimize css assets');
             });
         });
     }

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

@@ -38,10 +38,12 @@ class JavaScriptOptimizerPlugin {
     apply(compiler) {
         const { OriginalSource, SourceMapSource } = compiler.webpack.sources;
         compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+            const logger = compilation.getLogger('build-angular.JavaScriptOptimizerPlugin');
             compilation.hooks.processAssets.tapPromise({
                 name: PLUGIN_NAME,
                 stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
             }, async (compilationAssets) => {
+                logger.time('optimize js assets');
                 const scriptsToOptimize = [];
                 const cache = compilation.options.cache && compilation.getCache('JavaScriptOptimizerPlugin');
                 // Analyze the compilation assets for scripts that require optimization
@@ -61,6 +63,7 @@ class JavaScriptOptimizerPlugin {
                         cacheItem = cache.getItemCache(name, eTag);
                         const cachedOutput = await cacheItem.getPromise();
                         if (cachedOutput) {
+                            logger.debug(`${name} restored from cache`);
                             compilation.updateAsset(name, cachedOutput.source, (assetInfo) => ({
                                 ...assetInfo,
                                 minimized: true,
@@ -125,6 +128,7 @@ class JavaScriptOptimizerPlugin {
                 try {
                     const tasks = [];
                     for (const { name, code, map, cacheItem } of scriptsToOptimize) {
+                        logger.time(`optimize asset: ${name}`);
                         tasks.push(workerPool
                             .run({
                             asset: {
@@ -142,6 +146,7 @@ class JavaScriptOptimizerPlugin {
                                 ...assetInfo,
                                 minimized: true,
                             }));
+                            logger.timeEnd(`optimize asset: ${name}`);
                             return cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.storePromise({
                                 source: optimizedAsset,
                             });
@@ -155,6 +160,7 @@ class JavaScriptOptimizerPlugin {
                 finally {
                     void workerPool.destroy();
                 }
+                logger.timeEnd('optimize js assets');
             });
         });
     }