@angular/build 19.1.0-next.2 → 19.1.0

package/src/tools/esbuild/angular/compiler-plugin.d.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { Plugin } from 'esbuild';
+import { AngularCompilation } from '../../angular/compilation';
 import { LoadResultCache } from '../load-result-cache';
 import { ComponentStylesheetBundler } from './component-stylesheets';
 import { SourceFileCache } from './source-file-cache';
@@ -13,9 +14,6 @@ export interface CompilerPluginOptions {
     sourcemap: boolean | 'external';
     tsconfig: string;
     jit?: boolean;
-    browserOnlyBuild?: boolean;
-    /** Skip TypeScript compilation setup. This is useful to re-use the TypeScript compilation from another plugin. */
-    noopTypeScriptCompilation?: boolean;
     advancedOptimizations?: boolean;
     thirdPartySourcemaps?: boolean;
     fileReplacements?: Record<string, string>;
@@ -26,4 +24,4 @@ export interface CompilerPluginOptions {
     instrumentForCoverage?: (request: string) => boolean;
     templateUpdates?: Map<string, string>;
 }
-export declare function createCompilerPlugin(pluginOptions: CompilerPluginOptions, stylesheetBundler: ComponentStylesheetBundler): Plugin;
+export declare function createCompilerPlugin(pluginOptions: CompilerPluginOptions, compilationOrFactory: AngularCompilation | (() => Promise<AngularCompilation>), stylesheetBundler: ComponentStylesheetBundler): Plugin;

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

@@ -56,7 +56,7 @@ const compilation_state_1 = require("./compilation-state");
 const file_reference_tracker_1 = require("./file-reference-tracker");
 const jit_plugin_callbacks_1 = require("./jit-plugin-callbacks");
 // eslint-disable-next-line max-lines-per-function
-function createCompilerPlugin(pluginOptions, stylesheetBundler) {
+function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBundler) {
     return {
         name: 'angular-compiler',
         // eslint-disable-next-line max-lines-per-function
@@ -94,16 +94,17 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
             // Setup defines based on the values used by the Angular compiler-cli
             build.initialOptions.define ??= {};
             build.initialOptions.define['ngI18nClosureMode'] ??= 'false';
+            // The factory is only relevant for compatibility purposes with the private API.
+            // TODO: Update private API in the next major to allow compilation function factory removal here.
+            const compilation = typeof compilationOrFactory === 'function'
+                ? await compilationOrFactory()
+                : compilationOrFactory;
             // The in-memory cache of TypeScript file outputs will be used during the build in `onLoad` callbacks for TS files.
             // A string value indicates direct TS/NG output and a Uint8Array indicates fully transformed code.
             const typeScriptFileCache = pluginOptions.sourceFileCache?.typeScriptFileCache ??
                 new Map();
             // The resources from component stylesheets and web workers that will be added to the build results output files
             const additionalResults = new Map();
-            // Create new reusable compilation for the appropriate mode based on the `jit` plugin option
-            const compilation = pluginOptions.noopTypeScriptCompilation
-                ? new compilation_1.NoopCompilation()
-                : await (0, compilation_1.createAngularCompilation)(!!pluginOptions.jit, !!pluginOptions.browserOnlyBuild);
             // Compilation is initially assumed to have errors until emitted
             let hasCompilationErrors = true;
             // Determines if TypeScript should process JavaScript files based on tsconfig `allowJs` option
@@ -128,8 +129,8 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                 // Angular compiler which does not have direct knowledge of transitive resource
                 // dependencies or web worker processing.
                 let modifiedFiles;
-                if (pluginOptions.sourceFileCache?.modifiedFiles.size &&
-                    !pluginOptions.noopTypeScriptCompilation) {
+                if (!(compilation instanceof compilation_1.NoopCompilation) &&
+                    pluginOptions.sourceFileCache?.modifiedFiles.size) {
                     // TODO: Differentiate between changed input files and stale output files
                     modifiedFiles = referencedFileTracker.update(pluginOptions.sourceFileCache.modifiedFiles);
                     pluginOptions.sourceFileCache.invalidate(modifiedFiles);
@@ -141,9 +142,7 @@ function createCompilerPlugin(pluginOptions, stylesheetBundler) {
                     // Remove any stale additional results based on modified files
                     modifiedFiles.forEach((file) => additionalResults.delete(file));
                 }
-                if (!pluginOptions.noopTypeScriptCompilation &&
-                    compilation.update &&
-                    pluginOptions.sourceFileCache?.modifiedFiles.size) {
+                if (compilation.update && pluginOptions.sourceFileCache?.modifiedFiles.size) {
                     await compilation.update(modifiedFiles ?? pluginOptions.sourceFileCache.modifiedFiles);
                 }
                 // Create Angular compiler host options
@@ -523,6 +522,18 @@ function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserve
                 notes: [{ text: `The 'module' option will be set to 'ES2022' instead.` }],
             });
         }
+        if (compilerOptions.isolatedModules && compilerOptions.emitDecoratorMetadata) {
+            setupWarnings?.push({
+                text: `TypeScript compiler option 'isolatedModules' may prevent the 'emitDecoratorMetadata' option from emitting all metadata.`,
+                location: null,
+                notes: [
+                    {
+                        text: `The 'emitDecoratorMetadata' option is not required by Angular` +
+                            'and can be removed if not explictly required by the project.',
+                    },
+                ],
+            });
+        }
         // Synchronize custom resolve conditions.
         // Set if using the supported bundler resolution mode (bundler is the default in new projects)
         if (compilerOptions.moduleResolution === 100 /* ModuleResolutionKind.Bundler */) {

package/src/tools/esbuild/angular-localize-init-warning-plugin.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+import type { Plugin } from 'esbuild';
+/**
+ * This plugin addresses an issue where '@angular/localize/init' is directly imported,
+ * potentially resulting in undefined behavior. By detecting such imports, the plugin
+ * issues a warning and suggests including '@angular/localize/init' as a polyfill.
+ *
+ * @returns An esbuild plugin.
+ */
+export declare function createAngularLocalizeInitWarningPlugin(): Plugin;

package/src/tools/esbuild/angular-localize-init-warning-plugin.js

@@ -0,0 +1,49 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAngularLocalizeInitWarningPlugin = createAngularLocalizeInitWarningPlugin;
+const NG_LOCALIZE_RESOLUTION = Symbol('NG_LOCALIZE_RESOLUTION');
+/**
+ * This plugin addresses an issue where '@angular/localize/init' is directly imported,
+ * potentially resulting in undefined behavior. By detecting such imports, the plugin
+ * issues a warning and suggests including '@angular/localize/init' as a polyfill.
+ *
+ * @returns An esbuild plugin.
+ */
+function createAngularLocalizeInitWarningPlugin() {
+    return {
+        name: 'angular-localize-init-warning',
+        setup(build) {
+            build.onResolve({ filter: /^@angular\/localize\/init/ }, async (args) => {
+                if (args.pluginData?.[NG_LOCALIZE_RESOLUTION]) {
+                    return null;
+                }
+                const { importer, kind, resolveDir, namespace, pluginData = {} } = args;
+                pluginData[NG_LOCALIZE_RESOLUTION] = true;
+                const result = await build.resolve(args.path, {
+                    importer,
+                    kind,
+                    namespace,
+                    pluginData,
+                    resolveDir,
+                });
+                return {
+                    ...result,
+                    warnings: [
+                        ...result.warnings,
+                        {
+                            text: `Direct import of '@angular/localize/init' detected. This may lead to undefined behavior.`,
+                            notes: [{ text: `Include '@angular/localize/init' as a polyfill instead.` }],
+                        },
+                    ],
+                };
+            });
+        },
+    };
+}

package/src/tools/esbuild/application-code-bundle.d.ts

@@ -7,11 +7,12 @@
  */
 import type { BuildOptions } from 'esbuild';
 import type { NormalizedApplicationBuildOptions } from '../../builders/application/options';
+import { AngularCompilation } from '../angular/compilation';
 import { ComponentStylesheetBundler } from './angular/component-stylesheets';
 import { SourceFileCache } from './angular/source-file-cache';
 import { BundlerOptionsFactory } from './bundler-context';
 import type { LoadResultCache } from './load-result-cache';
-export declare function createBrowserCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache, stylesheetBundler: ComponentStylesheetBundler, templateUpdates: Map<string, string> | undefined): BundlerOptionsFactory;
+export declare function createBrowserCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache, stylesheetBundler: ComponentStylesheetBundler, angularCompilation: AngularCompilation, templateUpdates: Map<string, string> | undefined): BundlerOptionsFactory;
 export declare function createBrowserPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache, stylesheetBundler: ComponentStylesheetBundler): BuildOptions | BundlerOptionsFactory | undefined;
 export declare function createServerPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], loadResultCache: LoadResultCache | undefined): BundlerOptionsFactory | undefined;
 export declare function createServerMainCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache, stylesheetBundler: ComponentStylesheetBundler): BundlerOptionsFactory;

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

