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

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Google, Inc.
+Copyright (c) 2010-2024 Google LLC. https://angular.dev/license
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "19.0.0-next.7",
+  "version": "19.0.0-next.9",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,7 +23,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1900.0-next.7",
+    "@angular-devkit/architect": "0.1900.0-next.9",
     "@babel/core": "7.25.2",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -32,20 +32,21 @@
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "browserslist": "^4.23.0",
     "critters": "0.0.24",
-    "esbuild": "0.23.1",
+    "esbuild": "0.24.0",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.5",
+    "istanbul-lib-instrument": "6.0.3",
     "listr2": "8.2.4",
-    "lmdb": "3.1.2",
+    "lmdb": "3.1.3",
     "magic-string": "0.30.11",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.7.0",
-    "rollup": "4.21.3",
-    "sass": "1.79.1",
+    "rollup": "4.22.5",
+    "sass": "1.79.4",
     "semver": "7.6.3",
-    "vite": "5.4.6",
+    "vite": "5.4.8",
     "watchpack": "2.4.2"
   },
   "peerDependencies": {
@@ -54,7 +55,7 @@
     "@angular/localize": "^19.0.0-next.0",
     "@angular/platform-server": "^19.0.0-next.0",
     "@angular/service-worker": "^19.0.0-next.0",
-    "@angular/ssr": "^19.0.0-next.7",
+    "@angular/ssr": "^19.0.0-next.9",
     "less": "^4.2.0",
     "postcss": "^8.4.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
@@ -83,7 +84,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.4.0",
+  "packageManager": "yarn@4.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"

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

@@ -6,8 +6,12 @@
  * 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeBuild = executeBuild;
+const node_assert_1 = __importDefault(require("node:assert"));
 const source_file_cache_1 = require("../../tools/esbuild/angular/source-file-cache");
 const budget_stats_1 = require("../../tools/esbuild/budget-stats");
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
@@ -19,13 +23,16 @@ const utils_1 = require("../../tools/esbuild/utils");
 const bundle_calculator_1 = require("../../utils/bundle-calculator");
 const environment_options_1 = require("../../utils/environment-options");
 const resolve_assets_1 = require("../../utils/resolve-assets");
+const manifest_1 = require("../../utils/server-rendering/manifest");
 const supported_browsers_1 = require("../../utils/supported-browsers");
 const chunk_optimizer_1 = require("./chunk-optimizer");
 const execute_post_bundle_1 = require("./execute-post-bundle");
 const i18n_1 = require("./i18n");
+const schema_1 = require("./schema");
 const setup_bundling_1 = require("./setup-bundling");
+// eslint-disable-next-line max-lines-per-function
 async function executeBuild(options, context, rebuildState) {
-    const { projectRoot, workspaceRoot, i18nOptions, optimizationOptions, assets, cacheOptions, prerenderOptions, ssrOptions, verbose, colors, jsonLogs, } = options;
+    const { projectRoot, workspaceRoot, i18nOptions, optimizationOptions, assets, outputMode, cacheOptions, serverEntryPoint, baseHref, ssrOptions, verbose, colors, jsonLogs, } = options;
     // TODO: Consider integrating into watch mode. Would require full rebuild on target changes.
     const browsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, context.logger);
     // Load active translations if inlining
@@ -104,6 +111,10 @@ async function executeBuild(options, context, rebuildState) {
         executionResult.htmlIndexPath = options.indexHtmlOptions.output;
         executionResult.htmlBaseHref = options.baseHref;
     }
+    // Create server app engine manifest
+    if (serverEntryPoint) {
+        executionResult.addOutputFile(manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppEngineManifest)(i18nOptions, baseHref, undefined), bundler_context_1.BuildOutputFileType.ServerRoot);
+    }
     // Perform i18n translation inlining if enabled
     if (i18nOptions.shouldInline) {
         const result = await (0, i18n_1.inlineI18n)(options, executionResult, initialFiles);
@@ -121,8 +132,14 @@ async function executeBuild(options, context, rebuildState) {
         executionResult.outputFiles.push(...result.additionalOutputFiles);
         executionResult.assetFiles.push(...result.additionalAssets);
     }
-    if (prerenderOptions) {
+    if (serverEntryPoint) {
         const prerenderedRoutes = executionResult.prerenderedRoutes;
+        // Regenerate the manifest to append prerendered routes data. This is only needed if SSR is enabled.
+        if (outputMode === schema_1.OutputMode.Server && Object.keys(prerenderedRoutes).length) {
+            const manifest = executionResult.outputFiles.find((f) => f.path === manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME);
+            (0, node_assert_1.default)(manifest, `${manifest_1.SERVER_APP_ENGINE_MANIFEST_FILENAME} was not found in output files.`);
+            manifest.contents = new TextEncoder().encode((0, manifest_1.generateAngularServerAppEngineManifest)(i18nOptions, baseHref, prerenderedRoutes));
+        }
         executionResult.addOutputFile('prerendered-routes.json', JSON.stringify({ routes: prerenderedRoutes }, null, 2), bundler_context_1.BuildOutputFileType.Root);
     }
     // Write metafile if stats option is enabled

package/src/builders/application/execute-post-bundle.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { BuildOutputFile, InitialFileRecord } from '../../tools/esbuild/bundler-context';
-import { BuildOutputAsset } from '../../tools/esbuild/bundler-execution-result';
+import { BuildOutputAsset, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedApplicationBuildOptions } from './options';
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
@@ -21,5 +21,5 @@ export declare function executePostBundleSteps(options: NormalizedApplicationBui
     warnings: string[];
     additionalOutputFiles: BuildOutputFile[];
     additionalAssets: BuildOutputAsset[];
-    prerenderedRoutes: string[];
+    prerenderedRoutes: PrerenderedRoutesRecord;
 }>;

package/src/builders/application/execute-post-bundle.js

@@ -17,9 +17,11 @@ const index_html_generator_1 = require("../../tools/esbuild/index-html-generator
 const utils_1 = require("../../tools/esbuild/utils");
 const environment_options_1 = require("../../utils/environment-options");
 const manifest_1 = require("../../utils/server-rendering/manifest");
+const models_1 = require("../../utils/server-rendering/models");
 const prerender_1 = require("../../utils/server-rendering/prerender");
 const service_worker_1 = require("../../utils/service-worker");
 const options_1 = require("./options");
+const schema_1 = require("./schema");
 /**
  * Run additional builds steps including SSG, AppShell, Index HTML file and Service worker generation.
  * @param options The normalized application builder options used to create the build.
@@ -33,8 +35,8 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     const additionalOutputFiles = [];
     const allErrors = [];
     const allWarnings = [];
-    const prerenderedRoutes = [];
-    const { baseHref = '/', serviceWorker, indexHtmlOptions, optimizationOptions, sourcemapOptions, ssrOptions, prerenderOptions, appShellOptions, workspaceRoot, verbose, } = options;
+    const prerenderedRoutes = {};
+    const { baseHref = '/', serviceWorker, indexHtmlOptions, optimizationOptions, sourcemapOptions, outputMode, serverEntryPoint, prerenderOptions, appShellOptions, workspaceRoot, partialSSRBuild, } = options;
     // Index HTML content without CSS inlining to be used for server rendering (AppShell, SSG and SSR).
     // NOTE: Critical CSS inlining is deliberately omitted here, as it will be handled during server rendering.
     // Additionally, when using prerendering or AppShell, the index HTML file may be regenerated.
@@ -48,22 +50,23 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
         allWarnings.push(...warnings);
         additionalHtmlOutputFiles.set(indexHtmlOptions.output, (0, utils_1.createOutputFile)(indexHtmlOptions.output, csrContent, bundler_context_1.BuildOutputFileType.Browser));
         if (ssrContent) {
-            additionalHtmlOutputFiles.set(options_1.INDEX_HTML_SERVER, (0, utils_1.createOutputFile)(options_1.INDEX_HTML_SERVER, ssrContent, bundler_context_1.BuildOutputFileType.Server));
+            additionalHtmlOutputFiles.set(options_1.INDEX_HTML_SERVER, (0, utils_1.createOutputFile)(options_1.INDEX_HTML_SERVER, ssrContent, bundler_context_1.BuildOutputFileType.ServerApplication));
         }
     }
     // Create server manifest
-    if (prerenderOptions || appShellOptions || ssrOptions) {
-        additionalOutputFiles.push((0, utils_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined), bundler_context_1.BuildOutputFileType.Server));
+    if (serverEntryPoint) {
+        additionalOutputFiles.push((0, utils_1.createOutputFile)(manifest_1.SERVER_APP_MANIFEST_FILENAME, (0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, undefined, locale), bundler_context_1.BuildOutputFileType.ServerApplication));
     }
     // Pre-render (SSG) and App-shell
     // If localization is enabled, prerendering is handled in the inlining process.
-    if ((prerenderOptions || appShellOptions) && !allErrors.length) {
+    if (!partialSSRBuild &&
+        (prerenderOptions || appShellOptions || (outputMode && serverEntryPoint)) &&
+        !allErrors.length) {
         (0, node_assert_1.default)(indexHtmlOptions, 'The "index" option is required when using the "ssg" or "appShell" options.');
-        const { output, warnings, errors, prerenderedRoutes: generatedRoutes, serializableRouteTreeNode, } = await (0, prerender_1.prerenderPages)(workspaceRoot, baseHref, appShellOptions, prerenderOptions, [...outputFiles, ...additionalOutputFiles], assetFiles, sourcemapOptions.scripts, environment_options_1.maxWorkers, verbose);
+        const { output, warnings, errors, serializableRouteTreeNode } = await (0, prerender_1.prerenderPages)(workspaceRoot, baseHref, appShellOptions, prerenderOptions, [...outputFiles, ...additionalOutputFiles], assetFiles, outputMode, sourcemapOptions.scripts, environment_options_1.maxWorkers);
         allErrors.push(...errors);
         allWarnings.push(...warnings);
-        prerenderedRoutes.push(...Array.from(generatedRoutes));
-        const indexHasBeenPrerendered = generatedRoutes.has(indexHtmlOptions.output);
+        const indexHasBeenPrerendered = output[indexHtmlOptions.output];
         for (const [path, { content, appShellRoute }] of Object.entries(output)) {
             // Update the index contents with the app shell under these conditions:
             // - Replace 'index.html' with the app shell only if it hasn't been prerendered yet.
@@ -71,11 +74,27 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
             const filePath = appShellRoute && !indexHasBeenPrerendered ? indexHtmlOptions.output : path;
             additionalHtmlOutputFiles.set(filePath, (0, utils_1.createOutputFile)(filePath, content, bundler_context_1.BuildOutputFileType.Browser));
         }
-        if (ssrOptions) {
+        const serializableRouteTreeNodeForManifest = [];
+        for (const metadata of serializableRouteTreeNode) {
+            switch (metadata.renderMode) {
+                case models_1.RouteRenderMode.Prerender:
+                case /* Legacy building mode */ undefined: {
+                    if (!metadata.redirectTo || outputMode === schema_1.OutputMode.Static) {
+                        prerenderedRoutes[metadata.route] = { headers: metadata.headers };
+                    }
+                    break;
+                }
+                case models_1.RouteRenderMode.Server:
+                case models_1.RouteRenderMode.Client:
+                    serializableRouteTreeNodeForManifest.push(metadata);
+                    break;
+            }
+        }
+        if (outputMode === schema_1.OutputMode.Server) {
             // Regenerate the manifest to append route tree. This is only needed if SSR is enabled.
             const manifest = additionalOutputFiles.find((f) => f.path === manifest_1.SERVER_APP_MANIFEST_FILENAME);
             (0, node_assert_1.default)(manifest, `${manifest_1.SERVER_APP_MANIFEST_FILENAME} was not found in output files.`);
-            manifest.contents = new TextEncoder().encode((0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNode));
+            manifest.contents = new TextEncoder().encode((0, manifest_1.generateAngularServerAppManifest)(additionalHtmlOutputFiles, outputFiles, optimizationOptions.styles.inlineCritical ?? false, serializableRouteTreeNodeForManifest, locale));
         }
     }
     additionalOutputFiles.push(...additionalHtmlOutputFiles.values());

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

