@angular-devkit/build-angular 12.2.0-next.3 → 12.2.2

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "12.2.0-next.3",
+  "version": "12.2.2",
   "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.1202.0-next.3",
-    "@angular-devkit/build-optimizer": "0.1202.0-next.3",
-    "@angular-devkit/build-webpack": "0.1202.0-next.3",
-    "@angular-devkit/core": "12.2.0-next.3",
+    "@angular-devkit/architect": "0.1202.2",
+    "@angular-devkit/build-optimizer": "0.1202.2",
+    "@angular-devkit/build-webpack": "0.1202.2",
+    "@angular-devkit/core": "12.2.2",
     "@babel/core": "7.14.8",
     "@babel/generator": "7.14.8",
     "@babel/helper-annotate-as-pure": "7.14.5",
@@ -22,7 +22,7 @@
     "@babel/template": "7.14.5",
     "@discoveryjs/json-ext": "0.5.3",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "12.2.0-next.3",
+    "@ngtools/webpack": "12.2.2",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.2",
     "browserslist": "^4.9.1",
@@ -30,11 +30,11 @@
     "caniuse-lite": "^1.0.30001032",
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "9.0.1",
-    "core-js": "3.15.2",
+    "core-js": "3.16.0",
     "critters": "0.0.10",
     "css-loader": "6.2.0",
     "css-minimizer-webpack-plugin": "3.0.2",
-    "esbuild": "0.12.15",
+    "esbuild": "0.12.17",
     "find-cache-dir": "3.3.1",
     "glob": "7.1.7",
     "https-proxy-agent": "5.0.0",
@@ -50,14 +50,14 @@
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.1.0",
-    "postcss": "8.3.5",
+    "postcss": "8.3.6",
     "postcss-import": "14.0.2",
     "postcss-loader": "6.1.1",
     "postcss-preset-env": "6.7.0",
-    "regenerator-runtime": "0.13.7",
+    "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "4.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.35.2",
+    "sass": "1.36.0",
     "sass-loader": "12.1.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.0",
@@ -70,18 +70,18 @@
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.0",
-    "webpack": "5.45.1",
+    "webpack": "5.50.0",
     "webpack-dev-middleware": "5.0.0",
     "webpack-dev-server": "3.11.2",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "1.5.2"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^12.0.0 || ^12.1.0-next",
-    "@angular/localize": "^12.0.0 || ^12.1.0-next",
-    "@angular/service-worker": "^12.0.0 || ^12.1.0-next",
+    "@angular/compiler-cli": "^12.0.0",
+    "@angular/localize": "^12.0.0",
+    "@angular/service-worker": "^12.0.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^12.0.0 || ^12.1.0-next",
+    "ng-packagr": "^12.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0",
     "tslint": "^6.1.0",

package/src/app-shell/index.js

