fixup! feat(@angular/build): add prerender.format option to prerender routes as <route>.html

Author: JohannesHoppe

goldens/public-api/angular/build/index.api.md

@@ -55,7 +55,6 @@ export type ApplicationBuilderOptions = {
     poll?: number;
     polyfills?: string[];
     prerender?: PrerenderUnion;
-    prerenderFormat?: PrerenderFormat;
     preserveSymlinks?: boolean;
     progress?: boolean;
     scripts?: ScriptElement[];
@@ -168,7 +167,7 @@ export function executeUnitTestBuilder(options: UnitTestBuilderOptions, context:
 // @public
 export type ExtractI18nBuilderOptions = {
     buildTarget?: string;
-    format?: Format;
+    format?: Format_2;
     i18nDuplicateTranslation?: I18NDuplicateTranslation;
     outFile?: string;
     outputPath?: string;

packages/angular/build/src/builders/application/execute-post-bundle.ts

@@ -170,7 +170,6 @@ export async function executePostBundleSteps(
       assetFiles,
       outputMode,
       prerenderFormat,
-      indexHtmlOptions.output,
       sourcemapOptions.scripts,
       maxWorkers,
     );

packages/angular/build/src/builders/application/options.ts

@@ -32,7 +32,7 @@ import {
   OutputMode,
   OutputPathClass,
   Platform,
-  PrerenderFormat,
+  Format as PrerenderFormat,
 } from './schema';
 
 /**
@@ -258,15 +258,30 @@ export async function normalizeOptions(
     }
   }
 
+  let prerenderFormat =
+    (typeof options.prerender === 'object' && options.prerender.format) ||
+    PrerenderFormat.Directory;
+
   if (options.outputMode) {
     if (!options.server) {
       options.ssr = false;
     }
 
+    // Of the "prerender" option, only "format" is considered when pages are prerendered.
     if (options.prerender !== undefined) {
-      context.logger.warn(
-        'The "prerender" option is not considered when "outputMode" is specified.',
-      );
+      if (!options.server || typeof options.prerender !== 'object') {
+        context.logger.warn(
+          'The "prerender" option is not considered when "outputMode" is specified.',
+        );
+      } else if (
+        options.prerender.routesFile !== undefined ||
+        options.prerender.discoverRoutes === false
+      ) {
+        context.logger.warn(
+          'The "prerender.routesFile" and "prerender.discoverRoutes" options are not considered ' +
+            'when "outputMode" is specified.',
+        );
+      }
     }
 
     options.prerender = !!options.server;
@@ -343,16 +358,12 @@ 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").',
-      );
-    }
+    context.logger.warn(
+      'The "prerender.format" option set to "file" is not considered when the build produces a ' +
+        'server ("outputMode" set to "server", or "ssr" without "outputMode").',
+    );
 
     prerenderFormat = PrerenderFormat.Directory;
   }

packages/angular/build/src/builders/application/schema.json

@@ -581,18 +581,18 @@
               "type": "boolean",
               "description": "Whether the builder should process the Angular Router configuration to find all unparameterized routes and prerender them.",
               "default": true
+            },
+            "format": {
+              "type": "string",
+              "description": "Defines the file layout of prerendered 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'. Only considered when the build does not produce a server.",
+              "enum": ["directory", "file"],
+              "default": "directory"
             }
           },
           "additionalProperties": false
         }
       ]
     },
-    "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,