@angular-devkit/build-angular 14.1.0 → 14.1.1

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.1.0",
+  "version": "14.1.1",
   "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",
-    "@angular-devkit/build-webpack": "0.1401.0",
-    "@angular-devkit/core": "14.1.0",
+    "@angular-devkit/architect": "0.1401.1",
+    "@angular-devkit/build-webpack": "0.1401.1",
+    "@angular-devkit/core": "14.1.1",
     "@babel/core": "7.18.6",
     "@babel/generator": "7.18.7",
     "@babel/helper-annotate-as-pure": "7.18.6",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.18.6",
     "@babel/template": "7.18.6",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.1.0",
+    "@ngtools/webpack": "14.1.1",
     "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

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/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 };
 }