@@ -7,7 +7,7 @@
  */
 import { BuilderContext } from '@angular-devkit/architect';
 import { InitialFileRecord } from '../../tools/esbuild/bundler-context';
-import { ExecutionResult } from '../../tools/esbuild/bundler-execution-result';
+import { ExecutionResult, PrerenderedRoutesRecord } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedApplicationBuildOptions } from './options';
 /**
  * Inlines all active locales as specified by the application build options into all
@@ -19,7 +19,7 @@ import { NormalizedApplicationBuildOptions } from './options';
 export declare function inlineI18n(options: NormalizedApplicationBuildOptions, executionResult: ExecutionResult, initialFiles: Map<string, InitialFileRecord>): Promise<{
     errors: string[];
     warnings: string[];
-    prerenderedRoutes: string[];
+    prerenderedRoutes: PrerenderedRoutesRecord;
 }>;
 /**
  * Loads all active translations using the translation loaders from the `@angular/localize` package.

package/src/builders/application/i18n.js

@@ -34,7 +34,7 @@ async function inlineI18n(options, executionResult, initialFiles) {
     const inlineResult = {
         errors: [],
         warnings: [],
-        prerenderedRoutes: [],
+        prerenderedRoutes: {},
     };
     // For each active locale, use the inliner to process the output files of the build.
     const updatedOutputFiles = [];
@@ -65,12 +65,11 @@ async function inlineI18n(options, executionResult, initialFiles) {
                         destination: (0, node_path_1.join)(locale, assetFile.destination),
                     });
                 }
-                inlineResult.prerenderedRoutes.push(...generatedRoutes.map((route) => node_path_1.posix.join('/', locale, route)));
             }
             else {
-                inlineResult.prerenderedRoutes.push(...generatedRoutes);
                 executionResult.assetFiles.push(...additionalAssets);
             }
+            inlineResult.prerenderedRoutes = { ...inlineResult.prerenderedRoutes, ...generatedRoutes };
             updatedOutputFiles.push(...localeOutputFiles);
         }
     }
@@ -79,8 +78,8 @@ async function inlineI18n(options, executionResult, initialFiles) {
     }
     // Update the result with all localized files.
     executionResult.outputFiles = [
-        // Root files are not modified.
-        ...executionResult.outputFiles.filter(({ type }) => type === bundler_context_1.BuildOutputFileType.Root),
+        // Root and SSR entry files are not modified.
+        ...executionResult.outputFiles.filter(({ type }) => type === bundler_context_1.BuildOutputFileType.Root || type === bundler_context_1.BuildOutputFileType.ServerRoot),
         // Updated files for each locale.
         ...updatedOutputFiles,
     ];

package/src/builders/application/index.js

@@ -65,15 +65,15 @@ context, extensions) {
         context.addTeardown(() => controller.abort('builder-teardown'));
     }
     yield* (0, build_action_1.runEsBuildBuildAction)(async (rebuildState) => {
-        const { prerenderOptions, jsonLogs } = normalizedOptions;
+        const { serverEntryPoint, jsonLogs, partialSSRBuild } = normalizedOptions;
         const startTime = process.hrtime.bigint();
         const result = await (0, execute_build_1.executeBuild)(normalizedOptions, context, rebuildState);
         if (jsonLogs) {
             result.addLog(await (0, utils_1.createJsonBuildManifest)(result, normalizedOptions));
         }
         else {
-            if (prerenderOptions) {
-                const prerenderedRoutesLength = result.prerenderedRoutes.length;
+            if (serverEntryPoint && !partialSSRBuild) {
+                const prerenderedRoutesLength = Object.keys(result.prerenderedRoutes).length;
                 let prerenderMsg = `Prerendered ${prerenderedRoutesLength} static route`;
                 prerenderMsg += prerenderedRoutesLength !== 1 ? 's.' : '.';
                 result.addLog(color_1.colors.magenta(prerenderMsg));
@@ -137,7 +137,9 @@ async function* buildApplication(options, context, pluginsOrExtensions) {
         // Writes the output files to disk and ensures the containing directories are present
         const directoryExists = new Set();
         await (0, utils_1.emitFilesToDisk)(Object.entries(result.files), async ([filePath, file]) => {
-            if (outputOptions.ignoreServer && file.type === bundler_context_1.BuildOutputFileType.Server) {
+            if (outputOptions.ignoreServer &&
+                (file.type === bundler_context_1.BuildOutputFileType.ServerApplication ||
+                    file.type === bundler_context_1.BuildOutputFileType.ServerRoot)) {
                 return;
             }
             let typeDirectory;
@@ -146,7 +148,8 @@ async function* buildApplication(options, context, pluginsOrExtensions) {
                 case bundler_context_1.BuildOutputFileType.Media:
                     typeDirectory = outputOptions.browser;
                     break;
-                case bundler_context_1.BuildOutputFileType.Server:
+                case bundler_context_1.BuildOutputFileType.ServerApplication:
+                case bundler_context_1.BuildOutputFileType.ServerRoot:
                     typeDirectory = outputOptions.server;
                     break;
                 case bundler_context_1.BuildOutputFileType.Root:

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

@@ -9,7 +9,7 @@ import type { BuilderContext } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import { I18nOptions } from '../../utils/i18n-options';
 import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
-import { Schema as ApplicationBuilderOptions, I18NTranslation, OutputPathClass } from './schema';
+import { Schema as ApplicationBuilderOptions, I18NTranslation, OutputMode, OutputPathClass } from './schema';
 /**
  * The filename for the client-side rendered HTML template.
  * This template is used for client-side rendering (CSR) in a web application.
@@ -52,6 +52,26 @@ interface InternalOptions {
      * This is only used by the development server which currently only supports a single locale per build.
      */
     forceI18nFlatOutput?: boolean;
