@angular/build 19.0.0-next.7 → 19.0.0-next.9

package/src/tools/esbuild/angular/component-stylesheets.d.ts

@@ -22,7 +22,7 @@ export declare class ComponentStylesheetBundler {
      * @param cache A load result cache to use when bundling.
      */
     constructor(options: BundleStylesheetOptions, incremental: boolean);
-    bundleFile(entry: string): Promise<{
+    bundleFile(entry: string, externalId?: string | boolean): Promise<{
         errors: import("esbuild").Message[] | undefined;
         warnings: import("esbuild").Message[];
         contents: string;
@@ -30,7 +30,7 @@ export declare class ComponentStylesheetBundler {
         metafile: import("esbuild").Metafile | undefined;
         referencedFiles: Set<string> | undefined;
     }>;
-    bundleInline(data: string, filename: string, language: string): Promise<{
+    bundleInline(data: string, filename: string, language: string, externalId?: string): Promise<{
         errors: import("esbuild").Message[] | undefined;
         warnings: import("esbuild").Message[];
         contents: string;
@@ -38,7 +38,12 @@ export declare class ComponentStylesheetBundler {
         metafile: import("esbuild").Metafile | undefined;
         referencedFiles: Set<string> | undefined;
     }>;
-    invalidate(files: Iterable<string>): void;
+    /**
+     * Invalidates both file and inline based component style bundling state for a set of modified files.
+     * @param files The group of files that have been modified
+     * @returns An array of file based stylesheet entries if any were invalidated; otherwise, undefined.
+     */
+    invalidate(files: Iterable<string>): string[] | undefined;
     dispose(): Promise<void>;
     private extractResult;
 }

package/src/tools/esbuild/angular/component-stylesheets.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentStylesheetBundler = void 0;
+const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
 const node_path_1 = __importDefault(require("node:path"));
 const bundler_context_1 = require("../bundler-context");
@@ -35,21 +36,31 @@ class ComponentStylesheetBundler {
         this.options = options;
         this.incremental = incremental;
     }
-    async bundleFile(entry) {
+    async bundleFile(entry, externalId) {
         const bundlerContext = await this.#fileContexts.getOrCreate(entry, () => {
             return new bundler_context_1.BundlerContext(this.options.workspaceRoot, this.incremental, (loadCache) => {
                 const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)(this.options, loadCache);
-                buildOptions.entryPoints = [entry];
+                if (externalId) {
+                    (0, node_assert_1.default)(typeof externalId === 'string', 'Initial external component stylesheets must have a string identifier');
+                    buildOptions.entryPoints = { [externalId]: entry };
+                    delete buildOptions.publicPath;
+                }
+                else {
+                    buildOptions.entryPoints = [entry];
+                }
                 return buildOptions;
             });
         });
-        return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);
+        return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles, !!externalId);
     }
-    async bundleInline(data, filename, language) {
+    async bundleInline(data, filename, language, externalId) {
         // Use a hash of the inline stylesheet content to ensure a consistent identifier. External stylesheets will resolve
         // to the actual stylesheet file path.
         // TODO: Consider xxhash instead for hashing
-        const id = (0, node_crypto_1.createHash)('sha256').update(data).digest('hex');
+        const id = (0, node_crypto_1.createHash)('sha256')
+            .update(data)
+            .update(externalId ?? '')
+            .digest('hex');
         const entry = [language, id, filename].join(';');
         const bundlerContext = await this.#inlineContexts.getOrCreate(entry, () => {
             const namespace = 'angular:styles/component';
@@ -57,7 +68,13 @@ class ComponentStylesheetBundler {
                 const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)(this.options, loadCache, {
                     [entry]: data,
                 });
-                buildOptions.entryPoints = [`${namespace};${entry}`];
+                if (externalId) {
+                    buildOptions.entryPoints = { [externalId]: `${namespace};${entry}` };
+                    delete buildOptions.publicPath;
+                }
+                else {
+                    buildOptions.entryPoints = [`${namespace};${entry}`];
+                }
                 buildOptions.plugins.push({
                     name: 'angular-component-styles',
                     setup(build) {
@@ -83,19 +100,29 @@ class ComponentStylesheetBundler {
             });
         });
         // Extract the result of the bundling from the output files
-        return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);
+        return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles, !!externalId);
     }