@@ -130,10 +130,9 @@ async function _appShellBuilder(options, context) {
     });
     let spinner;
     try {
-        // Using `.result` instead of `.output` causes Webpack FS cache not to be created.
         const [browserResult, serverResult] = await Promise.all([
-            browserTargetRun.output.toPromise(),
-            serverTargetRun.output.toPromise(),
+            browserTargetRun.result,
+            serverTargetRun.result,
         ]);
         if (browserResult.success === false || browserResult.baseOutputPath === undefined) {
             return browserResult;
@@ -152,8 +151,7 @@ async function _appShellBuilder(options, context) {
         return { success: false, error: err.message };
     }
     finally {
-        // workaround for [tsetse] All Promises in async functions must either be awaited or used in an expression.
-        const _ = Promise.all([browserTargetRun.stop(), serverTargetRun.stop()]);
+        await Promise.all([browserTargetRun.stop(), serverTargetRun.stop()]);
     }
 }
 exports.default = architect_1.createBuilder(_appShellBuilder);

package/src/babel/plugins/adjust-static-class-members.js

@@ -73,7 +73,9 @@ function canWrapProperty(propertyName, assignmentValue) {
     const { leadingComments } = assignmentValue.node;
     if (leadingComments === null || leadingComments === void 0 ? void 0 : leadingComments.some(
     // `@pureOrBreakMyCode` is used by closure and is present in Angular code
-    ({ value }) => value.includes('#__PURE__') || value.includes('@pureOrBreakMyCode'))) {
+    ({ value }) => value.includes('@__PURE__') ||
+        value.includes('#__PURE__') ||
+        value.includes('@pureOrBreakMyCode'))) {
         return true;
     }
     return assignmentValue.isPure();

package/src/babel/webpack-loader.js

@@ -53,7 +53,11 @@ exports.default = babel_loader_1.custom(() => {
                     // TypeScript files will have already been downlevelled
                     customOptions.forceES5 = !/\.tsx?$/.test(this.resourcePath);
                 }
-                else if (esTarget >= typescript_1.ScriptTarget.ES2017) {
+                else if (esTarget >= typescript_1.ScriptTarget.ES2017 || /\.[cm]?js$/.test(this.resourcePath)) {
+                    // Application code (TS files) will only contain native async if target is ES2017+.
+                    // However, third-party libraries can regardless of the target option.
+                    // APF packages with code in [f]esm2015 directories is downlevelled to ES2015 and
+                    // will not have native async.
                     customOptions.forceAsyncTransformation =
                         !/[\\\/][_f]?esm2015[\\\/]/.test(this.resourcePath) && source.includes('async');
                 }

package/src/webpack/configs/common.js

@@ -171,7 +171,7 @@ function getCommonConfig(wco) {
     }
     // process asset entries
     if (buildOptions.assets.length) {
-        const copyWebpackPluginPatterns = buildOptions.assets.map((asset) => {
+        const copyWebpackPluginPatterns = buildOptions.assets.map((asset, index) => {
             // Resolve input paths relative to workspace root and add slash at the end.
             // eslint-disable-next-line prefer-const
             let { input, output, ignore = [], glob } = asset;
@@ -201,6 +201,7 @@ function getCommonConfig(wco) {
                         ...ignore,
                     ].map((i) => path.posix.join(input, i)),
                 },
+                priority: index,
             };
         });
         extraPlugins.push(new copy_webpack_plugin_1.default({
@@ -249,9 +250,19 @@ function getCommonConfig(wco) {
     if (scriptsSourceMap || stylesSourceMap) {
         extraRules.push({
             test: /\.m?js$/,
-            exclude: vendorSourceMap ? undefined : /[\\\/]node_modules[\\\/]/,
             enforce: 'pre',
             loader: require.resolve('source-map-loader'),
+            options: {
+                filterSourceMappingUrl: (_mapUri, resourcePath) => {
+                    if (vendorSourceMap) {
+                        // Consume all sourcemaps when vendor option is enabled.
+                        return true;
+                    }
+                    // Don't consume sourcemaps in node_modules when vendor is disabled.
+                    // But, do consume local libraries sourcemaps.
+                    return !resourcePath.includes('node_modules');
+                },
+            },
         });
     }
     let buildOptimizerUseRule = [];

package/src/webpack/configs/styles.js

@@ -261,6 +261,7 @@ function getStylesConfig(wco) {
             ],
         };
         const globalBundlesRegExp = new RegExp(`^(${Object.keys(entryPoints).join('|')})(\.[0-9a-f]{20})?.css$`);
+        const target = transformSupportedBrowsersToTargets(supportedBrowsers);
         extraMinimizers.push(
         // Component styles use esbuild which is faster and generates smaller files on average.
         // esbuild does not yet support style sourcemaps but component style sourcemaps are not
@@ -276,6 +277,7 @@ function getStylesConfig(wco) {
                     loader: 'css',
                     minify: true,
                     sourcefile,
+                    target,
                 });
                 return {
                     code,
@@ -432,3 +434,15 @@ function getStylesConfig(wco) {
     };
 }
 exports.getStylesConfig = getStylesConfig;
+function transformSupportedBrowsersToTargets(supportedBrowsers) {
+    const transformed = [];
+    // https://esbuild.github.io/api/#target
+    const esBuildSupportedBrowsers = new Set(['safari', 'firefox', 'edge', 'chrome', 'ios']);
+    for (const browser of supportedBrowsers) {
+        const [browserName, version] = browser.split(' ');
+        if (esBuildSupportedBrowsers.has(browserName)) {
+            transformed.push(browserName + version);
+        }
+    }
+    return transformed.length ? transformed : undefined;
+}

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

@@ -49,28 +49,30 @@ class JavaScriptOptimizerPlugin {
                         continue;
                     }
                     const scriptAsset = compilation.getAsset(assetName);
-                    if (scriptAsset && !scriptAsset.info.minimized) {
-                        const { source: scriptAssetSource, name } = scriptAsset;
-                        let cacheItem;
-                        if (cache) {
-                            const eTag = cache.getLazyHashedEtag(scriptAssetSource);
-                            cacheItem = cache.getItemCache(name, eTag);
-                            const cachedOutput = await cacheItem.getPromise();
-                            if (cachedOutput) {
-                                compilation.updateAsset(name, cachedOutput.source, {
-                                    minimized: true,
-                                });
-                                continue;
-                            }
+                    // Skip assets that have already been optimized or are verbatim copies (project assets)
+                    if (!scriptAsset || scriptAsset.info.minimized || scriptAsset.info.copied) {
+                        continue;
+                    }
+                    const { source: scriptAssetSource, name } = scriptAsset;
+                    let cacheItem;
+                    if (cache) {
+                        const eTag = cache.getLazyHashedEtag(scriptAssetSource);
+                        cacheItem = cache.getItemCache(name, eTag);
+                        const cachedOutput = await cacheItem.getPromise();
+                        if (cachedOutput) {
+                            compilation.updateAsset(name, cachedOutput.source, {
+                                minimized: true,
+                            });
+                            continue;
                         }
-                        const { source, map } = scriptAssetSource.sourceAndMap();
-                        scriptsToOptimize.push({
-                            name: scriptAsset.name,
-                            code: typeof source === 'string' ? source : source.toString(),
-                            map,
-                            cacheItem,
-                        });
                     }
+                    const { source, map } = scriptAssetSource.sourceAndMap();
+                    scriptsToOptimize.push({
+                        name: scriptAsset.name,
+                        code: typeof source === 'string' ? source : source.toString(),
+                        map,
+                        cacheItem,
+                    });
                 }
                 if (scriptsToOptimize.length === 0) {
                     return;

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

@@ -40,7 +40,9 @@ async function default_1({ asset, options }) {
         if (terserResult.map) {
             partialSourcemaps.unshift(terserResult.map);
         }
-        partialSourcemaps.push(asset.map);
+        if (asset.map) {
+            partialSourcemaps.push(asset.map);
+        }
         fullSourcemap = remapping_1.default(partialSourcemaps, () => null);
     }
     return { name: asset.name, code: terserResult.code, map: fullSourcemap };

package/src/webpack/utils/async-chunks.js

@@ -21,7 +21,7 @@ function markAsyncChunksNonInitial(webpackStats, extraEntryPoints) {
     // depended upon in Webpack, thus any extra entry point with `inject: false`,
     // **cannot** be loaded in main bundle.
     const asyncChunkIds = extraEntryPoints
-        .filter((entryPoint) => !entryPoint.inject)
+        .filter((entryPoint) => !entryPoint.inject && entryPoints[entryPoint.bundleName])
         .flatMap((entryPoint) => { var _a; return (_a = entryPoints[entryPoint.bundleName].chunks) === null || _a === void 0 ? void 0 : _a.filter((n) => n !== 'runtime'); });
     // Find chunks for each ID.
     const asyncChunks = asyncChunkIds.map((chunkId) => {