+    /**
+     * When set to `true`, enables fast SSR in development mode by disabling the full manifest generation and prerendering.
+     *
+     * This option is intended to optimize performance during development by skipping prerendering and route extraction when not required.
+     * @default false
+     */
+    partialSSRBuild?: boolean;
+    /**
+     * Enables the use of AOT compiler emitted external runtime styles.
+     * External runtime styles use `link` elements instead of embedded style content in the output JavaScript.
+     * This option is only intended to be used with a development server that can process and serve component
+     * styles.
+     */
+    externalRuntimeStyles?: boolean;
+    /**
+     * Enables instrumentation to collect code coverage data for specific files.
+     *
+     * Used exclusively for tests and shouldn't be used for other kinds of builds.
+     */
+    instrumentForCoverage?: (filename: string) => boolean;
 }
 /** Full set of options for `application` builder. */
 export type ApplicationBuilderInternalOptions = Omit<ApplicationBuilderOptions & InternalOptions, 'browser'> & {
@@ -96,6 +116,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     appShellOptions: {
         route: string;
     } | undefined;
+    outputMode: OutputMode | undefined;
     ssrOptions: {
         entry?: undefined;
     } | {
@@ -157,6 +178,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     define: {
         [key: string]: string;
     } | undefined;
+    partialSSRBuild: boolean;
+    externalRuntimeStyles: boolean | undefined;
+    instrumentForCoverage: ((filename: string) => boolean) | undefined;
 }>;
 export declare function getLocaleBaseHref(baseHref: string | undefined, i18n: NormalizedApplicationBuildOptions['i18nOptions'], locale: string): string | undefined;
 export {};

package/src/builders/application/options.js

@@ -103,6 +103,29 @@ async function normalizeOptions(context, projectName, options, extensions) {
             loaderExtensions[extension] = value;
         }
     }
