@angular/build 22.3.0-next.0 → 22.3.0-next.1

package/src/builders/library/pipeline/build-action.d.ts

@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { BuilderContext } from '@angular-devkit/architect';
+import type { ComponentStylesheetBundler } from '../../../tools/esbuild/angular/component-stylesheets';
 import type { NormalizedLibraryOptions, SingleBuildState } from '../types';
-import type { createComponentStylesheetBundlerForLibrary } from './stylesheet-bundler';
+import type { DiskOutputFile } from './utils';
 /**
  * Creates a fresh {@link SingleBuildState} instance.
  */
@@ -16,13 +17,33 @@ export declare function createSingleBuildState(): SingleBuildState;
  * Context required to execute a single library build iteration.
  */
 export interface BuildActionContext {
+    /** Normalized options for the library build. */
     options: NormalizedLibraryOptions;
+    /** The Architect builder context. */
     context: BuilderContext;
-    stylesheetBundler: ReturnType<typeof createComponentStylesheetBundlerForLibrary>;
+    /** Bundler instance used to process component stylesheets. */
+    stylesheetBundler: ComponentStylesheetBundler;
+    /** Whether the builder is running in watch mode. */
     isWatchMode: boolean;
-    allWatchedFiles: Set<string>;
+    /**
+     * Set of file paths tracked for compilation and configuration
+     * (including `tsconfig.json`, `package.json`, entry points, and referenced source,
+     * template, and stylesheet files). Updated during compilation and used to determine
+     * whether file changes require recompiling entry points, excluding asset files so
+     * asset-only changes do not trigger code compilation.
+     */
+    watchedCompilationFiles: Set<string>;
+    /** State preserved across incremental builds in watch mode. */
     buildState: SingleBuildState;
+    /** Set of file paths modified since the last build iteration. */
     modifiedFiles?: Set<string>;
+    /**
+     * Asset files to emit to disk for the current build iteration.
+     * Pre-collected in the watch loop to avoid redundant asset matching, or resolved and
+     * populated by `buildAction` when omitted (such as during the initial build) so the
+     * caller can register their source paths with the file watcher.
+     */
+    assetsToEmit?: DiskOutputFile[];
 }
 /**
  * Executes a single iteration of the library build pipeline, including
@@ -32,4 +53,4 @@ export interface BuildActionContext {
  * @param actionContext The build action state and configuration.
  */
 export declare function buildAction(actionContext: BuildActionContext): Promise<void>;
-export declare function hasModifiedWatchedFile(modifiedFiles: ReadonlySet<string>, allWatchedFiles: ReadonlySet<string>, posixPackageJsonPath: string): boolean;
+export declare function hasModifiedWatchedFile(modifiedFiles: ReadonlySet<string>, watchedCompilationFiles: ReadonlySet<string>, posixPackageJsonPath: string): boolean;

package/src/builders/library/pipeline/build-action.js

