@angular-devkit/build-angular 14.1.0-rc.3 → 14.2.0-next.0

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.1.0-rc.3",
+  "version": "14.2.0-next.0",
   "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.1401.0-rc.3",
-    "@angular-devkit/build-webpack": "0.1401.0-rc.3",
-    "@angular-devkit/core": "14.1.0-rc.3",
-    "@babel/core": "7.18.6",
-    "@babel/generator": "7.18.7",
+    "@angular-devkit/architect": "0.1402.0-next.0",
+    "@angular-devkit/build-webpack": "0.1402.0-next.0",
+    "@angular-devkit/core": "14.2.0-next.0",
+    "@babel/core": "7.18.10",
+    "@babel/generator": "7.18.10",
     "@babel/helper-annotate-as-pure": "7.18.6",
-    "@babel/plugin-proposal-async-generator-functions": "7.18.6",
+    "@babel/plugin-proposal-async-generator-functions": "7.18.10",
     "@babel/plugin-transform-async-to-generator": "7.18.6",
-    "@babel/plugin-transform-runtime": "7.18.6",
-    "@babel/preset-env": "7.18.6",
-    "@babel/runtime": "7.18.6",
-    "@babel/template": "7.18.6",
+    "@babel/plugin-transform-runtime": "7.18.10",
+    "@babel/preset-env": "7.18.10",
+    "@babel/runtime": "7.18.9",
+    "@babel/template": "7.18.10",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.1.0-rc.3",
+    "@ngtools/webpack": "14.2.0-next.0",
     "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -29,11 +29,11 @@
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.16",
     "css-loader": "6.7.1",
-    "esbuild-wasm": "0.14.48",
+    "esbuild-wasm": "0.14.53",
     "glob": "8.0.3",
     "https-proxy-agent": "5.0.1",
     "inquirer": "8.2.4",
-    "jsonc-parser": "3.0.0",
+    "jsonc-parser": "3.1.0",
     "karma-source-map-support": "1.4.0",
     "less": "4.1.3",
     "less-loader": "11.0.0",
@@ -47,30 +47,30 @@
     "piscina": "3.2.0",
     "postcss": "8.4.14",
     "postcss-import": "14.1.0",
-    "postcss-loader": "7.0.0",
+    "postcss-loader": "7.0.1",
     "postcss-preset-env": "7.7.2",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.53.0",
+    "sass": "1.54.1",
     "sass-loader": "13.0.2",
     "semver": "7.3.7",
     "source-map-loader": "4.0.0",
     "source-map-support": "0.5.21",
     "stylus": "0.58.1",
     "stylus-loader": "7.0.0",
-    "terser": "5.14.1",
+    "terser": "5.14.2",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.4.0",
-    "webpack": "5.73.0",
+    "webpack": "5.74.0",
     "webpack-dev-middleware": "5.3.3",
     "webpack-dev-server": "4.9.3",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.48"
+    "esbuild": "0.14.53"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",

package/src/builders/browser-esbuild/index.js

@@ -124,7 +124,11 @@ async function buildEsbuildBrowser(options, context) {
     // Process global stylesheets
     if (options.styles) {
         // resolveGlobalStyles is temporarily reused from the Webpack builder code
-        const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, configs_1.resolveGlobalStyles)(options.styles, workspaceRoot, !!options.preserveSymlinks);
+        const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, configs_1.resolveGlobalStyles)(options.styles, workspaceRoot, 
+        // preserveSymlinks is always true here to allow the bundler to handle the option
+        true, 
+        // skipResolution to leverage the bundler's more comprehensive resolution
+        true);
         for (const [name, files] of Object.entries(stylesheetEntrypoints)) {
             const virtualEntryData = files
                 .map((file) => `@import '${file.replace(/\\/g, '/')}';`)
@@ -135,6 +139,7 @@ async function buildEsbuildBrowser(options, context) {
                 sourcemap: !!sourcemapOptions.styles && (sourcemapOptions.hidden ? 'external' : true),
                 outputNames: noInjectNames.includes(name) ? { media: outputNames.media } : outputNames,
                 includePaths: (_e = options.stylePreprocessorOptions) === null || _e === void 0 ? void 0 : _e.includePaths,
+                preserveSymlinks: options.preserveSymlinks,
             });
             await (0, esbuild_1.logMessages)(context, sheetResult);
             if (!sheetResult.path) {
@@ -277,7 +282,7 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
             }),
         ],
         define: {
-            'ngDevMode': optimizationOptions.scripts ? 'false' : 'true',
+            ...(optimizationOptions.scripts ? { 'ngDevMode': 'false' } : undefined),
             'ngJitMode': 'false',
         },
     });

package/src/builders/browser-esbuild/stylesheets.js