+    // Validate prerender and ssr options when using the outputMode
+    if (options.outputMode === schema_1.OutputMode.Server) {
+        if (!options.server) {
+            throw new Error('The "server" option is required when "outputMode" is set to "server".');
+        }
+        if (typeof options.ssr === 'boolean' || !options.ssr?.entry) {
+            throw new Error('The "ssr.entry" option is required when "outputMode" is set to "server".');
+        }
+    }
+    if (options.outputMode) {
+        if (!options.server) {
+            options.ssr = false;
+        }
+        if (options.prerender) {
+            context.logger.warn('The "prerender" option is no longer needed when "outputMode" is specified.');
+        }
+        else {
+            options.prerender = !!options.server;
+        }
+        if (options.appShell) {
+            context.logger.warn('The "appShell" option is no longer needed when "outputMode" is specified.');
+        }
+    }
     // A configuration file can exist in the project or workspace root
     const searchDirectories = await (0, postcss_configuration_1.generateSearchDirectories)([projectRoot, workspaceRoot]);
     const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirectories);
@@ -151,7 +174,9 @@ async function normalizeOptions(context, projectName, options, extensions) {
         clean: options.deleteOutputPath ?? true,
         // For app-shell and SSG server files are not required by users.
         // Omit these when SSR is not enabled.
-        ignoreServer: ssrOptions === undefined || serverEntryPoint === undefined,
+        ignoreServer: ((ssrOptions === undefined || serverEntryPoint === undefined) &&
+            options.outputMode === undefined) ||
+            options.outputMode === schema_1.OutputMode.Static,
     };
     const outputNames = {
         bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles
@@ -206,7 +231,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         }
     }
     // Initial options to keep
