@angular/build 20.0.0-next.2 → 20.0.0-next.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "20.0.0-next.2",
+  "version": "20.0.0-next.4",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,16 +23,15 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.2000.0-next.2",
+    "@angular-devkit/architect": "0.2000.0-next.4",
     "@babel/core": "7.26.10",
     "@babel/helper-annotate-as-pure": "7.25.9",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@babel/plugin-syntax-import-attributes": "7.26.0",
     "@inquirer/confirm": "5.1.8",
     "@vitejs/plugin-basic-ssl": "2.0.0",
     "beasties": "0.2.0",
     "browserslist": "^4.23.0",
-    "esbuild": "0.25.1",
+    "esbuild": "0.25.2",
     "https-proxy-agent": "7.0.6",
     "istanbul-lib-instrument": "6.0.3",
     "jsonc-parser": "3.3.1",
@@ -42,12 +41,12 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.9.2",
-    "rollup": "4.36.0",
-    "sass": "1.86.0",
+    "rollup": "4.39.0",
+    "sass": "1.86.1",
     "semver": "7.7.1",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.12",
-    "vite": "6.2.2",
+    "vite": "6.2.4",
     "watchpack": "2.4.2"
   },
   "optionalDependencies": {
@@ -57,9 +56,10 @@
     "@angular/compiler": "^20.0.0 || ^20.0.0-next.0",
     "@angular/compiler-cli": "^20.0.0 || ^20.0.0-next.0",
     "@angular/localize": "^20.0.0 || ^20.0.0-next.0",
+    "@angular/platform-browser": "^20.0.0 || ^20.0.0-next.0",
     "@angular/platform-server": "^20.0.0 || ^20.0.0-next.0",
     "@angular/service-worker": "^20.0.0 || ^20.0.0-next.0",
-    "@angular/ssr": "^20.0.0-next.2",
+    "@angular/ssr": "^20.0.0-next.4",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^20.0.0 || ^20.0.0-next.0",
@@ -71,6 +71,9 @@
     "@angular/localize": {
       "optional": true
     },
+    "@angular/platform-browser": {
+      "optional": true
+    },
     "@angular/platform-server": {
       "optional": true
     },
@@ -102,7 +105,7 @@
   },
   "packageManager": "pnpm@9.15.6",
   "engines": {
-    "node": "^20.11.1 || >=22.0.0",
+    "node": "^20.11.1 || >=22.11.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/src/builders/application/index.js

@@ -27,6 +27,7 @@ const build_action_1 = require("./build-action");
 const execute_build_1 = require("./execute-build");
 const options_1 = require("./options");
 const results_1 = require("./results");
+const isNodeV22orHigher = Number(process.versions.node.split('.', 1)[0]) >= 22;
 async function* buildApplicationInternal(options, 
 // TODO: Integrate abort signal support into builder system
 context, extensions) {
@@ -162,7 +163,18 @@ async function* buildApplication(options, context, extensions) {
             }
             else {
                 // Copy file contents
-                await promises_1.default.copyFile(file.inputPath, fullFilePath, promises_1.default.constants.COPYFILE_FICLONE);
+                if (isNodeV22orHigher) {
+                    // Use newer `cp` API on Node.js 22+ (minimum v22 for CLI is 22.11)
+                    await promises_1.default.cp(file.inputPath, fullFilePath, {
+                        mode: promises_1.default.constants.COPYFILE_FICLONE,
+                        preserveTimestamps: true,
+                    });
+                }
+                else {
+                    // For Node.js 20 use `copyFile` (`cp` is not stable for v20)
+                    // TODO: Remove when Node.js 20 is no longer supported
+                    await promises_1.default.copyFile(file.inputPath, fullFilePath, promises_1.default.constants.COPYFILE_FICLONE);
+                }
             }
         });
         // Delete any removed files if incremental

package/src/builders/application/options.d.ts

@@ -203,6 +203,8 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     };
     templateUpdates: boolean;
     incrementalResults: boolean;
+    customConditions: string[] | undefined;
+    frameworkVersion: string;
 }>;
 export declare function getLocaleBaseHref(baseHref: string | undefined, i18n: NormalizedApplicationBuildOptions['i18nOptions'], locale: string): string | undefined;
 export {};

package/src/builders/application/options.js

