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

Author: JohannesHoppe

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

@@ -267,21 +267,17 @@ export async function normalizeOptions(
       options.ssr = false;
     }
 
-    // Of the "prerender" option, only "format" is considered when pages are prerendered.
-    if (options.prerender !== undefined) {
-      if (!options.server || typeof options.prerender !== 'object') {
-        context.logger.warn(
-          'The "prerender" option is not considered when "outputMode" is specified.',
-        );
-      } else if (
+    // "prerender.format" is considered when pages are prerendered.
+    if (
+      options.prerender !== undefined &&
+      (!options.server ||
+        typeof options.prerender !== 'object' ||
         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.discoverRoutes === false)
+    ) {
+      context.logger.warn(
+        'The "prerender" option is not considered when "outputMode" is specified.',
+      );
     }
 
     options.prerender = !!options.server;
@@ -361,8 +357,7 @@ export async function normalizeOptions(
   if (prerenderFormat === PrerenderFormat.File && !outputOptions.ignoreServer) {
     // The server runtime of '@angular/ssr' looks up prerendered pages as '<route>/index.html'.
     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").',
+      'The "prerender.format" option is not considered when the build produces a server.',
     );
 
     prerenderFormat = PrerenderFormat.Directory;

packages/angular/build/src/builders/application/tests/options/prerender-format_spec.ts

@@ -128,7 +128,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
 
       expectLog(
         logs,
-        'The "prerender.format" option set to "file" is not considered when the build produces a server',
+        'The "prerender.format" option is not considered when the build produces a server.',
       );
 
       harness.expectFile('dist/browser/foo/index.html').content.toContain('foo works!');

packages/angular/build/src/utils/server-rendering/prerender.ts

@@ -17,13 +17,7 @@ import {
 import { BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 import { assertIsError } from '../error';
 import { toPosixPath } from '../path';
-import {
-  addLeadingSlash,
-  addTrailingSlash,
-  joinUrlParts,
-  stripLeadingSlash,
-  stripTrailingSlash,
-} from '../url';
+import { addLeadingSlash, addTrailingSlash, joinUrlParts, stripLeadingSlash } from '../url';
 import { WorkerPool } from '../worker-pool';
 import {
   IMPORT_EXEC_ARGV,
@@ -57,8 +51,6 @@ type AppShellOptions = NormalizedApplicationBuildOptions['appShellOptions'];
  *   '/index.html': { content: '<html>...</html>', appShell: false },
  *   '/shell/index.html': { content: '<html>...</html>', appShellRoute: true }
  * }
- *
- * With the 'file' format, non-root routes are keyed as `<route>.html` (e.g. 'shell.html').
  */
 type PrerenderOutput = Record<string, { content: string; appShellRoute: boolean }>;
 
@@ -467,22 +459,11 @@ function getRouteWithoutBaseHref(route: string, baseHrefPathname: string): strin
     : route;
 }
 
-/**
- * Returns the output file path of a prerendered route, relative to the browser output directory.
- *
- * - `directory`: `/foo/bar` is written to `foo/bar/index.html`.
- * - `file`: `/foo/bar` is written to `foo/bar.html`.
- *
- * The root route (after removing the `baseHref`) is written to `index.html` in both formats.
- */
 function getRouteOutPath(route: string, baseHrefPathname: string, format: PrerenderFormat): string {
   const routeWithoutBaseHref = getRouteWithoutBaseHref(route, baseHrefPathname);
 
-  if (format === PrerenderFormat.File) {
-    const routePath = stripTrailingSlash(posix.normalize(addLeadingSlash(routeWithoutBaseHref)));
-    if (routePath !== '/') {
-      return `${stripLeadingSlash(routePath)}.html`;
-    }
+  if (format === PrerenderFormat.File && routeWithoutBaseHref !== '/') {
+    return stripLeadingSlash(`${routeWithoutBaseHref}.html`);
   }
 
   return stripLeadingSlash(posix.join(routeWithoutBaseHref, 'index.html'));