-    const { allowedCommonJsDependencies, aot, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, } = options;
+    const { allowedCommonJsDependencies, aot, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, outputMode, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, partialSSRBuild = false, externalRuntimeStyles, instrumentForCoverage, } = options;
     // Return all the normalized options
     return {
         advancedOptimizations: !!aot && optimizationOptions.scripts,
@@ -229,6 +254,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         serverEntryPoint,
         prerenderOptions,
         appShellOptions,
+        outputMode,
         ssrOptions,
         verbose,
         watch,
@@ -261,6 +287,9 @@ async function normalizeOptions(context, projectName, options, extensions) {
         colors: (0, color_1.supportColor)(),
         clearScreen,
         define,
+        partialSSRBuild: environment_options_1.usePartialSsrBuild || partialSSRBuild,
+        externalRuntimeStyles,
+        instrumentForCoverage,
     };
 }
 async function getTailwindConfig(searchDirectories, workspaceRoot, context) {

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

@@ -117,6 +117,12 @@ export interface Schema {
      * Define the output filename cache-busting hashing mode.
      */
     outputHashing?: OutputHashing;
+    /**
+     * Defines the build output target. 'static': Generates a static site for deployment on any
+     * static hosting service. 'server': Produces an application designed for deployment on a
+     * server that supports server-side rendering (SSR).
+     */
+    outputMode?: OutputMode;
     /**
      * Specify the output path relative to workspace root.
      */
@@ -393,6 +399,15 @@ export declare enum OutputHashing {
     Media = "media",
     None = "none"
 }
+/**
+ * Defines the build output target. 'static': Generates a static site for deployment on any
+ * static hosting service. 'server': Produces an application designed for deployment on a
+ * server that supports server-side rendering (SSR).
+ */
+export declare enum OutputMode {
+    Server = "server",
+    Static = "static"
+}
 /**
  * Specify the output path relative to workspace root.
  */

package/src/builders/application/schema.js

@@ -2,7 +2,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutputHashing = exports.InlineStyleLanguage = exports.I18NTranslation = exports.CrossOrigin = exports.Type = void 0;
+exports.OutputMode = exports.OutputHashing = exports.InlineStyleLanguage = exports.I18NTranslation = exports.CrossOrigin = exports.Type = void 0;
 /**
  * The type of budget.
  */
@@ -56,3 +56,13 @@ var OutputHashing;
     OutputHashing["Media"] = "media";
     OutputHashing["None"] = "none";
 })(OutputHashing || (exports.OutputHashing = OutputHashing = {}));