@@ -40,7 +40,7 @@ function createSingleBuildState() {
  * @param actionContext The build action state and configuration.
  */
 async function buildAction(actionContext) {
-    const { options, context, stylesheetBundler, isWatchMode, allWatchedFiles, buildState, modifiedFiles, } = actionContext;
+    const { options, context, stylesheetBundler, isWatchMode, watchedCompilationFiles, buildState, modifiedFiles, } = actionContext;
     const posixPackageJsonPath = (0, path_1.toPosixPath)(options.packageJsonPath);
     const { pendingChangedEsmFiles, pendingChangedDtsFiles, directoryExists } = buildState;
     if (!modifiedFiles || modifiedFiles.has(posixPackageJsonPath)) {
@@ -52,7 +52,7 @@ async function buildAction(actionContext) {
         buildState.hasEntryPointsChanges ||
         pendingChangedEsmFiles.size > 0 ||
         pendingChangedDtsFiles.size > 0 ||
-        hasModifiedWatchedFile(modifiedFiles, allWatchedFiles, posixPackageJsonPath);
+        hasModifiedWatchedFile(modifiedFiles, watchedCompilationFiles, posixPackageJsonPath);
     const shouldGenerateManifests = !buildState.hasEmittedManifests;
     if (shouldGenerateManifests) {
         verifyAllowedDependencies(options);
@@ -64,7 +64,7 @@ async function buildAction(actionContext) {
         const { esmFiles, dtsFiles, changedEsmFiles, changedDtsFiles, referencedFiles, cache, diagnosePromise, } = await (0, compilation_1.compileLibrary)(options.entryPoints.values(), options, stylesheetBundler, buildState.singleProgramCache, modifiedFiles);
         buildState.singleProgramCache = cache;
         for (const file of referencedFiles) {
-            allWatchedFiles.add(file);
+            watchedCompilationFiles.add(file);
         }
         for (const file of changedEsmFiles) {
             pendingChangedEsmFiles.add(file);
@@ -105,7 +105,7 @@ async function buildAction(actionContext) {
         buildState.hasCompilationError = false;
         pendingChangedEsmFiles.clear();
         pendingChangedDtsFiles.clear();
-        for (const warning of warnings) {
+        for (const warning of [...warnings, ...bundleOutput.warnings]) {
             context.logger.warn(warning);
         }
         filesToEmit.push(...bundleOutput.filesToEmit);
@@ -116,7 +116,8 @@ async function buildAction(actionContext) {
     if (shouldGenerateManifests) {
         filesToEmit.push(...(0, package_manifests_1.generatePackageManifests)(options, isWatchMode));
     }
-    filesToEmit.push(...(await (0, assets_1.collectAssetsToEmit)(options.assets, options.workspaceRoot, allWatchedFiles, buildState.hasEmittedAssets ? modifiedFiles : undefined)));
+    const resolvedAssetsToEmit = (actionContext.assetsToEmit ??= await (0, assets_1.collectAssetsToEmit)(options.assets, options.workspaceRoot, buildState.hasEmittedAssets ? modifiedFiles : undefined));
+    filesToEmit.push(...resolvedAssetsToEmit);
     await (0, utils_1.emitFilesToDisk)(filesToEmit, async (file) => {
         const fullFilePath = node_path_1.default.join(options.outputPath, file.path);
         const fileBasePath = node_path_1.default.dirname(fullFilePath);
@@ -134,9 +135,9 @@ async function buildAction(actionContext) {
     buildState.hasEmittedManifests = true;
     buildState.hasEmittedAssets = true;
 }
-function hasModifiedWatchedFile(modifiedFiles, allWatchedFiles, posixPackageJsonPath) {
+function hasModifiedWatchedFile(modifiedFiles, watchedCompilationFiles, posixPackageJsonPath) {
     for (const file of modifiedFiles) {
-        if (file !== posixPackageJsonPath && allWatchedFiles.has(file)) {
+        if (file !== posixPackageJsonPath && watchedCompilationFiles.has(file)) {
             return true;
         }
     }

package/src/builders/library/pipeline/build-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-action.js","sourceRoot":"","sources":["build-action.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-action.js","sourceRoot":"","sources":["build-action.ts"],"names":[],"mappings":"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"}

package/src/builders/library/pipeline/bundler.d.ts

@@ -15,6 +15,8 @@ export interface BundleEntryPointsOutput {
     filesToEmit: MemoryOutputFile[];
     /** Map of entry point names to their bundle results containing bundled module IDs. */
     bundleResults: Map<string, BundleResult>;
+    /** Warning messages emitted during bundling. */
+    warnings: string[];
 }
 /**
  * Input state for an individual entry point to be bundled.

package/src/builders/library/pipeline/bundler.js

@@ -6,6 +6,39 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -13,8 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.bundleEntryPoints = bundleEntryPoints;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_path_1 = __importDefault(require("node:path"));
-const rolldown_1 = require("rolldown");
-const rolldown_plugin_dts_1 = require("rolldown-plugin-dts");
+const load_rolldown_1 = require("../../../utils/load-rolldown");
 const path_1 = require("../../../utils/path");
 const utils_1 = require("./utils");
 const ESM_EXTENSIONS = ['.js', '.mjs', '/index.js', '/index.mjs'];
@@ -32,7 +64,7 @@ const DTS_EXTENSIONS = ['.d.ts', '.d.mts', '/index.d.ts', '/index.d.mts'];
 async function bundleEntryPoints(items, esmFiles, dtsFiles, options) {
     const bundleResults = new Map();
     if (items.length === 0) {
-        return { filesToEmit: [], bundleResults };
+        return { filesToEmit: [], bundleResults, warnings: [] };
     }
     const esmEntryPoints = [];
     const dtsEntryPoints = [];
@@ -62,6 +94,7 @@ async function bundleEntryPoints(items, esmFiles, dtsFiles, options) {
     return {
         filesToEmit: [...esmOutput.filesToEmit, ...dtsOutput.filesToEmit],
         bundleResults,
+        warnings: [...esmOutput.warnings, ...dtsOutput.warnings],
     };
 }
 /**
@@ -198,22 +231,39 @@ function processRolldownOutput(output, dir) {
  *
  * @param input Map of bundle names to virtual entry file paths.
  * @param plugins Rolldown plugins to use during bundling.
- * @param preserveSymlinks Whether to preserve symlinks during module resolution.
  * @param extension Output file extension ('mjs' or 'd.ts').
- * @param sourcemap Whether to emit sourcemaps.
- * @param findEntryPoint Lookup function to resolve chunk entry point ownership.
+ * @param options The normalized library options.
  * @returns A promise resolving to the multi-bundle output.
  */
-async function executeMultiBundle(input, plugins, preserveSymlinks, extension, sourcemap) {
+async function executeMultiBundle(input, plugins, extension, options) {
+    const { workspaceRoot, preserveSymlinks, declarationMap, outputPath } = options;
     const isDts = extension === 'd.ts';
-    const dir = isDts ? utils_1.TYPES_OUTPUT_DIR : utils_1.FESM_OUTPUT_DIR;
-    const bundle = await (0, rolldown_1.rolldown)({
+    let sourcemap;
+    let dir;
+    if (isDts) {
+        dir = utils_1.TYPES_OUTPUT_DIR;
+        sourcemap = declarationMap;
+    }
+    else {
+        dir = utils_1.FESM_OUTPUT_DIR;
+        // FESM (.mjs) sourcemaps are always enabled.
+        sourcemap = true;
+    }
+    const warnings = [];
+    const { rolldown } = await (0, load_rolldown_1.loadRolldown)();
+    const bundle = await rolldown({
         context: 'this',
         input,
+        cwd: workspaceRoot,
         plugins,
         treeshake: false,
         resolve: { symlinks: !preserveSymlinks },
         checks: { circularDependency: false },
+        onLog(level, log) {
+            if (level === 'warn') {
+                warnings.push(log.message);
+            }
+        },
         experimental: {
             attachDebugInfo: 'none',
         },
@@ -221,14 +271,17 @@ async function executeMultiBundle(input, plugins, preserveSymlinks, extension, s
     try {
         const { output } = await bundle.generate({
             format: 'es',
-            dir,
+            dir: node_path_1.default.join(outputPath, dir),
             entryFileNames: `[name].${extension}`,
             chunkFileNames: `[name]-[hash].${extension}`,
             sourcemap,
             hoistTransitiveImports: false,
             comments: { jsdoc: isDts, legal: true, annotation: true },
         });
-        return processRolldownOutput(output, dir);
+        return {
+            ...processRolldownOutput(output, dir),
+            warnings,
+        };
     }
     finally {
         await bundle.close();
@@ -244,9 +297,9 @@ async function executeMultiBundle(input, plugins, preserveSymlinks, extension, s
  */
 async function bundleAllEsm(entryPoints, esmFiles, options) {
     if (entryPoints.length === 0) {
-        return { filesToEmit: [], moduleIdsByBundle: new Map() };
+        return { filesToEmit: [], moduleIdsByBundle: new Map(), warnings: [] };
     }
-    return executeMultiBundle(resolveEntryInputMap(entryPoints, false), [createMemoryFileLoaderPlugin(esmFiles, ESM_EXTENSIONS, true)], options.preserveSymlinks, 'mjs', true);
+    return executeMultiBundle(resolveEntryInputMap(entryPoints, false), [createMemoryFileLoaderPlugin(esmFiles, ESM_EXTENSIONS, true)], 'mjs', options);
 }
 /**
  * Bundles TypeScript declaration (.d.ts) output files for all provided entry points.
@@ -258,21 +311,26 @@ async function bundleAllEsm(entryPoints, esmFiles, options) {
  */
 async function bundleAllDts(entryPoints, dtsFiles, options) {
     if (entryPoints.length === 0) {
-        return { filesToEmit: [], moduleIdsByBundle: new Map() };
+        return { filesToEmit: [], moduleIdsByBundle: new Map(), warnings: [] };
     }
+    // Ensure Rolldown's native binding is initialized via `loadRolldown()` before evaluating
+    // `rolldown-plugin-dts`, which has top-level imports of `rolldown/experimental`.
+    await (0, load_rolldown_1.loadRolldown)();
+    const { dts } = await Promise.resolve().then(() => __importStar(require('rolldown-plugin-dts')));
     const dtsSourcemap = options.declarationMap;
     // Filter out `rolldown-plugin-dts:resolver` because all `.d.ts` files are already emitted
     // in-memory by the Angular/TypeScript compilation and resolved via `createMemoryFileLoaderPlugin`.
     // The default `rolldown-plugin-dts:resolver` plugin performs filesystem resolution (`oxc-resolver`)
     // and calls `this.load()` on on-disk `.ts` source files, which is unnecessary and causes a
     // significant performance regression across multi-entry builds.
-    const rawDtsPlugins = (0, rolldown_plugin_dts_1.dts)({
+    const rawDtsPlugins = dts({
         dtsInput: true,
         tsconfig: false,
         sourcemap: dtsSourcemap,
+        generator: 'oxc',
     });
     const dtsPlugins = rawDtsPlugins.filter((plugin) => plugin.name !== 'rolldown-plugin-dts:resolver');
     (0, node_assert_1.default)(dtsPlugins.length < rawDtsPlugins.length, 'Expected "rolldown-plugin-dts:resolver" plugin to be present in rolldown-plugin-dts.');
-    return executeMultiBundle(resolveEntryInputMap(entryPoints, true), [createMemoryFileLoaderPlugin(dtsFiles, DTS_EXTENSIONS, dtsSourcemap), ...dtsPlugins], options.preserveSymlinks, 'd.ts', dtsSourcemap);
+    return executeMultiBundle(resolveEntryInputMap(entryPoints, true), [createMemoryFileLoaderPlugin(dtsFiles, DTS_EXTENSIONS, dtsSourcemap), ...dtsPlugins], 'd.ts', options);
 }
 //# sourceMappingURL=bundler.js.map

package/src/builders/library/pipeline/bundler.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundler.js","sourceRoot":"","sources":["bundler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bundler.js","sourceRoot":"","sources":["bundler.ts"],"names":[],"mappings":"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"}

package/src/builders/library/pipeline/entry-points.d.ts

@@ -31,4 +31,4 @@ export declare function haveEntryPointsChanged(oldEntryPoints: ReadonlyMap<strin
 /**
  * Updates watched files, entry points in options, and cached bundle results when package.json entry points change.
  */
-export declare function updateWatchedEntryPoints(packageJson: PackageJsonData, options: NormalizedLibraryOptions, buildState: SingleBuildState, allWatchedFiles: Set<string>, packageJsonPath: string): void;
+export declare function updateWatchedEntryPoints(packageJson: PackageJsonData, options: NormalizedLibraryOptions, buildState: SingleBuildState, watchedCompilationFiles: Set<string>, packageJsonPath: string): void;

package/src/builders/library/pipeline/entry-points.js

@@ -171,11 +171,11 @@ function haveEntryPointsChanged(oldEntryPoints, newEntryPoints) {
 /**
  * Updates watched files, entry points in options, and cached bundle results when package.json entry points change.
  */
-function updateWatchedEntryPoints(packageJson, options, buildState, allWatchedFiles, packageJsonPath) {
+function updateWatchedEntryPoints(packageJson, options, buildState, watchedCompilationFiles, packageJsonPath) {
     const newEntryPoints = normalizeEntryPoints(packageJson.exports, options.projectRoot, packageJsonPath, options.packageName);
     if (haveEntryPointsChanged(options.entryPoints, newEntryPoints)) {
         for (const entryPoint of newEntryPoints.values()) {
-            allWatchedFiles.add((0, path_1.toPosixPath)(entryPoint.entryFilePath));
+            watchedCompilationFiles.add((0, path_1.toPosixPath)(entryPoint.entryFilePath));
         }
         for (const name of buildState.previousBundleResults.keys()) {
             const oldEp = options.entryPoints.get(name);

package/src/builders/library/pipeline/entry-points.js.map

@@ -1 +1 @@
-{"version":3,"file":"entry-points.js","sourceRoot":"","sources":["entry-points.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entry-points.js","sourceRoot":"","sources":["entry-points.ts"],"names":[],"mappings":"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"}

package/src/builders/ng-packagr/builder.js

@@ -84,11 +84,11 @@ async function* execute(options, context) {
     if (options.tsConfig) {
         packager.withTsConfig((0, node_path_1.resolve)(workspaceRoot, options.tsConfig));
     }
-    const { enabled: cacheEnabled, path: cacheDirectory } = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot);
+    const { enabled: cacheEnabled, path: cacheDirectory } = (0, normalize_cache_1.normalizeCacheOptions)(metadata, context.workspaceRoot, projectName, context.builder.builderName);
     const ngPackagrOptions = {
         cacheEnabled,
         poll: options.poll,
-        cacheDirectory: (0, node_path_1.join)(cacheDirectory, 'ng-packagr'),
+        cacheDirectory: cacheDirectory,
     };
     try {
         if (options.watch) {

package/src/builders/ng-packagr/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBH,0BAgEC;AA/ED,yCAA0C;AAC1C,6CAAkD;AAClD,iEAAoE;AACpE,yDAA+D;AAG/D;;;;;;;;GAQG;AACI,KAAK,SAAS,CAAC,CAAC,OAAO,CAC5B,OAAgC,EAChC,OAAuB;IAEvB,8BAA8B;IAC9B,MAAM,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC5C,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC;QACH,QAAQ,GAAG,CAAC,wDAAa,YAAY,GAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QACrB,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACtC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EACH,iHAAiH;aACpH,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO;QACrC,CAAC,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC;QACtC,CAAC,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAG,QAAQ,CAAC,IAA2B,IAAI,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAExF,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAErC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,QAAQ,CAAC,YAAY,CAAC,IAAA,mBAAO,EAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,IAAA,uCAAqB,EAC3E,QAAQ,EACR,OAAO,CAAC,aAAa,CACtB,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,YAAY;QACZ,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,cAAc,EAAE,IAAA,gBAAI,EAAC,cAAc,EAAE,YAAY,CAAC;KACnD,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,EAAE,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QAErB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC;AACH,CAAC"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBH,0BAkEC;AAjFD,yCAA0C;AAC1C,6CAAkD;AAClD,iEAAoE;AACpE,yDAA+D;AAG/D;;;;;;;;GAQG;AACI,KAAK,SAAS,CAAC,CAAC,OAAO,CAC5B,OAAgC,EAChC,OAAuB;IAEvB,8BAA8B;IAC9B,MAAM,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC5C,IAAI,QAAQ,CAAC;IACb,IAAI,CAAC;QACH,QAAQ,GAAG,CAAC,wDAAa,YAAY,GAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QACrB,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACtC,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EACH,iHAAiH;aACpH,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO;QACrC,CAAC,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC;QACtC,CAAC,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAG,QAAQ,CAAC,IAA2B,IAAI,EAAE,EAAE,iBAAiB,CAAC,CAAC;IAExF,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAErC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,QAAQ,CAAC,YAAY,CAAC,IAAA,mBAAO,EAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,IAAA,uCAAqB,EAC3E,QAAQ,EACR,OAAO,CAAC,aAAa,EACrB,WAAW,EACX,OAAO,CAAC,OAAO,CAAC,WAAW,CAC5B,CAAC;IAEF,MAAM,gBAAgB,GAAqB;QACzC,YAAY;QACZ,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,cAAc,EAAE,cAAc;KAC/B,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,MAAM,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,SAAS,EAAE,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC;QAErB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC;AACH,CAAC"}

package/src/builders/unit-test/builder.js

@@ -332,7 +332,7 @@ async function* execute(options, context, extensions) {
                 preserveSymlinks: normalizedOptions.preserveSymlinks,
             };
             const dumpDirectory = normalizedOptions.dumpVirtualFiles
-                ? node_path_1.default.join(normalizedOptions.cacheOptions.path, 'unit-test', 'output-files')
+                ? node_path_1.default.join(normalizedOptions.cacheOptions.path, 'output-files')
                 : undefined;
             yield* runBuildAndTest(executor, applicationBuildOptions, context, dumpDirectory, finalExtensions);
         }

package/src/builders/unit-test/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"}

package/src/builders/unit-test/options.js

@@ -52,8 +52,7 @@ async function normalizeOptions(context, projectName, options) {
     const projectMetadata = await context.getProjectMetadata(projectName);
     const { projectRoot, projectSourceRoot } = (0, project_metadata_1.getProjectRootPaths)(workspaceRoot, projectMetadata);
     // Gather persistent caching option and provide a project specific cache location
-    const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
-    cacheOptions.path = node_path_1.default.join(cacheOptions.path, projectName);
+    const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot, projectName, context.builder.builderName);
     const { runner, browsers, progress, filter, browserViewport, ui, runnerConfig, isolate, splitting = true, polyfills, } = options;
     if (ui && runner !== schema_1.Runner.Vitest) {
         throw new Error('The "ui" option is only available for the "vitest" runner.');

package/src/builders/unit-test/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}

package/src/utils/load-proxy-config.js

@@ -108,12 +108,13 @@ function normalizeProxyConfiguration(proxy) {
             if (!('context' in proxyEntry)) {
                 continue;
             }
-            if (!Array.isArray(proxyEntry.context)) {
+            // Array-form entries contain a context string array with the path(s)
+            // to use for the configuration entry. A single path string is also
+            // accepted, as with the Webpack-based development server.
+            const context = typeof proxyEntry.context === 'string' ? [proxyEntry.context] : proxyEntry.context;
+            if (!Array.isArray(context)) {
                 continue;
             }
-            // Array-form entries contain a context string array with the path(s)
-            // to use for the configuration entry.
-            const context = proxyEntry.context;
             delete proxyEntry.context;
             for (const contextEntry of context) {
                 if (typeof contextEntry !== 'string') {
@@ -127,13 +128,14 @@ function normalizeProxyConfiguration(proxy) {
         normalizedProxy = proxy;
     }
     // TODO: Consider upstreaming glob support
-    for (const key of Object.keys(normalizedProxy)) {
-        if (key[0] !== '^' && (0, tinyglobby_1.isDynamicPattern)(key)) {
-            const pattern = (0, picomatch_1.makeRe)(key).source;
-            normalizedProxy[pattern] = normalizedProxy[key];
-            delete normalizedProxy[key];
-        }
+    // The object is rebuilt so that converted glob entries keep their original position,
+    // since Vite proxies a request with the first entry that matches it.
+    const orderedProxy = {};
+    for (const [key, value] of Object.entries(normalizedProxy)) {
+        const context = key[0] !== '^' && (0, tinyglobby_1.isDynamicPattern)(key) ? (0, picomatch_1.makeRe)(key).source : key;
+        orderedProxy[context] = value;
     }
+    normalizedProxy = orderedProxy;
     // Replace `pathRewrite` field with a `rewrite` function
     for (const proxyEntry of Object.values(normalizedProxy)) {
         if (typeof proxyEntry === 'object' &&

package/src/utils/load-proxy-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-proxy-config.js","sourceRoot":"","sources":["load-proxy-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"load-proxy-config.js","sourceRoot":"","sources":["load-proxy-config.ts"],"names":[],"mappings":"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"}