@@ -21,7 +21,9 @@ const node_path_1 = require("node:path");
 const schema_1 = require("../../builders/application/schema");
 const environment_options_1 = require("../../utils/environment-options");
 const manifest_1 = require("../../utils/server-rendering/manifest");
+const compilation_1 = require("../angular/compilation");
 const compiler_plugin_1 = require("./angular/compiler-plugin");
+const angular_localize_init_warning_plugin_1 = require("./angular-localize-init-warning-plugin");
 const compiler_plugin_options_1 = require("./compiler-plugin-options");
 const external_packages_plugin_1 = require("./external-packages-plugin");
 const i18n_locale_plugin_1 = require("./i18n-locale-plugin");
@@ -32,7 +34,7 @@ const sourcemap_ignorelist_plugin_1 = require("./sourcemap-ignorelist-plugin");
 const utils_1 = require("./utils");
 const virtual_module_plugin_1 = require("./virtual-module-plugin");
 const wasm_plugin_1 = require("./wasm-plugin");
-function createBrowserCodeBundleOptions(options, target, sourceFileCache, stylesheetBundler, templateUpdates) {
+function createBrowserCodeBundleOptions(options, target, sourceFileCache, stylesheetBundler, angularCompilation, templateUpdates) {
     return (loadCache) => {
         const { entryPoints, outputNames, polyfills } = options;
         const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache, loadCache, templateUpdates);
@@ -53,9 +55,10 @@ function createBrowserCodeBundleOptions(options, target, sourceFileCache, styles
                 (0, loader_import_attribute_plugin_1.createLoaderImportAttributePlugin)(),
                 (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: loadCache }),
                 (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+                (0, angular_localize_init_warning_plugin_1.createAngularLocalizeInitWarningPlugin)(),
                 (0, compiler_plugin_1.createCompilerPlugin)(
                 // JS/TS options
-                pluginOptions, 
+                pluginOptions, angularCompilation, 
                 // Component stylesheet bundler
                 stylesheetBundler),
             ],
@@ -63,19 +66,7 @@ function createBrowserCodeBundleOptions(options, target, sourceFileCache, styles
         if (options.plugins) {
             buildOptions.plugins?.push(...options.plugins);
         }
-        if (options.externalPackages) {
-            // Package files affected by a customized loader should not be implicitly marked as external
-            if (options.loaderExtensions ||
-                options.plugins ||
-                typeof options.externalPackages === 'object') {
-                // Plugin must be added after custom plugins to ensure any added loader options are considered
-                buildOptions.plugins?.push((0, external_packages_plugin_1.createExternalPackagesPlugin)(options.externalPackages !== true ? options.externalPackages : undefined));
-            }
-            else {
-                // Safe to use the packages external option directly
-                buildOptions.packages = 'external';
-            }
-        }
+        appendOptionsForExternalPackages(options, buildOptions);
         return buildOptions;
     };
 }
@@ -107,7 +98,9 @@ function createBrowserPolyfillBundleOptions(options, target, sourceFileCache, st
         const pluginOptions = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, sourceFileCache);
         buildOptions.plugins.push((0, compiler_plugin_1.createCompilerPlugin)(
         // JS/TS options
-        { ...pluginOptions, noopTypeScriptCompilation: true }, 
+        pluginOptions, 
+        // Browser compilation handles the actual Angular code compilation
+        new compilation_1.NoopCompilation(), 
         // Component stylesheet options are unused for polyfills but required by the plugin
         stylesheetBundler));
     }
