@angular-devkit/build-angular 17.3.0 → 18.0.0-next.0

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.3.0",
+  "version": "18.0.0-next.0",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1703.0",
-    "@angular-devkit/build-webpack": "0.1703.0",
-    "@angular-devkit/core": "17.3.0",
-    "@babel/core": "7.24.0",
-    "@babel/generator": "7.23.6",
+    "@angular-devkit/architect": "0.1800.0-next.0",
+    "@angular-devkit/build-webpack": "0.1800.0-next.0",
+    "@angular-devkit/core": "18.0.0-next.0",
+    "@babel/core": "7.24.3",
+    "@babel/generator": "7.24.1",
     "@babel/helper-annotate-as-pure": "7.22.5",
     "@babel/helper-split-export-declaration": "7.22.6",
-    "@babel/plugin-transform-async-generator-functions": "7.23.9",
-    "@babel/plugin-transform-async-to-generator": "7.23.3",
-    "@babel/plugin-transform-runtime": "7.24.0",
-    "@babel/preset-env": "7.24.0",
-    "@babel/runtime": "7.24.0",
+    "@babel/plugin-transform-async-generator-functions": "7.24.3",
+    "@babel/plugin-transform-async-to-generator": "7.24.1",
+    "@babel/plugin-transform-runtime": "7.24.3",
+    "@babel/preset-env": "7.24.3",
+    "@babel/runtime": "7.24.1",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.3.0",
+    "@ngtools/webpack": "18.0.0-next.0",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.18",
@@ -30,15 +30,15 @@
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.22",
     "css-loader": "6.10.0",
-    "esbuild-wasm": "0.20.1",
+    "esbuild-wasm": "0.20.2",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.4",
     "http-proxy-middleware": "2.0.6",
-    "inquirer": "9.2.15",
+    "inquirer": "9.2.16",
     "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
-    "less-loader": "11.1.0",
+    "less-loader": "12.2.0",
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.1",
     "magic-string": "0.30.8",
@@ -49,41 +49,41 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.1",
     "piscina": "4.4.0",
-    "postcss": "8.4.35",
+    "postcss": "8.4.37",
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.71.1",
+    "sass": "1.72.0",
     "sass-loader": "14.1.1",
     "semver": "7.6.0",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.29.1",
+    "terser": "5.29.2",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
-    "undici": "6.7.1",
-    "vite": "5.1.5",
-    "watchpack": "2.4.0",
-    "webpack": "5.90.3",
-    "webpack-dev-middleware": "6.1.1",
-    "webpack-dev-server": "4.15.1",
+    "undici": "6.9.0",
+    "vite": "5.2.2",
+    "watchpack": "2.4.1",
+    "webpack": "5.91.0",
+    "webpack-dev-middleware": "7.1.1",
+    "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.20.1"
+    "esbuild": "0.20.2"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^17.0.0",
-    "@angular/localize": "^17.0.0",
-    "@angular/platform-server": "^17.0.0",
-    "@angular/service-worker": "^17.0.0",
+    "@angular/compiler-cli": "^18.0.0-next.0",
+    "@angular/localize": "^18.0.0-next.0",
+    "@angular/platform-server": "^18.0.0-next.0",
+    "@angular/service-worker": "^18.0.0-next.0",
     "@web/test-runner": "^0.18.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^17.0.0",
+    "ng-packagr": "^18.0.0-next.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=5.2 <5.5"
@@ -135,7 +135,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^18.13.0 || >=20.9.0",
+    "node": "^18.19.1 || >=20.11.1",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/src/builders/app-shell/index.js