@@ -50,8 +50,8 @@ async function bundleStylesheet(entry, options) {
         write: false,
         platform: 'browser',
         preserveSymlinks: options.preserveSymlinks,
-        conditions: ['style'],
-        mainFields: ['style'],
+        conditions: ['style', 'sass'],
+        mainFields: ['style', 'sass'],
         plugins: [
             (0, sass_plugin_1.createSassPlugin)({ sourcemap: !!options.sourcemap, includePaths: options.includePaths }),
         ],

package/src/utils/error.js

@@ -13,6 +13,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertIsError = void 0;
 const assert_1 = __importDefault(require("assert"));
 function assertIsError(value) {
-    (0, assert_1.default)(value instanceof Error, 'catch clause variable is not an Error instance');
+    const isError = value instanceof Error ||
+        // The following is needing to identify errors coming from RxJs.
+        (typeof value === 'object' && value && 'name' in value && 'message' in value);
+    (0, assert_1.default)(isError, 'catch clause variable is not an Error instance');
 }
 exports.assertIsError = assertIsError;

package/src/webpack/configs/common.js

@@ -43,12 +43,14 @@ const webpack_subresource_integrity_1 = require("webpack-subresource-integrity")
 const environment_options_1 = require("../../utils/environment-options");
 const load_esm_1 = require("../../utils/load-esm");
 const plugins_1 = require("../plugins");
+const devtools_ignore_plugin_1 = require("../plugins/devtools-ignore-plugin");
 const named_chunks_plugin_1 = require("../plugins/named-chunks-plugin");
 const progress_plugin_1 = require("../plugins/progress-plugin");
 const transfer_size_plugin_1 = require("../plugins/transfer-size-plugin");
 const typescript_2 = require("../plugins/typescript");
 const watch_files_logs_plugin_1 = require("../plugins/watch-files-logs-plugin");
 const helpers_1 = require("../utils/helpers");
+const VENDORS_TEST = /[\\/]node_modules[\\/]/;
 // eslint-disable-next-line max-lines-per-function
 async function getCommonConfig(wco) {
     var _a, _b;
@@ -132,6 +134,7 @@ async function getCommonConfig(wco) {
         if (stylesSourceMap) {
             include.push(/css$/);
         }
+        extraPlugins.push(new devtools_ignore_plugin_1.DevToolsIgnorePlugin());
         extraPlugins.push(new webpack_2.SourceMapDevToolPlugin({
             filename: '[file].map',
             include,
@@ -307,7 +310,7 @@ async function getCommonConfig(wco) {
                                 supportedBrowsers: buildOptions.supportedBrowsers,
                                 instrumentCode: codeCoverage
                                     ? {
-                                        includedBasePath: sourceRoot,
+                                        includedBasePath: sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : projectRoot,
                                         excludedPaths: (0, helpers_1.getInstrumentationExcludedPaths)(root, codeCoverageExclude),
                                     }
                                     : undefined,
@@ -355,7 +358,7 @@ async function getCommonConfig(wco) {
                         name: 'vendor',
                         chunks: (chunk) => chunk.name === 'main',
                         enforce: true,
-                        test: /[\\/]node_modules[\\/]/,
+                        test: VENDORS_TEST,
                     },
                 },
             },

package/src/webpack/configs/dev-server.js

@@ -98,6 +98,23 @@ async function getDevServerConfig(wco) {
                 publicPath: servePath,
                 stats: false,
             },
+            setupMiddlewares: (middlewares, _devServer) => {
+                // Temporary workaround for https://github.com/webpack/webpack-dev-server/issues/4180
+                middlewares.push({
+                    name: 'options-request-response',
+                    path: '*',
+                    middleware: (req, res, next) => {
+                        if (req.method === 'OPTIONS') {
+                            res.statusCode = 204;
+                            res.setHeader('Content-Length', 0);
+                            res.end();
+                            return;
+                        }
+                        next();
+                    },
+                });
+                return middlewares;
+            },
             liveReload,
             hot: hmr && !liveReload ? 'only' : hmr,
             proxy: await addProxyConfig(root, proxyConfig),

package/src/webpack/configs/styles.d.ts

@@ -8,7 +8,7 @@
 import { Configuration } from 'webpack';
 import { StyleElement } from '../../builders/browser/schema';
 import { WebpackConfigOptions } from '../../utils/build-options';
-export declare function resolveGlobalStyles(styleEntrypoints: StyleElement[], root: string, preserveSymlinks: boolean): {
+export declare function resolveGlobalStyles(styleEntrypoints: StyleElement[], root: string, preserveSymlinks: boolean, skipResolution?: boolean): {
     entryPoints: Record<string, string[]>;
     noInjectNames: string[];
     paths: string[];

package/src/webpack/configs/styles.js

@@ -41,7 +41,7 @@ const sass_service_1 = require("../../sass/sass-service");
 const plugins_1 = require("../plugins");
 const css_optimizer_plugin_1 = require("../plugins/css-optimizer-plugin");
 const helpers_1 = require("../utils/helpers");
-function resolveGlobalStyles(styleEntrypoints, root, preserveSymlinks) {
+function resolveGlobalStyles(styleEntrypoints, root, preserveSymlinks, skipResolution = false) {
     const entryPoints = {};
     const noInjectNames = [];
     const paths = [];
@@ -49,29 +49,32 @@ function resolveGlobalStyles(styleEntrypoints, root, preserveSymlinks) {
         return { entryPoints, noInjectNames, paths };
     }
     for (const style of (0, helpers_1.normalizeExtraEntryPoints)(styleEntrypoints, 'styles')) {
-        let resolvedPath = path.resolve(root, style.input);
-        if (!fs.existsSync(resolvedPath)) {
-            try {
-                resolvedPath = require.resolve(style.input, { paths: [root] });
+        let stylesheetPath = style.input;
+        if (!skipResolution) {
+            stylesheetPath = path.resolve(root, stylesheetPath);
+            if (!fs.existsSync(stylesheetPath)) {
+                try {
+                    stylesheetPath = require.resolve(style.input, { paths: [root] });
+                }
+                catch { }
             }
-            catch { }
         }
         if (!preserveSymlinks) {
-            resolvedPath = fs.realpathSync(resolvedPath);
+            stylesheetPath = fs.realpathSync(stylesheetPath);
         }
         // Add style entry points.
         if (entryPoints[style.bundleName]) {
-            entryPoints[style.bundleName].push(resolvedPath);
+            entryPoints[style.bundleName].push(stylesheetPath);
         }
         else {
-            entryPoints[style.bundleName] = [resolvedPath];
+            entryPoints[style.bundleName] = [stylesheetPath];
         }
         // Add non injected styles to the list.
         if (!style.inject) {
             noInjectNames.push(style.bundleName);
         }
         // Add global css paths.
-        paths.push(resolvedPath);
+        paths.push(stylesheetPath);
     }
     return { entryPoints, noInjectNames, paths };
 }

package/src/webpack/plugins/devtools-ignore-plugin.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+import { Compiler } from 'webpack';
+/**
+ * This plugin adds a field to source maps that identifies which sources are
+ * vendored or runtime-injected (aka third-party) sources. These are consumed by
+ * Chrome DevTools to automatically ignore-list sources.
+ */
+export declare class DevToolsIgnorePlugin {
+    apply(compiler: Compiler): void;
+}

package/src/webpack/plugins/devtools-ignore-plugin.js

@@ -0,0 +1,56 @@
+"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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DevToolsIgnorePlugin = void 0;
+const webpack_1 = require("webpack");
+// Following the naming conventions from
+// https://sourcemaps.info/spec.html#h.ghqpj1ytqjbm
+const IGNORE_LIST = 'x_google_ignoreList';
+const PLUGIN_NAME = 'devtools-ignore-plugin';
+/**
+ * This plugin adds a field to source maps that identifies which sources are
+ * vendored or runtime-injected (aka third-party) sources. These are consumed by
+ * Chrome DevTools to automatically ignore-list sources.
+ */
+class DevToolsIgnorePlugin {
+    apply(compiler) {
+        const { RawSource } = compiler.webpack.sources;
+        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.processAssets.tap({
+                name: PLUGIN_NAME,
+                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING,
+                additionalAssets: true,
+            }, (assets) => {
+                for (const [name, asset] of Object.entries(assets)) {
+                    // Instead of using `asset.map()` to fetch the source maps from
+                    // SourceMapSource assets, process them directly as a RawSource.
+                    // This is because `.map()` is slow and can take several seconds.
+                    if (!name.endsWith('.map')) {
+                        // Ignore non source map files.
+                        continue;
+                    }
+                    const mapContent = asset.source().toString();
+                    if (!mapContent) {
+                        continue;
+                    }
+                    const map = JSON.parse(mapContent);
+                    const ignoreList = [];
+                    for (const [index, path] of map.sources.entries()) {
+                        if (path.includes('/node_modules/') || path.startsWith('webpack/')) {
+                            ignoreList.push(index);
+                        }
+                    }
+                    map[IGNORE_LIST] = ignoreList;
+                    compilation.updateAsset(name, new RawSource(JSON.stringify(map)));
+                }
+            });
+        });
+    }
+}
+exports.DevToolsIgnorePlugin = DevToolsIgnorePlugin;

package/src/webpack/plugins/esbuild-executor.d.ts

@@ -41,6 +41,6 @@ export declare class EsbuildExecutor implements Pick<typeof import('esbuild'), '
      * Transitions an executor instance to use the WASM-variant of esbuild.
      */
     private useWasm;
-    transform(input: string, options?: TransformOptions): Promise<TransformResult>;
+    transform(input: string | Uint8Array, options?: TransformOptions): Promise<TransformResult>;
     formatMessages(messages: PartialMessage[], options: FormatMessagesOptions): Promise<string[]>;
 }