@@ -196,18 +189,18 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache, sty
             plugins: [
                 (0, wasm_plugin_1.createWasmPlugin)({ allowAsync: zoneless, cache: loadResultCache }),
                 (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+                (0, angular_localize_init_warning_plugin_1.createAngularLocalizeInitWarningPlugin)(),
                 (0, compiler_plugin_1.createCompilerPlugin)(
                 // JS/TS options
-                { ...pluginOptions, noopTypeScriptCompilation: true }, 
+                pluginOptions, 
+                // Browser compilation handles the actual Angular code compilation
+                new compilation_1.NoopCompilation(), 
                 // Component stylesheet bundler
                 stylesheetBundler),
             ],
         };
         buildOptions.plugins ??= [];
-        if (externalPackages) {
-            buildOptions.packages = 'external';
-        }
-        else {
+        if (!externalPackages) {
             buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
         }
         // Mark manifest and polyfills file as external as these are generated by a different bundle step.
@@ -266,6 +259,7 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache, sty
         if (options.plugins) {
             buildOptions.plugins.push(...options.plugins);
         }
+        appendOptionsForExternalPackages(options, buildOptions);
         return buildOptions;
     };
 }
@@ -299,18 +293,18 @@ function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, style
             supported: (0, utils_1.getFeatureSupport)(target, true),
             plugins: [
                 (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+                (0, angular_localize_init_warning_plugin_1.createAngularLocalizeInitWarningPlugin)(),
                 (0, compiler_plugin_1.createCompilerPlugin)(
                 // JS/TS options
-                { ...pluginOptions, noopTypeScriptCompilation: true }, 
+                pluginOptions, 
+                // Browser compilation handles the actual Angular code compilation
+                new compilation_1.NoopCompilation(), 
                 // Component stylesheet bundler
                 stylesheetBundler),
             ],
         };
         buildOptions.plugins ??= [];