+    /**
+     * Invalidates both file and inline based component style bundling state for a set of modified files.
+     * @param files The group of files that have been modified
+     * @returns An array of file based stylesheet entries if any were invalidated; otherwise, undefined.
+     */
     invalidate(files) {
         if (!this.incremental) {
             return;
         }
         const normalizedFiles = [...files].map(node_path_1.default.normalize);
-        for (const bundler of this.#fileContexts.values()) {
-            bundler.invalidate(normalizedFiles);
+        let entries;
+        for (const [entry, bundler] of this.#fileContexts.entries()) {
+            if (bundler.invalidate(normalizedFiles)) {
+                entries ??= [];
+                entries.push(entry);
+            }
         }
         for (const bundler of this.#inlineContexts.values()) {
             bundler.invalidate(normalizedFiles);
         }
+        return entries;
     }
     async dispose() {
         const contexts = [...this.#fileContexts.values(), ...this.#inlineContexts.values()];
@@ -103,7 +130,7 @@ class ComponentStylesheetBundler {
         this.#inlineContexts.clear();
         await Promise.allSettled(contexts.map((context) => context.dispose()));
     }
-    extractResult(result, referencedFiles) {
+    extractResult(result, referencedFiles, external) {
         let contents = '';
         let metafile;
         const outputFiles = [];
@@ -122,7 +149,15 @@ class ComponentStylesheetBundler {
                     outputFiles.push(clonedOutputFile);
                 }
                 else if (filename.endsWith('.css')) {
-                    contents = outputFile.text;
+                    if (external) {
+                        const clonedOutputFile = outputFile.clone();
+                        clonedOutputFile.path = node_path_1.default.join(this.options.workspaceRoot, outputFile.path);
+                        outputFiles.push(clonedOutputFile);
+                        contents = node_path_1.default.posix.join(this.options.publicPath ?? '', filename);
+                    }
+                    else {
+                        contents = outputFile.text;
+                    }
                 }
                 else {
                     throw new Error(`Unexpected non CSS/Media file "${filename}" outputted during component stylesheet processing.`);

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

@@ -13,3 +13,4 @@ export declare function createBrowserCodeBundleOptions(options: NormalizedApplic
 export declare function createBrowserPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BuildOptions | BundlerOptionsFactory | undefined;
 export declare function createServerPolyfillBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache?: SourceFileCache): BundlerOptionsFactory | undefined;
 export declare function createServerMainCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache): BuildOptions;
+export declare function createSsrEntryCodeBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], sourceFileCache: SourceFileCache): BuildOptions;

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

@@ -14,6 +14,7 @@ exports.createBrowserCodeBundleOptions = createBrowserCodeBundleOptions;
 exports.createBrowserPolyfillBundleOptions = createBrowserPolyfillBundleOptions;
 exports.createServerPolyfillBundleOptions = createServerPolyfillBundleOptions;
 exports.createServerMainCodeBundleOptions = createServerMainCodeBundleOptions;
+exports.createSsrEntryCodeBundleOptions = createSsrEntryCodeBundleOptions;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
 const node_path_1 = require("node:path");
@@ -156,7 +157,7 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
     return () => buildOptions;
 }
 function createServerMainCodeBundleOptions(options, target, sourceFileCache) {
-    const { serverEntryPoint: mainServerEntryPoint, workspaceRoot, externalPackages, ssrOptions, polyfills, } = options;
+    const { serverEntryPoint: mainServerEntryPoint, workspaceRoot, outputMode, externalPackages, ssrOptions, polyfills, } = options;
     (0, node_assert_1.default)(mainServerEntryPoint, 'createServerCodeBundleOptions should not be called without a defined serverEntryPoint.');
     const { pluginOptions, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, sourceFileCache);
     const mainServerNamespace = 'angular:main-server';
@@ -167,7 +168,8 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache) {
         'main.server': mainServerNamespace,
     };
     const ssrEntryPoint = ssrOptions?.entry;
-    if (ssrEntryPoint) {
+    const isOldBehaviour = !outputMode;
+    if (ssrEntryPoint && isOldBehaviour) {
         // Old behavior: 'server.ts' was bundled together with the SSR (Server-Side Rendering) code.
         // This approach combined server-side logic and rendering into a single bundle.
         entryPoints['server'] = ssrEntryPoint;
@@ -249,6 +251,111 @@ function createServerMainCodeBundleOptions(options, target, sourceFileCache) {
     }
     return buildOptions;
 }
+function createSsrEntryCodeBundleOptions(options, target, sourceFileCache) {
+    const { workspaceRoot, ssrOptions, externalPackages } = options;
+    const serverEntryPoint = ssrOptions?.entry;
+    (0, node_assert_1.default)(serverEntryPoint, 'createSsrEntryCodeBundleOptions should not be called without a defined serverEntryPoint.');
+    const { pluginOptions, styleOptions } = (0, compiler_plugin_options_1.createCompilerPluginOptions)(options, target, sourceFileCache);
+    const ssrEntryNamespace = 'angular:ssr-entry';
+    const ssrInjectManifestNamespace = 'angular:ssr-entry-inject-manifest';
+    const ssrInjectRequireNamespace = 'angular:ssr-entry-inject-require';
+    const buildOptions = {
+        ...getEsBuildServerCommonOptions(options),
+        target,
+        entryPoints: {
+            // TODO: consider renaming to index
+            'server': ssrEntryNamespace,
+        },
+        supported: (0, utils_1.getFeatureSupport)(target, true),
+        plugins: [
+            (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
+            (0, compiler_plugin_1.createCompilerPlugin)(
+            // JS/TS options
+            { ...pluginOptions, noopTypeScriptCompilation: true }, 
+            // Component stylesheet options
+            styleOptions),
+        ],
+        inject: [ssrInjectRequireNamespace, ssrInjectManifestNamespace],
+    };
+    buildOptions.plugins ??= [];
+    if (externalPackages) {
+        buildOptions.packages = 'external';
+    }
+    else {
+        buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
+    }
+    // Mark manifest file as external. As this will be generated later on.
+    (buildOptions.external ??= []).push('*/main.server.mjs', ...utils_1.SERVER_GENERATED_EXTERNALS);
+    buildOptions.plugins.push({
+        name: 'angular-ssr-metadata',
+        setup(build) {
+            build.onEnd((result) => {
+                if (result.metafile) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    result.metafile['ng-ssr-entry-bundle'] = true;
+                }
+            });
+        },
+    }, (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+        namespace: ssrInjectRequireNamespace,
+        cache: sourceFileCache?.loadResultCache,
+        loadContent: () => {
+            const contents = [
+                // Note: Needed as esbuild does not provide require shims / proxy from ESModules.
+                // See: https://github.com/evanw/esbuild/issues/1921.
+                `import { createRequire } from 'node:module';`,
+                `globalThis['require'] ??= createRequire(import.meta.url);`,
+            ];
+            return {
+                contents: contents.join('\n'),
+                loader: 'js',
+                resolveDir: workspaceRoot,
+            };
+        },
+    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+        namespace: ssrInjectManifestNamespace,
+        cache: sourceFileCache?.loadResultCache,
+        loadContent: () => {
+            const contents = [
+                // Configure `@angular/ssr` app engine manifest.
+                `import manifest from './${manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME}';`,
+                `import { ɵsetAngularAppEngineManifest } from '@angular/ssr';`,
+                `ɵsetAngularAppEngineManifest(manifest);`,
+            ];
+            return {
+                contents: contents.join('\n'),
+                loader: 'js',
+                resolveDir: workspaceRoot,
+            };
+        },
+    }), (0, virtual_module_plugin_1.createVirtualModulePlugin)({
+        namespace: ssrEntryNamespace,
+        cache: sourceFileCache?.loadResultCache,
+        loadContent: () => {
+            const serverEntryPointJsImport = entryFileToWorkspaceRelative(workspaceRoot, serverEntryPoint);
+            const contents = [
+                // Re-export all symbols including default export
+                `import * as server from '${serverEntryPointJsImport}';`,
+                `export * from '${serverEntryPointJsImport}';`,
+                // The below is needed to avoid
+                // `Import "default" will always be undefined because there is no matching export` warning when no default is present.
+                `const defaultExportName = 'default';`,
+                `export default server[defaultExportName]`,
+                // Add @angular/ssr exports
+                `export { AngularAppEngine } from '@angular/ssr';`,
+            ];
+            return {
+                contents: contents.join('\n'),
+                loader: 'js',
+                resolveDir: workspaceRoot,
+            };
+        },
+    }));
+    if (options.plugins) {
+        buildOptions.plugins.push(...options.plugins);
+    }
+    return buildOptions;
+}
 function getEsBuildServerCommonOptions(options) {
     return {
         ...getEsBuildCommonOptions(options),

package/src/tools/esbuild/budget-stats.js

@@ -28,7 +28,7 @@ function generateBudgetStats(metafile, outputFiles, initialFiles) {
             continue;
         }
         // Exclude server bundles
-        if (type === bundler_context_1.BuildOutputFileType.Server) {
+        if (type === bundler_context_1.BuildOutputFileType.ServerApplication || type === bundler_context_1.BuildOutputFileType.ServerRoot) {
             continue;
         }
         const initialRecord = initialFiles.get(file);

package/src/tools/esbuild/bundler-context.d.ts

@@ -31,9 +31,10 @@ export interface InitialFileRecord {
     depth: number;
 }
 export declare enum BuildOutputFileType {
-    Browser = 1,
-    Media = 2,
-    Server = 3,
+    Browser = 0,
+    Media = 1,
+    ServerApplication = 2,
+    ServerRoot = 3,
     Root = 4
 }
 export interface BuildOutputFile extends OutputFile {

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

@@ -18,9 +18,10 @@ const load_result_cache_1 = require("./load-result-cache");
 const utils_1 = require("./utils");
 var BuildOutputFileType;
 (function (BuildOutputFileType) {
-    BuildOutputFileType[BuildOutputFileType["Browser"] = 1] = "Browser";
-    BuildOutputFileType[BuildOutputFileType["Media"] = 2] = "Media";
-    BuildOutputFileType[BuildOutputFileType["Server"] = 3] = "Server";
+    BuildOutputFileType[BuildOutputFileType["Browser"] = 0] = "Browser";
+    BuildOutputFileType[BuildOutputFileType["Media"] = 1] = "Media";
+    BuildOutputFileType[BuildOutputFileType["ServerApplication"] = 2] = "ServerApplication";
+    BuildOutputFileType[BuildOutputFileType["ServerRoot"] = 3] = "ServerRoot";
     BuildOutputFileType[BuildOutputFileType["Root"] = 4] = "Root";
 })(BuildOutputFileType || (exports.BuildOutputFileType = BuildOutputFileType = {}));
 /**
@@ -292,7 +293,10 @@ class BundlerContext {
                 fileType = BuildOutputFileType.Media;
             }
             else if (this.#platformIsServer) {
-                fileType = BuildOutputFileType.Server;
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                fileType = result.metafile['ng-ssr-entry-bundle']
+                    ? BuildOutputFileType.ServerRoot
+                    : BuildOutputFileType.ServerApplication;
             }
             else {
                 fileType = BuildOutputFileType.Browser;

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

@@ -24,6 +24,9 @@ export interface ExternalResultMetadata {
     implicitServer: string[];
     explicit: string[];
 }
+export type PrerenderedRoutesRecord = Record<string, {
+    headers?: Record<string, string>;
+}>;
 /**
  * Represents the result of a single builder execute call.
  */
@@ -33,7 +36,7 @@ export declare class ExecutionResult {
     outputFiles: BuildOutputFile[];
     assetFiles: BuildOutputAsset[];
     errors: (Message | PartialMessage)[];
-    prerenderedRoutes: string[];
+    prerenderedRoutes: PrerenderedRoutesRecord;
     warnings: (Message | PartialMessage)[];
     logs: string[];
     externalMetadata?: ExternalResultMetadata;
@@ -46,7 +49,7 @@ export declare class ExecutionResult {
     addLog(value: string): void;
     addError(error: PartialMessage | string): void;
     addErrors(errors: (PartialMessage | string)[]): void;
-    addPrerenderedRoutes(routes: string[]): void;
+    addPrerenderedRoutes(routes: PrerenderedRoutesRecord): void;
     addWarning(error: PartialMessage | string): void;
     addWarnings(errors: (PartialMessage | string)[]): void;
     /**

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

@@ -19,7 +19,7 @@ class ExecutionResult {
     outputFiles = [];
     assetFiles = [];
     errors = [];
-    prerenderedRoutes = [];
+    prerenderedRoutes = {};
     warnings = [];
     logs = [];
     externalMetadata;
@@ -53,9 +53,13 @@ class ExecutionResult {
         }
     }
     addPrerenderedRoutes(routes) {
-        this.prerenderedRoutes.push(...routes);
+        Object.assign(this.prerenderedRoutes, routes);
         // Sort the prerendered routes.
-        this.prerenderedRoutes.sort((a, b) => a.localeCompare(b));
+        const sortedObj = {};
+        for (const key of Object.keys(this.prerenderedRoutes).sort()) {
+            sortedObj[key] = this.prerenderedRoutes[key];
+        }
+        this.prerenderedRoutes = sortedObj;
     }
     addWarning(error) {
         if (typeof error === 'string') {

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

@@ -85,4 +85,9 @@ export declare class MemoryCache<V> extends Cache<V, Map<string, V>> {
      * @returns An iterable of all values in the cache.
      */
     values(): MapIterator<V>;
+    /**
+     * Provides all the keys/values currently present in the cache instance.
+     * @returns An iterable of all key/value pairs in the cache.
+     */
+    entries(): MapIterator<[string, V]>;
 }

package/src/tools/esbuild/cache.js

@@ -88,5 +88,12 @@ class MemoryCache extends Cache {
     values() {
         return this.store.values();
     }
+    /**
+     * Provides all the keys/values currently present in the cache instance.
+     * @returns An iterable of all key/value pairs in the cache.
+     */
+    entries() {
+        return this.store.entries();
+    }
 }
 exports.MemoryCache = MemoryCache;

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

@@ -9,7 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPluginOptions = createCompilerPluginOptions;
 function createCompilerPluginOptions(options, target, sourceFileCache) {
-    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, postcssConfiguration, publicPath, } = options;
+    const { workspaceRoot, optimizationOptions, sourcemapOptions, tsconfig, outputNames, fileReplacements, externalDependencies, preserveSymlinks, stylePreprocessorOptions, advancedOptimizations, inlineStyleLanguage, jit, cacheOptions, tailwindConfiguration, postcssConfiguration, publicPath, externalRuntimeStyles, instrumentForCoverage, } = options;
     return {
         // JS/TS options
         pluginOptions: {
@@ -22,6 +22,8 @@ function createCompilerPluginOptions(options, target, sourceFileCache) {
             sourceFileCache,
             loadResultCache: sourceFileCache?.loadResultCache,
             incremental: !!options.watch,
+            externalRuntimeStyles,
+            instrumentForCoverage,
         },
         // Component stylesheet options
         styleOptions: {

package/src/tools/esbuild/i18n-inliner.js

@@ -36,7 +36,8 @@ class I18nInliner {
         const files = new Map();
         const pendingMaps = [];
         for (const file of options.outputFiles) {
-            if (file.type === bundler_context_1.BuildOutputFileType.Root) {
+            if (file.type === bundler_context_1.BuildOutputFileType.Root || file.type === bundler_context_1.BuildOutputFileType.ServerRoot) {
+                // Skip also the server entry-point.
                 // Skip stats and similar files.
                 continue;
             }

package/src/tools/esbuild/javascript-transformer-worker.d.ts

@@ -14,6 +14,7 @@ interface JavaScriptTransformRequest {
     skipLinker?: boolean;
     sideEffects?: boolean;
     jit: boolean;
+    instrumentForCoverage?: boolean;
 }
 export default function transformJavaScript(request: JavaScriptTransformRequest): Promise<unknown>;
 export {};

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

@@ -63,8 +63,12 @@ async function transformWithBabel(filename, data, options) {
     // @ts-expect-error Import attribute syntax plugin does not currently have type definitions
     const { default: importAttributePlugin } = await Promise.resolve().then(() => __importStar(require('@babel/plugin-syntax-import-attributes')));
     const plugins = [importAttributePlugin];
-    // Lazy load the linker plugin only when linking is required
+    if (options.instrumentForCoverage) {
+        const { default: coveragePlugin } = await Promise.resolve().then(() => __importStar(require('../babel/plugins/add-code-coverage.js')));
+        plugins.push(coveragePlugin);
+    }
     if (shouldLink) {
+        // Lazy load the linker plugin only when linking is required
         const linkerPlugin = await createLinkerPlugin(options);
         plugins.push(linkerPlugin);
     }

package/src/tools/esbuild/javascript-transformer.d.ts

@@ -35,7 +35,7 @@ export declare class JavaScriptTransformer {
      * @param sideEffects If false, and `advancedOptimizations` is enabled tslib decorators are wrapped.
      * @returns A promise that resolves to a UTF-8 encoded Uint8Array containing the result.
      */
-    transformFile(filename: string, skipLinker?: boolean, sideEffects?: boolean): Promise<Uint8Array>;
+    transformFile(filename: string, skipLinker?: boolean, sideEffects?: boolean, instrumentForCoverage?: boolean): Promise<Uint8Array>;
     /**
      * Performs JavaScript transformations on the provided data of a file. The file does not need
      * to exist on the filesystem.
@@ -45,7 +45,7 @@ export declare class JavaScriptTransformer {
      * @param sideEffects If false, and `advancedOptimizations` is enabled tslib decorators are wrapped.
      * @returns A promise that resolves to a UTF-8 encoded Uint8Array containing the result.
      */
-    transformData(filename: string, data: string, skipLinker: boolean, sideEffects?: boolean): Promise<Uint8Array>;
+    transformData(filename: string, data: string, skipLinker: boolean, sideEffects?: boolean, instrumentForCoverage?: boolean): Promise<Uint8Array>;
     /**
      * Stops all active transformation tasks and shuts down all workers.
      * @returns A void promise that resolves when closing is complete.

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

@@ -52,7 +52,7 @@ class JavaScriptTransformer {
      * @param sideEffects If false, and `advancedOptimizations` is enabled tslib decorators are wrapped.
      * @returns A promise that resolves to a UTF-8 encoded Uint8Array containing the result.
      */
-    async transformFile(filename, skipLinker, sideEffects) {
+    async transformFile(filename, skipLinker, sideEffects, instrumentForCoverage) {
         const data = await (0, promises_1.readFile)(filename);
         let result;
         let cacheKey;
@@ -79,6 +79,7 @@ class JavaScriptTransformer {
                 data,
                 skipLinker,
                 sideEffects,
+                instrumentForCoverage,
                 ...this.#commonOptions,
             }, {
                 // The below is disable as with Yarn PNP this causes build failures with the below message
@@ -106,10 +107,10 @@ class JavaScriptTransformer {
      * @param sideEffects If false, and `advancedOptimizations` is enabled tslib decorators are wrapped.
      * @returns A promise that resolves to a UTF-8 encoded Uint8Array containing the result.
      */
-    async transformData(filename, data, skipLinker, sideEffects) {
+    async transformData(filename, data, skipLinker, sideEffects, instrumentForCoverage) {
         // Perform a quick test to determine if the data needs any transformations.
         // This allows directly returning the data without the worker communication overhead.
-        if (skipLinker && !this.#commonOptions.advancedOptimizations) {
+        if (skipLinker && !this.#commonOptions.advancedOptimizations && !instrumentForCoverage) {
             const keepSourcemap = this.#commonOptions.sourcemap &&
                 (!!this.#commonOptions.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(filename));
             return Buffer.from(keepSourcemap ? data : data.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, ''), 'utf-8');
@@ -119,6 +120,7 @@ class JavaScriptTransformer {
             data,
             skipLinker,
             sideEffects,
+            instrumentForCoverage,
             ...this.#commonOptions,
         });
     }

package/src/tools/esbuild/utils.js

@@ -30,6 +30,7 @@ const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const node_zlib_1 = require("node:zlib");
 const semver_1 = require("semver");
+const schema_1 = require("../../builders/application/schema");
 const manifest_1 = require("../../utils/server-rendering/manifest");
 const stats_table_1 = require("../../utils/stats-table");
 const bundler_context_1 = require("./bundler-context");
@@ -47,7 +48,7 @@ function logBuildStats(metafile, outputFiles, initial, budgetFailures, colors, c
             ++unchangedCount;
             continue;
         }
-        const isPlatformServer = type === bundler_context_1.BuildOutputFileType.Server;
+        const isPlatformServer = type === bundler_context_1.BuildOutputFileType.ServerApplication || type === bundler_context_1.BuildOutputFileType.ServerRoot;
         if (isPlatformServer && !ssrOutputEnabled) {
             // Only log server build stats when SSR is enabled.
             continue;
@@ -342,7 +343,7 @@ function getSupportedNodeTargets() {
     return SUPPORTED_NODE_VERSIONS.split('||').map((v) => 'node' + (0, semver_1.coerce)(v)?.version);
 }
 async function createJsonBuildManifest(result, normalizedOptions) {
-    const { colors: color, outputOptions: { base, server, browser }, ssrOptions, } = normalizedOptions;
+    const { colors: color, outputOptions: { base, server, browser }, ssrOptions, outputMode, } = normalizedOptions;
     const { warnings, errors, prerenderedRoutes } = result;
     const manifest = {
         errors: errors.length ? await (0, esbuild_1.formatMessages)(errors, { kind: 'error', color }) : [],
@@ -350,7 +351,9 @@ async function createJsonBuildManifest(result, normalizedOptions) {
         outputPaths: {
             root: (0, node_url_1.pathToFileURL)(base),
             browser: (0, node_url_1.pathToFileURL)((0, node_path_1.join)(base, browser)),
-            server: ssrOptions ? (0, node_url_1.pathToFileURL)((0, node_path_1.join)(base, server)) : undefined,
+            server: outputMode !== schema_1.OutputMode.Static && ssrOptions
+                ? (0, node_url_1.pathToFileURL)((0, node_path_1.join)(base, server))
+                : undefined,
         },
         prerenderedRoutes,
     };
@@ -398,4 +401,5 @@ function getEntryPointName(entryPoint) {
 exports.SERVER_GENERATED_EXTERNALS = new Set([
     './polyfills.server.mjs',
     './' + manifest_1.SERVER_APP_MANIFEST_FILENAME,
+    './' + manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME,
 ]);

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

@@ -12,7 +12,6 @@ const mrmime_1 = require("mrmime");
 const node_path_1 = require("node:path");
 const load_esm_1 = require("../../../utils/load-esm");
 const utils_1 = require("../utils");
-const COMPONENT_REGEX = /%COMP%/g;
 function createAngularAssetsMiddleware(server, assets, outputFiles, usedComponentStyles) {
     return function angularAssetsMiddleware(req, res, next) {
         if (req.url === undefined || res.writableEnded) {
@@ -76,12 +75,10 @@ function createAngularAssetsMiddleware(server, assets, outputFiles, usedComponen
                         // Shim the stylesheet if a component ID is provided
                         if (componentId.length > 0) {
                             // Validate component ID
-                            if (/[_.-A-Za-z0-9]+-c\d{9}$/.test(componentId)) {
+                            if (/^[_.\-\p{Letter}\d]+-c\d{9}$/u.test(componentId)) {
                                 (0, load_esm_1.loadEsmModule)('@angular/compiler')
                                     .then((compilerModule) => {
-                                    const encapsulatedData = compilerModule
-                                        .encapsulateStyle(new TextDecoder().decode(data))
-                                        .replaceAll(COMPONENT_REGEX, componentId);
+                                    const encapsulatedData = compilerModule.encapsulateStyle(new TextDecoder().decode(data), componentId);
                                     res.setHeader('Content-Type', 'text/css');
                                     res.setHeader('Cache-Control', 'no-cache');
                                     res.end(encapsulatedData);

package/src/tools/vite/middlewares/html-fallback-middleware.js

@@ -9,15 +9,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularHtmlFallbackMiddleware = angularHtmlFallbackMiddleware;
 const utils_1 = require("../utils");
+const ALLOWED_FALLBACK_METHODS = Object.freeze(['GET', 'HEAD']);
 function angularHtmlFallbackMiddleware(req, _res, next) {
     // Similar to how it is handled in vite
     // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L15C19-L15C45
-    if ((req.method === 'GET' || req.method === 'HEAD') &&
-        (!req.url || !(0, utils_1.lookupMimeTypeFromRequest)(req.url)) &&
-        (!req.headers.accept ||
-            req.headers.accept.includes('text/html') ||
-            req.headers.accept.includes('text/*') ||
-            req.headers.accept.includes('*/*'))) {
+    if (!req.method || !ALLOWED_FALLBACK_METHODS.includes(req.method)) {
+        // No fallback for unsupported request methods
+        next();
+        return;
+    }
+    if (req.url) {
+        const mimeType = (0, utils_1.lookupMimeTypeFromRequest)(req.url);
+        if (mimeType === 'text/html' || mimeType === 'application/xhtml+xml') {
+            // eslint-disable-next-line no-console
+            console.warn(`Request for HTML file "${req.url}" was received but no asset found. Asset may be missing from build.`);
+        }
+        else if (mimeType) {
+            // No fallback for request of asset-like files
+            next();
+            return;
+        }
+    }
+    if (!req.headers.accept ||
+        req.headers.accept.includes('text/html') ||
+        req.headers.accept.includes('text/*') ||
+        req.headers.accept.includes('*/*')) {
         req.url = '/index.html';
     }
     next();