+/**
+ * Defines the build output target. 'static': Generates a static site for deployment on any
+ * static hosting service. 'server': Produces an application designed for deployment on a
+ * server that supports server-side rendering (SSR).
+ */
+var OutputMode;
+(function (OutputMode) {
+    OutputMode["Server"] = "server";
+    OutputMode["Static"] = "static";
+})(OutputMode || (exports.OutputMode = OutputMode = {}));

package/src/builders/application/schema.json

@@ -528,6 +528,11 @@
       "type": "boolean",
       "description": "Generates an application shell during build time.",
       "default": false
+    },
+    "outputMode": {
+      "type": "string",
+      "description": "Defines the build output target. 'static': Generates a static site for deployment on any static hosting service. 'server': Produces an application designed for deployment on a server that supports server-side rendering (SSR).",
+      "enum": ["static", "server"]
     }
   },
   "additionalProperties": false,

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

@@ -22,7 +22,7 @@ const utils_1 = require("../../tools/esbuild/utils");
  * @returns An array of BundlerContext objects.
  */
 function setupBundlerContexts(options, browsers, codeBundleCache) {
-    const { appShellOptions, prerenderOptions, serverEntryPoint, ssrOptions, workspaceRoot, watch = false, } = options;
+    const { outputMode, serverEntryPoint, appShellOptions, prerenderOptions, ssrOptions, workspaceRoot, watch = false, } = options;
     const target = (0, utils_1.transformSupportedBrowsersToTargets)(browsers);
     const bundlerContexts = [];
     // Browser application code
@@ -51,10 +51,13 @@ function setupBundlerContexts(options, browsers, codeBundleCache) {
         }
     }
     // Skip server build when none of the features are enabled.