@@ -132,12 +132,12 @@ async function normalizeOptions(context, projectName, options, extensions) {
         ? undefined
         : await getTailwindConfig(searchDirectories, workspaceRoot, context);
     let serverEntryPoint;
-    if (options.server) {
+    if (typeof options.server === 'string') {
+        if (options.server === '') {
+            throw new Error('The "server" option cannot be an empty string.');
+        }
         serverEntryPoint = node_path_1.default.join(workspaceRoot, options.server);
     }
-    else if (options.server === '') {
-        throw new Error('The "server" option cannot be an empty string.');
-    }
     let prerenderOptions;
     if (options.prerender) {
         const { discoverRoutes = true, routesFile = undefined } = options.prerender === true ? {} : options.prerender;
@@ -163,7 +163,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
             route: 'shell',
         };
     }
-    const outputPath = options.outputPath;
+    const outputPath = options.outputPath ?? node_path_1.default.join(workspaceRoot, 'dist', projectName);
     const outputOptions = {
         browser: 'browser',
         server: 'server',
@@ -191,12 +191,18 @@ async function normalizeOptions(context, projectName, options, extensions) {
     let indexHtmlOptions;
     // index can never have a value of `true` but in the schema it's of type `boolean`.
     if (typeof options.index !== 'boolean') {
+        let indexInput;
         let indexOutput;
         // The output file will be created within the configured output path
         if (typeof options.index === 'string') {
-            indexOutput = options.index;
+            indexInput = indexOutput = node_path_1.default.join(workspaceRoot, options.index);
+        }
+        else if (typeof options.index === 'undefined') {
+            indexInput = node_path_1.default.join(projectSourceRoot, 'index.html');
+            indexOutput = 'index.html';
         }
         else {
+            indexInput = node_path_1.default.join(workspaceRoot, options.index.input);
             indexOutput = options.index.output || 'index.html';
         }
         /**
@@ -214,7 +220,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
                 ? exports.INDEX_HTML_CSR
                 : indexBaseName;
         indexHtmlOptions = {
-            input: node_path_1.default.join(workspaceRoot, typeof options.index === 'string' ? options.index : options.index.input),
+            input: indexInput,
             output: indexOutput,
             insertionOrder: [
                 ['polyfills', true],
@@ -312,6 +318,8 @@ async function normalizeOptions(context, projectName, options, extensions) {
         security,
         templateUpdates: !!options.templateUpdates,
         incrementalResults: !!options.incrementalResults,
+        customConditions: options.conditions,
+        frameworkVersion: await findFrameworkVersion(projectRoot),
     };
 }
 async function getTailwindConfig(searchDirectories, workspaceRoot, context) {
@@ -470,3 +478,18 @@ function normalizeExternals(value) {
     }
     return [...new Set(value.map((d) => (d.endsWith('/*') ? d.slice(0, -2) : d)))];
 }
+async function findFrameworkVersion(projectRoot) {
+    // Create a custom require function for ESM compliance.
+    // NOTE: The trailing slash is significant.
+    const projectResolve = (0, node_module_1.createRequire)(projectRoot + '/').resolve;
+    try {
+        const manifestPath = projectResolve('@angular/core/package.json');
+        const manifestData = await (0, promises_1.readFile)(manifestPath, 'utf-8');
+        const manifestObject = JSON.parse(manifestData);
+        const version = manifestObject.version;
+        return version;
+    }
+    catch {
+        throw new Error('Error: It appears that "@angular/core" is missing as a dependency. Please ensure it is included in your project.');
+    }
+}

package/src/builders/application/schema.d.ts

@@ -37,6 +37,13 @@ export type Schema = {
      * Automatically clear the terminal screen during rebuilds.
      */
     clearScreen?: boolean;
+    /**
+     * Custom package resolution conditions used to resolve conditional exports/imports.
+     * Defaults to ['module', 'development'/'production']. The following special conditions are
+     * always present if the requirements are satisfied: 'default', 'import', 'require',
+     * 'browser', 'node'.
+     */
+    conditions?: string[];
     /**
      * Define the crossorigin attribute setting of elements that provide CORS support.
      */
@@ -86,7 +93,7 @@ export type Schema = {
     /**
      * Configures the generation of the application's HTML index.
      */
-    index: IndexUnion;
+    index?: IndexUnion;
     /**
      * The stylesheet language to use for the application's inline component styles.
      */
@@ -128,7 +135,7 @@ export type Schema = {
     /**
      * Specify the output path relative to workspace root.
      */
-    outputPath: OutputPathUnion;
+    outputPath?: OutputPathUnion;
     /**
      * Enable and define the file watching poll time period in milliseconds.
      */
@@ -163,11 +170,11 @@ export type Schema = {
      * The full path for the server entry point to the application, relative to the current
      * workspace.
      */
-    server?: string;
+    server?: Serv;
     /**
      * Generates a service worker configuration.
      */
-    serviceWorker?: ServiceWorker;
+    serviceWorker?: Serv;
     /**
      * Output source maps for scripts and styles. For more information, see
      * https://angular.dev/reference/configs/workspace-config#source-map-configuration.
@@ -496,9 +503,12 @@ export type AutoCspClass = {
     unsafeEval?: boolean;
 };
 /**
+ * The full path for the server entry point to the application, relative to the current
+ * workspace.
+ *
  * Generates a service worker configuration.
  */
-export type ServiceWorker = boolean | string;
+export type Serv = boolean | string;
 /**
  * Output source maps for scripts and styles. For more information, see
  * https://angular.dev/reference/configs/workspace-config#source-map-configuration.
@@ -513,6 +523,10 @@ export type SourceMapClass = {
      * Output source maps for all scripts.
      */
     scripts?: boolean;
+    /**
+     * Output original source content for files within the source map.
+     */
+    sourcesContent?: boolean;
     /**
      * Output source maps for all styles.
      */

package/src/builders/application/schema.json

@@ -17,7 +17,6 @@
       "description": "The full path for the browser entry point to the application, relative to the current workspace."
     },
     "server": {
-      "type": "string",
       "description": "The full path for the server entry point to the application, relative to the current workspace.",
       "oneOf": [
         {
@@ -293,6 +292,13 @@
         "type": "string"
       }
     },
+    "conditions": {
+      "description": "Custom package resolution conditions used to resolve conditional exports/imports. Defaults to ['module', 'development'/'production']. The following special conditions are always present if the requirements are satisfied: 'default', 'import', 'require', 'browser', 'node'.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
     "fileReplacements": {
       "description": "Replace compilation source files with other compilation source files in the build.",
       "type": "array",
@@ -370,6 +376,11 @@
               "type": "boolean",
               "description": "Resolve vendor packages source maps.",
               "default": false
+            },
+            "sourcesContent": {
+              "type": "boolean",
+              "description": "Output original source content for files within the source map.",
+              "default": true
             }
           },
           "additionalProperties": false
@@ -605,7 +616,7 @@
     }
   },
   "additionalProperties": false,
-  "required": ["outputPath", "index", "browser", "tsConfig"],
+  "required": ["browser", "tsConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [

package/src/builders/application/setup-bundling.js

@@ -86,6 +86,7 @@ function createComponentStyleBundler(options, target) {
         // the same as being disabled. Disabling has the advantage of avoiding the overhead
         // of sourcemap processing.
         sourcemapOptions.styles && !sourcemapOptions.hidden ? 'linked' : false,
+        sourcesContent: sourcemapOptions.sourcesContent,
         outputNames,
         includePaths: stylePreprocessorOptions?.includePaths,
         // string[] | undefined' is not assignable to type '(Version | DeprecationOrId)[] | undefined'.

package/src/builders/dev-server/vite-server.js

@@ -121,12 +121,6 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
     // This will also replace file-based/inline styles as code if external runtime styles are not enabled.
     browserOptions.templateUpdates =
         serverOptions.liveReload && serverOptions.hmr && environment_options_1.useComponentTemplateHmr;
-    if (browserOptions.templateUpdates) {
-        context.logger.warn('Component HMR has been enabled.\n' +
-            'If you encounter application reload issues, you can manually reload the page to bypass HMR and/or disable this feature with the' +
-            ' `--no-hmr` command line option.\n' +
-            'Please consider reporting any issues you encounter here: https://github.com/angular/angular-cli/issues\n');
-    }
     browserOptions.incrementalResults = true;
     // Setup the prebundling transformer that will be shared across Vite prebundling requests
     const prebundleTransformer = new internal_1.JavaScriptTransformer(

package/src/builders/karma/application_builder.js

@@ -54,6 +54,7 @@ const results_1 = require("../application/results");
 const schema_1 = require("../application/schema");
 const find_tests_1 = require("./find-tests");
 const localResolve = (0, node_module_1.createRequire)(__filename).resolve;
+const isWindows = process.platform === 'win32';
 class ApplicationBuildError extends Error {
     constructor(message) {
         super(message);
@@ -74,7 +75,13 @@ class AngularAssetsMiddleware {
         let err = null;
         try {
             const url = new URL(`http://${req.headers['host']}${req.url}`);
-            const file = this.latestBuildFiles.files[url.pathname.slice(1)];
+            // Remove the leading slash from the URL path and convert to platform specific.
+            // The latest build files will use the platform path separator.
+            let pathname = url.pathname.slice(1);
+            if (isWindows) {
+                pathname = pathname.replaceAll(path.posix.sep, path.win32.sep);
+            }
+            const file = this.latestBuildFiles.files[pathname];
             if (file?.origin === 'disk') {
                 this.serveFile(file.inputPath, undefined, res);
                 return;
@@ -288,6 +295,7 @@ async function collectEntrypoints(options, context, projectSourceRoot) {
     const testFiles = await (0, find_tests_1.findTests)(options.include ?? [], options.exclude ?? [], context.workspaceRoot, projectSourceRoot);
     return (0, find_tests_1.getTestEntrypoints)(testFiles, { projectSourceRoot, workspaceRoot: context.workspaceRoot });
 }
+// eslint-disable-next-line max-lines-per-function
 async function initializeApplication(options, context, karmaOptions, transforms = {}) {
     const outputPath = path.join(context.workspaceRoot, 'dist/test-out', (0, node_crypto_1.randomUUID)());
     const projectSourceRoot = await getProjectSourceRoot(context);
@@ -399,6 +407,14 @@ async function initializeApplication(options, context, karmaOptions, transforms
         karmaOptions.files.push({ pattern: `*.css`, type: 'css', watched: false });
     }
     const parsedKarmaConfig = await karma.config.parseConfig(options.karmaConfig && path.resolve(context.workspaceRoot, options.karmaConfig), transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions, { promiseConfig: true, throwErrors: true });
+    // Check for jsdom which does not support executing ESM scripts.
+    // If present, remove jsdom and issue a warning.
+    const updatedBrowsers = parsedKarmaConfig.browsers?.filter((browser) => browser !== 'jsdom');
+    if (parsedKarmaConfig.browsers?.length !== updatedBrowsers?.length) {
+        parsedKarmaConfig.browsers = updatedBrowsers;
+        context.logger.warn(`'jsdom' does not support ESM code execution and cannot be used for karma testing.` +
+            ` The 'jsdom' entry has been removed from the 'browsers' option.`);
+    }
     // Remove the webpack plugin/framework:
     // Alternative would be to make the Karma plugin "smart" but that's a tall order
     // with managing unneeded imports etc..

package/src/builders/karma/index.js

@@ -76,7 +76,7 @@ function getBaseKarmaOptions(options, context) {
     karmaOptions.client.clearContext ??= singleRun ?? false; // `singleRun` defaults to `false` per Karma docs.
     // Convert browsers from a string to an array
     if (typeof options.browsers === 'string' && options.browsers) {
-        karmaOptions.browsers = options.browsers.split(',');
+        karmaOptions.browsers = options.browsers.split(',').map((browser) => browser.trim());
     }
     else if (options.browsers === false) {
         karmaOptions.browsers = [];

package/src/builders/karma/polyfills/init_test_bed.js

@@ -7,13 +7,10 @@
  */
 
 import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
+import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
 
 // Initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
+getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting(), {
   errorOnUnknownElements: true,
   errorOnUnknownProperties: true,
 });

package/src/tools/esbuild/application-code-bundle.js

@@ -382,7 +382,7 @@ function getEsBuildServerCommonOptions(options) {
     };
 }
 function getEsBuildCommonOptions(options) {
-    const { workspaceRoot, outExtension, optimizationOptions, sourcemapOptions, tsconfig, externalDependencies, outputNames, preserveSymlinks, jit, loaderExtensions, jsonLogs, i18nOptions, } = options;
+    const { workspaceRoot, outExtension, optimizationOptions, sourcemapOptions, tsconfig, externalDependencies, outputNames, preserveSymlinks, jit, loaderExtensions, jsonLogs, i18nOptions, customConditions, frameworkVersion, } = options;
     // Ensure unique hashes for i18n translation changes when using post-process inlining.
     // This hash value is added as a footer to each file and ensures that the output file names (with hashes)
     // change when translation files have changed. If this is not done the post processed files may have
@@ -393,18 +393,36 @@ function getEsBuildCommonOptions(options) {
         const i18nHash = Object.values(i18nOptions.locales).reduce((data, locale) => data + locale.files.map((file) => file.integrity || '').join('|'), '');
         footer = { js: `/**i18n:${(0, node_crypto_1.createHash)('sha256').update(i18nHash).digest('hex')}*/` };
     }
+    // Core conditions that are always included
+    const conditions = [
+        // Required to support rxjs 7.x which will use es5 code if this condition is not present
+        'es2015',
+        'es2020',
+    ];
+    // The pre-linked code is not used with JIT for two reasons:
+    // 1) The pre-linked code may not have the metadata included that is required for JIT
+    // 2) The CLI is otherwise setup to use runtime linking for JIT to match the application template compilation
+    if (!jit) {
+        // The pre-linked package condition is based on the framework version.
+        // Currently this is specific to each patch version of the framework.
+        conditions.push('angular:linked-' + frameworkVersion);
+    }
+    // Append custom conditions if present
+    if (customConditions) {
+        conditions.push(...customConditions);
+    }
+    else {
+        // Include default conditions
+        conditions.push('module');
+        conditions.push(optimizationOptions.scripts ? 'production' : 'development');
+    }
     return {
         absWorkingDir: workspaceRoot,
         format: 'esm',
         bundle: true,
         packages: 'bundle',
         assetNames: outputNames.media,
-        conditions: [
-            'es2020',
-            'es2015',
-            'module',
-            optimizationOptions.scripts ? 'production' : 'development',
-        ],
+        conditions,
         resolveExtensions: ['.ts', '.tsx', '.mjs', '.js', '.cjs'],
         metafile: true,
         legalComments: options.extractLicenses ? 'none' : 'eof',
@@ -416,6 +434,7 @@ function getEsBuildCommonOptions(options) {
         outdir: workspaceRoot,
         outExtension: outExtension ? { '.js': `.${outExtension}` } : undefined,
         sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
+        sourcesContent: sourcemapOptions.sourcesContent,
         splitting: true,
         chunkNames: options.namedChunks ? '[name]-[hash]' : 'chunk-[hash]',
         tsconfig,

package/src/tools/esbuild/global-styles.js

@@ -35,6 +35,7 @@ function createGlobalStylesBundleOptions(options, target, initial) {
             optimization: !!optimizationOptions.styles.minify,
             inlineFonts: !!optimizationOptions.fonts.inline,
             sourcemap: !!sourcemapOptions.styles && (sourcemapOptions.hidden ? 'external' : true),
+            sourcesContent: sourcemapOptions.sourcesContent,
             preserveSymlinks,
             target,
             externalDependencies,

package/src/tools/esbuild/javascript-transformer-worker.js

@@ -70,9 +70,7 @@ async function transformWithBabel(filename, data, options) {
     const shouldLink = !options.skipLinker && (await requiresLinking(filename, data));
     const useInputSourcemap = options.sourcemap &&
         (!!options.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(filename));
-    // @ts-expect-error Import attribute syntax plugin does not currently have type definitions
-    const { default: importAttributePlugin } = await Promise.resolve().then(() => __importStar(require('@babel/plugin-syntax-import-attributes')));
-    const plugins = [importAttributePlugin];
+    const plugins = [];
     if (options.instrumentForCoverage) {
         const { default: coveragePlugin } = await Promise.resolve().then(() => __importStar(require('../babel/plugins/add-code-coverage.js')));
         plugins.push(coveragePlugin);

package/src/tools/esbuild/stylesheets/bundle-options.d.ts

@@ -16,6 +16,7 @@ export interface BundleStylesheetOptions {
     inlineFonts: boolean;
     preserveSymlinks?: boolean;
     sourcemap: boolean | 'external' | 'inline' | 'linked';
+    sourcesContent?: boolean;
     outputNames: {
         bundles: string;
         media: string;

package/src/tools/esbuild/stylesheets/bundle-options.js

@@ -47,6 +47,7 @@ function createStylesheetBundleOptions(options, cache, inlineComponentData) {
         minify: options.optimization,
         metafile: true,
         sourcemap: options.sourcemap,
+        sourcesContent: options.sourcesContent,
         outdir: options.workspaceRoot,
         write: false,
         platform: 'browser',

package/src/tools/esbuild/utils.js

@@ -315,7 +315,7 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
     }
     return transformed;
 }
-const SUPPORTED_NODE_VERSIONS = '^20.11.1 || >=22.0.0';
+const SUPPORTED_NODE_VERSIONS = '^20.11.1 || >=22.11.0';
 /**
  * Transform supported Node.js versions to esbuild target.
  * @see https://esbuild.github.io/api/#target

package/src/tools/vite/middlewares/ssr-middleware.js

@@ -22,11 +22,12 @@ function createAngularSsrInternalMiddleware(server, indexHtmlTransformer) {
             // which must be processed by the runtime linker, even if they are not used.
             await (0, load_esm_1.loadEsmModule)('@angular/compiler');
             const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } = await (0, load_esm_1.loadEsmModule)('@angular/ssr/node');
-            // The following is necessary because accessing the module after invalidation may result in an empty module,
-            // which can trigger a `TypeError: ɵgetOrCreateAngularServerApp is not a function` error.
-            // TODO: look into why.
-            await server.ssrLoadModule('/main.server.mjs');
             const { ɵgetOrCreateAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs'));
+            // `ɵgetOrCreateAngularServerApp` can be undefined right after an error.
+            // See: https://github.com/angular/angular-cli/issues/29907
+            if (!ɵgetOrCreateAngularServerApp) {
+                return next();
+            }
             const angularServerApp = ɵgetOrCreateAngularServerApp({
                 allowStaticRouteRender: true,
             });

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '20.0.0-next.2';
+const VERSION = '20.0.0-next.4';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/utils/normalize-source-maps.js

@@ -13,10 +13,12 @@ function normalizeSourceMaps(sourceMap) {
     const styles = typeof sourceMap === 'object' ? sourceMap.styles : sourceMap;
     const hidden = (typeof sourceMap === 'object' && sourceMap.hidden) || false;
     const vendor = (typeof sourceMap === 'object' && sourceMap.vendor) || false;
+    const sourcesContent = typeof sourceMap === 'object' ? sourceMap.sourcesContent : sourceMap;
     return {
         vendor,
         hidden,
         scripts,
         styles,
+        sourcesContent,
     };
 }

package/src/utils/server-rendering/launch-server.js

@@ -34,7 +34,7 @@ async function launchServer() {
             // handle request
             if ((0, utils_1.isSsrNodeRequestHandler)(reqHandler)) {
                 await reqHandler(req, res, (e) => {
-                    throw e;
+                    throw e ?? new Error(`Unable to handle request: '${req.url}'.`);
                 });
             }
             else {

package/src/utils/server-rendering/prerender.js

@@ -54,7 +54,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
     // Get routes to prerender
     const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode, appShellRoute, } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => {
         return {
-            errors: [`An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err}`],
+            errors: [`An error occurred while extracting routes.\n\n${err.message ?? err.stack ?? err}`],
             serializedRouteTree: [],
             appShellRoute: undefined,
         };
@@ -150,7 +150,7 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
                 }
             })
                 .catch((err) => {
-                errors.push(`An error occurred while prerendering route '${route}'.\n\n${err.stack ?? err.message ?? err.code ?? err}`);
+                errors.push(`An error occurred while prerendering route '${route}'.\n\n${err.message ?? err.stack ?? err.code ?? err}`);
                 void renderWorker.destroy();
             });
             renderingPromises.push(renderResult);
@@ -222,7 +222,7 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         (0, error_1.assertIsError)(err);
         return {
             errors: [
-                `An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err.code ?? err}`,
+                `An error occurred while extracting routes.\n\n${err.message ?? err.stack ?? err.code ?? err}`,
             ],
             serializedRouteTree: [],
         };