-        if (externalPackages) {
-            buildOptions.packages = 'external';
-        }
-        else {
+        if (!externalPackages) {
             buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
         }
         // Mark manifest file as external. As this will be generated later on.
@@ -366,6 +360,7 @@ function createSsrEntryCodeBundleOptions(options, target, sourceFileCache, style
         if (options.plugins) {
             buildOptions.plugins.push(...options.plugins);
         }
+        appendOptionsForExternalPackages(options, buildOptions);
         return buildOptions;
     };
 }
@@ -524,3 +519,19 @@ function entryFileToWorkspaceRelative(workspaceRoot, entryFile) {
             .replace(/.[mc]?ts$/, '')
             .replace(/\\/g, '/'));
 }
+function appendOptionsForExternalPackages(options, buildOptions) {
+    if (!options.externalPackages) {
+        return;
+    }
+    buildOptions.plugins ??= [];
+    // Package files affected by a customized loader should not be implicitly marked as external
+    if (options.loaderExtensions || options.plugins || typeof options.externalPackages === 'object') {
+        // Plugin must be added after custom plugins to ensure any added loader options are considered
+        buildOptions.plugins.push((0, external_packages_plugin_1.createExternalPackagesPlugin)(options.externalPackages !== true ? options.externalPackages : undefined));
+        buildOptions.packages = undefined;
+    }
+    else {
+        // Safe to use the packages external option directly
+        buildOptions.packages = 'external';
+    }
+}

package/src/tools/esbuild/bundler-execution-result.d.ts