-    if (serverEntryPoint && (prerenderOptions || appShellOptions || ssrOptions)) {
+    if (serverEntryPoint && (outputMode || prerenderOptions || appShellOptions || ssrOptions)) {
         const nodeTargets = [...target, ...(0, utils_1.getSupportedNodeTargets)()];
-        // Server application code
         bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, (0, application_code_bundle_1.createServerMainCodeBundleOptions)(options, nodeTargets, codeBundleCache)));
+        if (outputMode && ssrOptions?.entry) {
+            // New behavior introduced: 'server.ts' is now bundled separately from 'main.server.ts'.
+            bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, watch, (0, application_code_bundle_1.createSsrEntryCodeBundleOptions)(options, nodeTargets, codeBundleCache)));
+        }
         // Server polyfills code
         const serverPolyfillBundleOptions = (0, application_code_bundle_1.createServerPolyfillBundleOptions)(options, nodeTargets, codeBundleCache);
         if (serverPolyfillBundleOptions) {

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

@@ -8,6 +8,7 @@
 import type { BuilderContext } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import type { Connect, DepOptimizationConfig, InlineConfig } from 'vite';
+import { ServerSsrMode } from '../../tools/vite/plugins';
 import { Result } from '../application/results';
 import { type ApplicationBuilderInternalOptions, BuildOutputFileType, type ExternalResultMetadata, JavaScriptTransformer } from './internal';
 import type { NormalizedDevServerOptions } from './options';
@@ -31,6 +32,6 @@ export declare function serveWithVite(serverOptions: NormalizedDevServerOptions,
     middleware?: Connect.NextHandleFunction[];
     buildPlugins?: Plugin[];
 }): AsyncIterableIterator<DevServerBuilderOutput>;
-export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: DevServerExternalResultMetadata, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[], zoneless: boolean, usedComponentStyles: Map<string, string[]>, prebundleLoaderExtensions: EsbuildLoaderOption | undefined, extensionMiddleware?: Connect.NextHandleFunction[], indexHtmlTransformer?: (content: string) => Promise<string>, thirdPartySourcemaps?: boolean): Promise<InlineConfig>;
+export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, externalMetadata: DevServerExternalResultMetadata, ssrMode: ServerSsrMode, prebundleTransformer: JavaScriptTransformer, target: string[], zoneless: boolean, usedComponentStyles: Map<string, string[]>, prebundleLoaderExtensions: EsbuildLoaderOption | undefined, extensionMiddleware?: Connect.NextHandleFunction[], indexHtmlTransformer?: (content: string) => Promise<string>, thirdPartySourcemaps?: boolean): Promise<InlineConfig>;
 type EsbuildLoaderOption = Exclude<DepOptimizationConfig['esbuildOptions'], undefined>['loader'];
 export {};