@@ -44,7 +44,7 @@ const spinner_1 = require("../../utils/spinner");
 async function _renderUniversal(options, context, browserResult, serverResult, spinner) {
     // Get browser target options.
     const browserTarget = (0, architect_1.targetFromTargetString)(options.browserTarget);
-    const rawBrowserOptions = (await context.getTargetOptions(browserTarget));
+    const rawBrowserOptions = await context.getTargetOptions(browserTarget);
     const browserBuilderName = await context.getBuilderNameForTarget(browserTarget);
     const browserOptions = await context.validateOptions(rawBrowserOptions, browserBuilderName);
     // Locate zone.js to load in the render worker

package/src/builders/application/build-action.d.ts

@@ -5,17 +5,17 @@
  * 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 { BuilderOutput } from '@angular-devkit/architect';
-import type { logging } from '@angular-devkit/core';
+import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import { BuildOutputFile } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedCachedOptions } from '../../utils/normalize-cache';
 import { NormalizedOutputOptions } from './options';
+type BuildActionOutput = (ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput;
 export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildState) => Promise<ExecutionResult>, options: {
     workspaceRoot: string;
     projectRoot: string;
     outputOptions: NormalizedOutputOptions;
-    logger: logging.LoggerApi;
+    logger: BuilderContext['logger'];
     cacheOptions: NormalizedCachedOptions;
     writeToFileSystem: boolean;
     writeToFileSystemFilter: ((file: BuildOutputFile) => boolean) | undefined;
@@ -29,4 +29,5 @@ export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildSta
     clearScreen?: boolean;
     colors?: boolean;
     jsonLogs?: boolean;
-}): AsyncIterable<(ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput>;
+}): AsyncIterable<BuildActionOutput>;
+export {};

package/src/builders/application/build-action.js

