@@ -55,6 +55,7 @@ export type ApplicationBuilderOptions = {
     poll?: number;
     polyfills?: string[];
     prerender?: PrerenderUnion;
+    prerenderFormat?: PrerenderFormat;
     preserveSymlinks?: boolean;
     progress?: boolean;
     scripts?: ScriptElement[];
 
@@ -71,6 +71,7 @@ export async function executePostBundleSteps(
     outputMode,
     serverEntryPoint,
     prerenderOptions,
+    prerenderFormat,
     appShellOptions,
     publicPath,
     workspaceRoot,
@@ -168,6 +169,8 @@ export async function executePostBundleSteps(
       [...outputFiles, ...additionalOutputFiles],
       assetFiles,
       outputMode,
+      prerenderFormat,
+      indexHtmlOptions.output,
       sourcemapOptions.scripts,
       maxWorkers,
     );
 
@@ -32,6 +32,7 @@ import {
   OutputMode,
   OutputPathClass,
   Platform,
+  PrerenderFormat,
 } from './schema';
 
 /**
@@ -342,6 +343,20 @@ export async function normalizeOptions(
       options.outputMode === OutputMode.Static,
   };
 
+  let prerenderFormat = options.prerenderFormat ?? PrerenderFormat.Directory;
+  if (prerenderFormat === PrerenderFormat.File && !outputOptions.ignoreServer) {
+    // The server runtime of '@angular/ssr' looks up prerendered pages as '<route>/index.html'.
+    // The warning is only relevant when pages are actually prerendered, which the dev-server skips.
+    if ((prerenderOptions || appShellOptions) && !(options.partialSSRBuild || usePartialSsrBuild)) {
+      context.logger.warn(
+        'The "prerenderFormat" option set to "file" is not considered when the build produces a ' +
+          'server ("outputMode" set to "server", or "ssr" without "outputMode").',
+      );
+    }
+
+    prerenderFormat = PrerenderFormat.Directory;
+  }
+
   const outputNames = {
     bundles:
       options.outputHashing === OutputHashing.All || options.outputHashing === OutputHashing.Bundles
@@ -492,6 +507,7 @@ export async function normalizeOptions(
     subresourceIntegrity,
     serverEntryPoint,
     prerenderOptions,
+    prerenderFormat,
     appShellOptions,
     outputMode,
     ssrOptions,
 
@@ -587,6 +587,12 @@
         }
       ]
     },
+    "prerenderFormat": {
+      "type": "string",
+      "description": "Defines the file layout of prerendered (SSG) pages. 'directory': '/foo' is written to 'foo/index.html'. 'file': '/foo' is written to 'foo.html', which some hosting services serve for '/foo' without a redirect to '/foo/'. The root route of the application and of each locale is always written to 'index.html'. Routes that cannot be written safely to '<route>.html' keep '<route>/index.html' with a warning. Only considered when the build does not produce a server.",
+      "enum": ["directory", "file"],
+      "default": "directory"
+    },
     "ssr": {
       "description": "Server side render (SSR) pages of your application during runtime.",
       "default": false,
Original file line number	Diff line number	Diff line change
`@@ -587,6 +587,12 @@`
`587`	`587`	`}`
`588`	`588`	`]`
`589`	`589`	`},`
	`590`	`+ "prerenderFormat": {`
	`591`	`+ "type": "string",`
	`592`	`+ "description": "Defines the file layout of prerendered (SSG) pages. 'directory': '/foo' is written to 'foo/index.html'. 'file': '/foo' is written to 'foo.html', which some hosting services serve for '/foo' without a redirect to '/foo/'. The root route of the application and of each locale is always written to 'index.html'. Routes that cannot be written safely to '<route>.html' keep '<route>/index.html' with a warning. Only considered when the build does not produce a server.",`
	`593`	`+ "enum": ["directory", "file"],`
	`594`	`+ "default": "directory"`
	`595`	`+ },`
`590`	`596`	`"ssr": {`
`591`	`597`	`"description": "Server side render (SSR) pages of your application during runtime.",`
`592`	`598`	`"default": false,`