@@ -22,7 +22,11 @@ export interface RebuildState {
     componentStyleBundler: ComponentStylesheetBundler;
     codeBundleCache?: SourceFileCache;
     fileChanges: ChangedFiles;
-    previousOutputHashes: Map<string, string>;
+    previousOutputInfo: ReadonlyMap<string, {
+        hash: string;
+        type: BuildOutputFileType;
+    }>;
+    previousAssetsInfo: ReadonlyMap<string, string>;
     templateUpdates?: Map<string, string>;
 }
 export interface ExternalResultMetadata {
@@ -81,8 +85,11 @@ export declare class ExecutionResult {
         errors: (PartialMessage | Message)[];
         externalMetadata: ExternalResultMetadata | undefined;
     };
-    get watchFiles(): string[];
+    get watchFiles(): Readonly<string[]>;
     createRebuildState(fileChanges: ChangedFiles): RebuildState;
-    findChangedFiles(previousOutputHashes: Map<string, string>): Set<string>;
+    findChangedFiles(previousOutputHashes: ReadonlyMap<string, {
+        hash: string;
+        type: BuildOutputFileType;
+    }>): Set<string>;
     dispose(): Promise<void>;
 }

package/src/tools/esbuild/bundler-execution-result.js

@@ -103,16 +103,18 @@ class ExecutionResult {
         };
     }
     get watchFiles() {
-        // Bundler contexts internally normalize file dependencies
-        const files = this.rebuildContexts.typescriptContexts
-            .flatMap((context) => [...context.watchFiles])
-            .concat(this.rebuildContexts.otherContexts.flatMap((context) => [...context.watchFiles]));
-        if (this.codeBundleCache?.referencedFiles) {
+        const { typescriptContexts, otherContexts } = this.rebuildContexts;
+        return [
+            // Bundler contexts internally normalize file dependencies.
+            ...typescriptContexts.flatMap((context) => [...context.watchFiles]),
+            ...otherContexts.flatMap((context) => [...context.watchFiles]),
             // These files originate from TS/NG and can have POSIX path separators even on Windows.
             // To ensure path comparisons are valid, all these paths must be normalized.
-            files.push(...this.codeBundleCache.referencedFiles.map(node_path_1.normalize));
-        }
-        return files.concat(this.extraWatchFiles);
+            ...(this.codeBundleCache?.referencedFiles?.map(node_path_1.normalize) ?? []),
+            // The assets source files.
+            ...this.assetFiles.map(({ source }) => source),
+            ...this.extraWatchFiles,
+        ];
     }
     createRebuildState(fileChanges) {
         return {
@@ -120,14 +122,15 @@ class ExecutionResult {
             codeBundleCache: this.codeBundleCache,
             componentStyleBundler: this.componentStyleBundler,
             fileChanges,
-            previousOutputHashes: new Map(this.outputFiles.map((file) => [file.path, file.hash])),
+            previousOutputInfo: new Map(this.outputFiles.map(({ path, hash, type }) => [path, { hash, type }])),
+            previousAssetsInfo: new Map(this.assetFiles.map(({ source, destination }) => [source, destination])),
             templateUpdates: this.templateUpdates,
         };
     }
     findChangedFiles(previousOutputHashes) {
         const changed = new Set();
         for (const file of this.outputFiles) {
-            const previousHash = previousOutputHashes.get(file.path);
+            const previousHash = previousOutputHashes.get(file.path)?.hash;
             if (previousHash === undefined || previousHash !== file.hash) {
                 changed.add(file.path);
             }

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

@@ -12,7 +12,6 @@ function createCompilerPluginOptions(options, sourceFileCache, loadResultCache,
     const { sourcemapOptions, tsconfig, fileReplacements, advancedOptimizations, jit, externalRuntimeStyles, instrumentForCoverage, } = options;
     const incremental = !!options.watch;
     return {
-        browserOnlyBuild: !options.serverEntryPoint,
         sourcemap: !!sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
         thirdPartySourcemaps: sourcemapOptions.vendor,
         tsconfig,

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

@@ -39,12 +39,16 @@ class JavaScriptTransformer {
         this.#fileCacheKeyBase = Buffer.from(JSON.stringify(this.#commonOptions), 'utf-8');
     }
     #ensureWorkerPool() {
-        this.#workerPool ??= new worker_pool_1.WorkerPool({
+        const workerPoolOptions = {
             filename: require.resolve('./javascript-transformer-worker'),
             maxThreads: this.maxThreads,
-            // Prevent passing `--import` (loader-hooks) from parent to child worker.
-            execArgv: process.execArgv.filter((v) => v !== utils_1.IMPORT_EXEC_ARGV),
-        });
+        };
+        // Prevent passing SSR `--import` (loader-hooks) from parent to child worker.
+        const filteredExecArgv = process.execArgv.filter((v) => v !== utils_1.IMPORT_EXEC_ARGV);
+        if (process.execArgv.length !== filteredExecArgv.length) {
+            workerPoolOptions.execArgv = filteredExecArgv;
+        }
+        this.#workerPool ??= new worker_pool_1.WorkerPool(workerPoolOptions);
         return this.#workerPool;
     }
     /**

package/src/tools/vite/middlewares/assets-middleware.d.ts

@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { Connect, ViteDevServer } from 'vite';
-import { AngularMemoryOutputFiles } from '../utils';
+import { AngularMemoryOutputFiles, AngularOutputAssets } from '../utils';
 export interface ComponentStyleRecord {
     rawContent: Uint8Array;
     used?: Set<string>;
     reload?: boolean;
 }
-export declare function createAngularAssetsMiddleware(server: ViteDevServer, assets: Map<string, string>, outputFiles: AngularMemoryOutputFiles, componentStyles: Map<string, ComponentStyleRecord>, encapsulateStyle: (style: Uint8Array, componentId: string) => string): Connect.NextHandleFunction;
+export declare function createAngularAssetsMiddleware(server: ViteDevServer, assets: AngularOutputAssets, outputFiles: AngularMemoryOutputFiles, componentStyles: Map<string, ComponentStyleRecord>, encapsulateStyle: (style: Uint8Array, componentId: string) => string): Connect.NextHandleFunction;

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

@@ -22,15 +22,15 @@ function createAngularAssetsMiddleware(server, assets, outputFiles, componentSty
         const extension = (0, node_path_1.extname)(pathname);
         const pathnameHasTrailingSlash = pathname[pathname.length - 1] === '/';
         // Rewrite all build assets to a vite raw fs URL
-        const assetSourcePath = assets.get(pathname);
-        if (assetSourcePath !== undefined) {
+        const asset = assets.get(pathname);
+        if (asset) {
             // Workaround to disable Vite transformer middleware.
             // See: https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/middlewares/transform.ts#L201 and
             // https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/transformRequest.ts#L204-L206
             req.headers.accept = 'text/html';
             // The encoding needs to match what happens in the vite static middleware.
             // ref: https://github.com/vitejs/vite/blob/d4f13bd81468961c8c926438e815ab6b1c82735e/packages/vite/src/node/server/middlewares/static.ts#L163
-            req.url = `${server.config.base}@fs/${encodeURI(assetSourcePath)}`;
+            req.url = `${server.config.base}@fs/${encodeURI(asset.source)}`;
             next();
             return;
         }
@@ -43,7 +43,7 @@ function createAngularAssetsMiddleware(server, assets, outputFiles, componentSty
             : // Non-trailing slash check for fallback `.html`
                 assets.get(pathname + '.html');
         if (htmlAssetSourcePath) {
-            req.url = `${server.config.base}@fs/${encodeURI(htmlAssetSourcePath)}`;
+            req.url = `${server.config.base}@fs/${encodeURI(htmlAssetSourcePath.source)}`;
             next();
             return;
         }

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

@@ -16,6 +16,7 @@ const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const load_esm_1 = require("../../../utils/load-esm");
 const ANGULAR_PREFIX = '/@ng/';
+const VITE_FS_PREFIX = '/@fs/';
 async function createAngularMemoryPlugin(options) {
     const { virtualProjectRoot, outputFiles, external } = options;
     const { normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
@@ -24,6 +25,9 @@ async function createAngularMemoryPlugin(options) {
         // Ensures plugin hooks run before built-in Vite hooks
         enforce: 'pre',
         async resolveId(source, importer, { ssr }) {
+            if (source.startsWith(VITE_FS_PREFIX)) {
+                return;
+            }
             // For SSR with component HMR, pass through as a virtual module
             if (ssr && source.startsWith(ANGULAR_PREFIX)) {
                 return '\0' + source;
@@ -35,25 +39,26 @@ async function createAngularMemoryPlugin(options) {
                 return source;
             }
             if (importer) {
-                if (source[0] === '.' && normalizePath(importer).startsWith(virtualProjectRoot)) {
+                const normalizedImporter = normalizePath(importer);
+                if (source[0] === '.' && normalizedImporter.startsWith(virtualProjectRoot)) {
                     // Remove query if present
-                    const [importerFile] = importer.split('?', 1);
+                    const [importerFile] = normalizedImporter.split('?', 1);
                     source = '/' + (0, node_path_1.join)((0, node_path_1.dirname)((0, node_path_1.relative)(virtualProjectRoot, importerFile)), source);
                 }
                 else if (!ssr &&
                     source[0] === '/' &&
                     importer.endsWith('index.html') &&
-                    normalizePath(importer).startsWith(virtualProjectRoot)) {
+                    normalizedImporter.startsWith(virtualProjectRoot)) {
                     // This is only needed when using SSR and `angularSsrMiddleware` (old style) to correctly resolve
                     // .js files when using lazy-loading.
                     // Remove query if present
-                    const [importerFile] = importer.split('?', 1);
+                    const [importerFile] = normalizedImporter.split('?', 1);
                     source =
                         '/' + (0, node_path_1.join)((0, node_path_1.dirname)((0, node_path_1.relative)(virtualProjectRoot, importerFile)), (0, node_path_1.basename)(source));
                 }
             }
             const [file] = source.split('?', 1);
-            if (outputFiles.has(file)) {
+            if (outputFiles.has(normalizePath(file))) {
                 return (0, node_path_1.join)(virtualProjectRoot, source);
             }
         },

package/src/tools/vite/plugins/setup-middlewares-plugin.d.ts

@@ -7,7 +7,7 @@
  */
 import type { Connect, Plugin } from 'vite';
 import { ComponentStyleRecord } from '../middlewares';
-import { AngularMemoryOutputFiles } from '../utils';
+import { AngularMemoryOutputFiles, AngularOutputAssets } from '../utils';
 export declare enum ServerSsrMode {
     /**
      * No SSR
@@ -32,7 +32,7 @@ export declare enum ServerSsrMode {
 }
 interface AngularSetupMiddlewaresPluginOptions {
     outputFiles: AngularMemoryOutputFiles;
-    assets: Map<string, string>;
+    assets: AngularOutputAssets;
     extensionMiddleware?: Connect.NextHandleFunction[];
     indexHtmlTransformer?: (content: string) => Promise<string>;
     componentStyles: Map<string, ComponentStyleRecord>;

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

@@ -12,10 +12,13 @@ export type AngularMemoryOutputFiles = Map<string, {
     hash: string;
     servable: boolean;
 }>;
+export type AngularOutputAssets = Map<string, {
+    source: string;
+}>;
 export declare function pathnameWithoutBasePath(url: string, basePath: string): string;
 export declare function lookupMimeTypeFromRequest(url: string): string | undefined;
 export type EsbuildLoaderOption = Exclude<DepOptimizationConfig['esbuildOptions'], undefined>['loader'];
-export declare function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless, prebundleTransformer, ssr, loader, thirdPartySourcemaps, }: {
+export declare function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless, prebundleTransformer, ssr, loader, thirdPartySourcemaps, define, }: {
     disabled: boolean;
     exclude: string[];
     include: string[];
@@ -25,4 +28,5 @@ export declare function getDepOptimizationConfig({ disabled, exclude, include, t
     zoneless: boolean;
     loader?: EsbuildLoaderOption;
     thirdPartySourcemaps: boolean;
+    define: Record<string, string> | undefined;
 }): DepOptimizationConfig;

package/src/tools/vite/utils.js

@@ -28,7 +28,7 @@ function lookupMimeTypeFromRequest(url) {
     }
     return extension && (0, mrmime_1.lookup)(extension);
 }
-function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless, prebundleTransformer, ssr, loader, thirdPartySourcemaps, }) {
+function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless, prebundleTransformer, ssr, loader, thirdPartySourcemaps, define = {}, }) {
     const plugins = [
         {
             name: `angular-vite-optimize-deps${ssr ? '-ssr' : ''}${thirdPartySourcemaps ? '-vendor-sourcemap' : ''}`,
@@ -57,6 +57,7 @@ function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless
             plugins,
             loader,
             define: {
+                ...define,
                 'ngServerMode': `${ssr}`,
             },
             resolveExtensions: ['.mjs', '.js', '.cjs'],

package/src/utils/bundle-calculator.d.ts

@@ -7,6 +7,7 @@
  */
 import { Budget as BudgetEntry, Type as BudgetType } from '../builders/application/schema';
 export { type BudgetEntry, BudgetType };
+export declare const BYTES_IN_KILOBYTE = 1000;
 export interface Threshold {
     limit: number;
     type: ThresholdType;

package/src/utils/bundle-calculator.js

@@ -7,13 +7,14 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThresholdSeverity = exports.BudgetType = void 0;
+exports.ThresholdSeverity = exports.BYTES_IN_KILOBYTE = exports.BudgetType = void 0;
 exports.calculateThresholds = calculateThresholds;
 exports.checkBudgets = checkBudgets;
 exports.checkThresholds = checkThresholds;
 const schema_1 = require("../builders/application/schema");
 Object.defineProperty(exports, "BudgetType", { enumerable: true, get: function () { return schema_1.Type; } });
 const format_bytes_1 = require("./format-bytes");
+exports.BYTES_IN_KILOBYTE = 1000;
 var ThresholdType;
 (function (ThresholdType) {
     ThresholdType["Max"] = "maximum";
@@ -242,13 +243,13 @@ function calculateBytes(input, baseline, factor = 1) {
             value = (baselineBytes * value) / 100;
             break;
         case 'kb':
-            value *= 1024;
+            value *= exports.BYTES_IN_KILOBYTE;
             break;
         case 'mb':
-            value *= 1024 * 1024;
+            value *= exports.BYTES_IN_KILOBYTE * exports.BYTES_IN_KILOBYTE;
             break;
         case 'gb':
-            value *= 1024 * 1024 * 1024;
+            value *= exports.BYTES_IN_KILOBYTE * exports.BYTES_IN_KILOBYTE * exports.BYTES_IN_KILOBYTE;
             break;
     }
     if (baselineBytes === 0) {

package/src/utils/environment-options.js

@@ -83,7 +83,7 @@ exports.useJSONBuildLogs = isPresent(buildLogsJsonVariable) && isEnabled(buildLo
 const optimizeChunksVariable = process.env['NG_BUILD_OPTIMIZE_CHUNKS'];
 exports.shouldOptimizeChunks = isPresent(optimizeChunksVariable) && isEnabled(optimizeChunksVariable);
 const hmrComponentStylesVariable = process.env['NG_HMR_CSTYLES'];
-exports.useComponentStyleHmr = !isPresent(hmrComponentStylesVariable) || !isDisabled(hmrComponentStylesVariable);
+exports.useComponentStyleHmr = isPresent(hmrComponentStylesVariable) && isEnabled(hmrComponentStylesVariable);
 const hmrComponentTemplateVariable = process.env['NG_HMR_TEMPLATES'];
 exports.useComponentTemplateHmr = !isPresent(hmrComponentTemplateVariable) || !isDisabled(hmrComponentTemplateVariable);
 const partialSsrBuildVariable = process.env['NG_BUILD_PARTIAL_SSR'];