@@ -117,16 +117,7 @@ async function* runEsBuildBuildAction(action, options) {
     // Output the first build results after setting up the watcher to ensure that any code executed
     // higher in the iterator call stack will trigger the watcher. This is particularly relevant for
     // unit tests which execute the builder and modify the file system programmatically.
-    if (writeToFileSystem) {
-        // Write output files
-        await (0, utils_1.writeResultFiles)(result.outputFiles, result.assetFiles, outputOptions);
-        yield result.output;
-    }
-    else {
-        // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yield result.outputWithFiles;
-    }
+    yield await writeAndEmitOutput(writeToFileSystem, result, outputOptions, writeToFileSystemFilter);
     // Finish if watch mode is not enabled
     if (!watcher) {
         return;
@@ -165,19 +156,7 @@ async function* runEsBuildBuildAction(action, options) {
             if (staleWatchFiles?.size) {
                 watcher.remove([...staleWatchFiles]);
             }
-            if (writeToFileSystem) {
-                // Write output files
-                const filesToWrite = writeToFileSystemFilter
-                    ? result.outputFiles.filter(writeToFileSystemFilter)
-                    : result.outputFiles;
-                await (0, utils_1.writeResultFiles)(filesToWrite, result.assetFiles, outputOptions);
-                yield result.output;
-            }
-            else {
-                // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                yield result.outputWithFiles;
-            }
+            yield await writeAndEmitOutput(writeToFileSystem, result, outputOptions, writeToFileSystemFilter);
         }
     }
     finally {
@@ -187,3 +166,18 @@ async function* runEsBuildBuildAction(action, options) {
     }
 }
 exports.runEsBuildBuildAction = runEsBuildBuildAction;
+async function writeAndEmitOutput(writeToFileSystem, { outputFiles, output, outputWithFiles, assetFiles }, outputOptions, writeToFileSystemFilter) {
+    if (writeToFileSystem) {
+        // Write output files
+        const outputFilesToWrite = writeToFileSystemFilter
+            ? outputFiles.filter(writeToFileSystemFilter)
+            : outputFiles;
+        await (0, utils_1.writeResultFiles)(outputFilesToWrite, assetFiles, outputOptions);
+        return output;
+    }
+    else {
+        // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return outputWithFiles;
+    }
+}

package/src/builders/dev-server/builder.d.ts

@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <reference types="node" />
-/// <reference types="@types/node/http" />
-/// <reference types="@types/node/ts4.8/http" />
 import type { BuilderContext } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import type http from 'node:http';

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

@@ -68,7 +68,7 @@ function execute(options, context, transforms = {}, extensions) {
                 context.logger.warn(`Prebundling has been configured but will not be used because caching has been disabled.`);
             }
             if (options.allowedHosts?.length) {
-                context.logger.warn(`The "allowedHost" option will not be used because it is not supported by the "${builderName}" builder.`);
+                context.logger.warn(`The "allowedHosts" option will not be used because it is not supported by the "${builderName}" builder.`);
             }
             if (options.publicHost) {
                 context.logger.warn(`The "publicHost" option will not be used because it is not supported by the "${builderName}" builder.`);

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

@@ -49,18 +49,25 @@ const supported_browsers_1 = require("../../utils/supported-browsers");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const application_1 = require("../application");
 const browser_esbuild_1 = require("../browser-esbuild");
+/**
+ * Build options that are also present on the dev server but are only passed
+ * to the build.
+ */
+const CONVENIENCE_BUILD_OPTIONS = ['watch', 'poll', 'verbose'];
 // eslint-disable-next-line max-lines-per-function
 async function* serveWithVite(serverOptions, builderName, context, transformers, extensions) {
     // Get the browser configuration from the target name.
-    const rawBrowserOptions = (await context.getTargetOptions(serverOptions.buildTarget));
+    const rawBrowserOptions = await context.getTargetOptions(serverOptions.buildTarget);
     // Deploy url is not used in the dev-server.
     delete rawBrowserOptions.deployUrl;
-    const browserOptions = (await context.validateOptions({
-        ...rawBrowserOptions,
-        watch: serverOptions.watch,
-        poll: serverOptions.poll,
-        verbose: serverOptions.verbose,
-    }, builderName));
+    // Copy convenience options to build
+    for (const optionName of CONVENIENCE_BUILD_OPTIONS) {
+        const optionValue = serverOptions[optionName];
+        if (optionValue !== undefined) {
+            rawBrowserOptions[optionName] = optionValue;
+        }
+    }
+    const browserOptions = await context.validateOptions(rawBrowserOptions, builderName);
     if (browserOptions.prerender || browserOptions.ssr) {
         // Disable prerendering if enabled and force SSR.
         // This is so instead of prerendering all the routes for every change, the page is "prerendered" when it is requested.

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

@@ -68,7 +68,7 @@ function serveWebpackBrowser(options, builderName, context, transforms = {}) {
       See https://webpack.js.org/guides/hot-module-replacement for information on working with HMR for Webpack.`);
         }
         // Get the browser configuration from the target name.
-        const rawBrowserOptions = (await context.getTargetOptions(options.buildTarget));
+        const rawBrowserOptions = await context.getTargetOptions(options.buildTarget);
         if (rawBrowserOptions.outputHashing && rawBrowserOptions.outputHashing !== schema_1.OutputHashing.None) {
             // Disable output hashing for dev build as this can cause memory leaks
             // See: https://github.com/webpack/webpack-dev-server/issues/377#issuecomment-241258405

package/src/builders/prerender/index.d.ts

@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
-import { json } from '@angular-devkit/core';
 import { Schema } from './schema';
-type PrerenderBuilderOptions = Schema & json.JsonObject;
+type PrerenderBuilderOptions = Schema;
 type PrerenderBuilderOutput = BuilderOutput;
 /**
  * Builds the browser and server, then renders each route in options.routes
@@ -16,5 +15,5 @@ type PrerenderBuilderOutput = BuilderOutput;
  * the browser result.
  */
 export declare function execute(options: PrerenderBuilderOptions, context: BuilderContext): Promise<PrerenderBuilderOutput>;
-declare const _default: import("../../../../architect/src/internal").Builder<Schema & json.JsonObject>;
+declare const _default: import("../../../../architect/src/internal").Builder<Schema & import("../../../../core/src").JsonObject>;
 export default _default;

package/src/builders/ssr-dev-server/utils.d.ts

@@ -5,8 +5,7 @@
  * 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
  */
-/// <reference types="@types/node/child_process" />
-/// <reference types="@types/node/ts4.8/child_process" />
+/// <reference types="node" />
 import { SpawnOptions } from 'child_process';
 import { Observable } from 'rxjs';
 export declare function getAvailablePort(): Promise<number>;

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

@@ -315,10 +315,7 @@ function default_1() {
                 if (!wrapDecorators || visitedClasses.has(classNode)) {
                     return;
                 }
-                if (!classNode.id ||
-                    !parentPath.isVariableDeclarator() ||
-                    !core_1.types.isIdentifier(parentPath.node.id) ||
-                    parentPath.node.id.name !== classNode.id.name) {
+                if (!parentPath.isVariableDeclarator() || !core_1.types.isIdentifier(parentPath.node.id)) {
                     return;
                 }
                 const origin = parentPath.parentPath;
@@ -338,10 +335,10 @@ function default_1() {
                 // Wrap class and safe static assignments in a pure annotated IIFE
                 const container = core_1.types.arrowFunctionExpression([], core_1.types.blockStatement([
                     core_1.types.variableDeclaration('let', [
-                        core_1.types.variableDeclarator(core_1.types.cloneNode(classNode.id), classNode),
+                        core_1.types.variableDeclarator(core_1.types.cloneNode(parentPath.node.id), classNode),
                     ]),
                     ...wrapStatementNodes,
-                    core_1.types.returnStatement(core_1.types.cloneNode(classNode.id)),
+                    core_1.types.returnStatement(core_1.types.cloneNode(parentPath.node.id)),
                 ]));
                 const replacementInitializer = core_1.types.callExpression(core_1.types.parenthesizedExpression(container), []);
                 (0, helper_annotate_as_pure_1.default)(replacementInitializer);

package/src/tools/esbuild/angular/angular-host.js

@@ -45,6 +45,10 @@ function createAngularCompilerHost(compilerOptions, hostOptions) {
         if (context.type !== 'style') {
             return null;
         }
+        // No transformation required if the resource is empty
+        if (data.trim().length === 0) {
+            return { content: '' };
+        }
         const result = await hostOptions.transformStylesheet(data, context.containingFile, context.resourceFile ?? undefined);
         return typeof result === 'string' ? { content: result } : null;
     };

package/src/tools/esbuild/angular/compilation/parallel-worker.d.ts

@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <reference types="node" />
-/// <reference types="@types/node/worker_threads" />
-/// <reference types="@types/node/ts4.8/worker_threads" />
 import type { PartialMessage } from 'esbuild';
 import { type MessagePort } from 'node:worker_threads';
 import type { DiagnosticModes } from './angular-compilation';

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -307,8 +307,11 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     }
                     // Combine additional metafiles with main metafile
                     if (result.metafile && metafile) {
-                        result.metafile.inputs = { ...result.metafile.inputs, ...metafile.inputs };
-                        result.metafile.outputs = { ...result.metafile.outputs, ...metafile.outputs };
+                        // Append the existing object, by appending to it we prevent unnecessary new objections creations with spread
+                        // mitigating significant performance overhead for large apps.
+                        // See: https://bugs.chromium.org/p/v8/issues/detail?id=11536
+                        Object.assign(result.metafile.inputs, metafile.inputs);
+                        Object.assign(result.metafile.outputs, metafile.outputs);
                     }
                 }
                 (0, profiling_1.logCumulativeDurations)();

package/src/tools/esbuild/bundler-context.js

@@ -85,8 +85,8 @@ class BundlerContext {
             }
             // Combine metafiles used for the stats option as well as bundle budgets and console output
             if (result.metafile) {
-                metafile.inputs = { ...metafile.inputs, ...result.metafile.inputs };
-                metafile.outputs = { ...metafile.outputs, ...result.metafile.outputs };
+                Object.assign(metafile.inputs, result.metafile.inputs);
+                Object.assign(metafile.outputs, result.metafile.outputs);
             }
             result.initialFiles.forEach((value, key) => initialFiles.set(key, value));
             outputFiles.push(...result.outputFiles);

package/src/tools/esbuild/utils.d.ts

@@ -5,7 +5,7 @@
  * 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 { logging } from '@angular-devkit/core';
+import { BuilderContext } from '@angular-devkit/architect';
 import { BuildOptions, Metafile, OutputFile } from 'esbuild';
 import { NormalizedApplicationBuildOptions, NormalizedOutputOptions } from '../../builders/application/options';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
@@ -22,7 +22,7 @@ export declare function withNoProgress<T>(text: string, action: () => T | Promis
  * @returns An object that can be used with the esbuild build `supported` option.
  */
 export declare function getFeatureSupport(target: string[]): BuildOptions['supported'];
-export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, media, server }: NormalizedOutputOptions): Promise<void>;
+export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, server }: NormalizedOutputOptions): Promise<void>;
 export declare function emitFilesToDisk<T = BuildOutputAsset | BuildOutputFile>(files: T[], writeFileCallback: (file: T) => Promise<void>): Promise<void>;
 export declare function createOutputFileFromText(path: string, text: string, type: BuildOutputFileType): BuildOutputFile;
 export declare function createOutputFileFromData(path: string, data: Uint8Array, type: BuildOutputFileType): BuildOutputFile;
@@ -38,4 +38,4 @@ export declare function transformSupportedBrowsersToTargets(supportedBrowsers: s
  */
 export declare function getSupportedNodeTargets(): string[];
 export declare function createJsonBuildManifest(result: ExecutionResult, normalizedOptions: NormalizedApplicationBuildOptions): Promise<string>;
-export declare function logMessages(logger: logging.LoggerApi, executionResult: ExecutionResult, color?: boolean, jsonLogs?: boolean): Promise<void>;
+export declare function logMessages(logger: BuilderContext['logger'], executionResult: ExecutionResult, color?: boolean, jsonLogs?: boolean): Promise<void>;

package/src/tools/esbuild/utils.js

@@ -179,7 +179,7 @@ function getFeatureSupport(target) {
     return supported;
 }
 exports.getFeatureSupport = getFeatureSupport;
-async function writeResultFiles(outputFiles, assetFiles, { base, browser, media, server }) {
+async function writeResultFiles(outputFiles, assetFiles, { base, browser, server }) {
     const directoryExists = new Set();
     const ensureDirectoryExists = async (destPath) => {
         const basePath = (0, node_path_1.dirname)(destPath);
@@ -331,7 +331,7 @@ function transformSupportedBrowsersToTargets(supportedBrowsers) {
     return transformed;
 }
 exports.transformSupportedBrowsersToTargets = transformSupportedBrowsersToTargets;
-const SUPPORTED_NODE_VERSIONS = '^18.13.0 || >=20.9.0';
+const SUPPORTED_NODE_VERSIONS = '^18.19.1 || >=20.11.1';
 /**
  * Transform supported Node.js versions to esbuild target.
  * @see https://esbuild.github.io/api/#target

package/src/tools/vite/angular-memory-plugin.js

@@ -159,9 +159,11 @@ function createAngularMemoryPlugin(options) {
                         return;
                     }
                     transformIndexHtmlAndAddHeaders(req.url, rawHtml, res, next, async (html) => {
+                        const resolvedUrls = server.resolvedUrls;
+                        const baseUrl = resolvedUrls?.local[0] ?? resolvedUrls?.network[0];
                         const { content } = await (0, render_page_1.renderPage)({
                             document: html,
-                            route: new URL(req.originalUrl ?? '/', server.resolvedUrls?.local[0]).toString(),
+                            route: new URL(req.originalUrl ?? '/', baseUrl).toString(),
                             serverContext: 'ssr',
                             loadBundle: (uri) => 
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -230,13 +232,11 @@ exports.createAngularMemoryPlugin = createAngularMemoryPlugin;
  */
 async function loadViteClientCode(file) {
     const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    const firstUpdate = originalContents.replace('You can also disable this overlay by setting', '');
-    (0, node_assert_1.default)(originalContents !== firstUpdate, 'Failed to update Vite client error overlay text. (1)');
-    const secondUpdate = firstUpdate.replace(
-    // eslint-disable-next-line max-len
-    '<code part="config-option-name">server.hmr.overlay</code> to <code part="config-option-value">false</code> in <code part="config-file-name">${hmrConfigName}.</code>', '');
-    (0, node_assert_1.default)(firstUpdate !== secondUpdate, 'Failed to update Vite client error overlay text. (2)');
-    return secondUpdate;
+    const updatedContents = originalContents.replace(`h('br'), 'You can also disable this overlay by setting ', ` +
+        `h('code', { part: 'config-option-name' }, 'server.hmr.overlay'), '` +
+        ` to ', h('code', { part: 'config-option-value' }, 'false'), ' in ', h('code', { part: 'config-file-name' }, hmrConfigName), '.'`, '');
+    (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
+    return updatedContents;
 }
 function pathnameWithoutBasePath(url, basePath) {
     const parsedUrl = new URL(url, 'http://localhost');

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

@@ -162,12 +162,13 @@ async function addProxyConfig(root, proxyConfig) {
     if (!(0, fs_1.existsSync)(proxyPath)) {
         throw new Error(`Proxy configuration file ${proxyPath} does not exist.`);
     }
+    let proxyConfiguration;
     switch ((0, path_1.extname)(proxyPath)) {
         case '.json': {
             const content = await fs_1.promises.readFile(proxyPath, 'utf-8');
             const { parse, printParseErrorCode } = await Promise.resolve().then(() => __importStar(require('jsonc-parser')));
             const parseErrors = [];
-            const proxyConfiguration = parse(content, parseErrors, { allowTrailingComma: true });
+            proxyConfiguration = parse(content, parseErrors, { allowTrailingComma: true });
             if (parseErrors.length > 0) {
                 let errorMessage = `Proxy configuration file ${proxyPath} contains parse errors:`;
                 for (const parseError of parseErrors) {
@@ -176,32 +177,35 @@ async function addProxyConfig(root, proxyConfig) {
                 }
                 throw new Error(errorMessage);
             }
-            return proxyConfiguration;
+            break;
         }
         case '.mjs':
             // Load the ESM configuration file using the TypeScript dynamic import workaround.
             // Once TypeScript provides support for keeping the dynamic import this workaround can be
             // changed to a direct dynamic import.
-            return (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
+            proxyConfiguration = (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
+            break;
         case '.cjs':
-            return require(proxyPath);
+            proxyConfiguration = require(proxyPath);
+            break;
         default:
             // The file could be either CommonJS or ESM.
             // CommonJS is tried first then ESM if loading fails.
             try {
-                return require(proxyPath);
+                proxyConfiguration = require(proxyPath);
             }
             catch (e) {
                 (0, error_1.assertIsError)(e);
-                if (e.code === 'ERR_REQUIRE_ESM') {
-                    // Load the ESM configuration file using the TypeScript dynamic import workaround.
-                    // Once TypeScript provides support for keeping the dynamic import this workaround can be
-                    // changed to a direct dynamic import.
-                    return (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
+                if (e.code !== 'ERR_REQUIRE_ESM') {
+                    throw e;
                 }
-                throw e;
+                // Load the ESM configuration file using the TypeScript dynamic import workaround.
+                // Once TypeScript provides support for keeping the dynamic import this workaround can be
+                // changed to a direct dynamic import.
+                proxyConfiguration = (await (0, load_esm_1.loadEsmModule)((0, url_1.pathToFileURL)(proxyPath))).default;
             }
     }
+    return normalizeProxyConfiguration(proxyConfiguration);
 }
 /**
  * Calculates the line and column for an error offset in the content of a JSON file.
@@ -301,3 +305,8 @@ function getPublicHostOptions(options, webSocketPath) {
     }
     return `auto://${publicHost || '0.0.0.0:0'}${webSocketPath}`;
 }
+function normalizeProxyConfiguration(proxy) {
+    return Array.isArray(proxy)
+        ? proxy
+        : Object.entries(proxy).map(([context, value]) => ({ context: [context], ...value }));
+}