fix(@angular/ssr): use wildcard server route configuration on the '/'…

… route when the app router is empty (cherry picked from commit d3dd8f0)
angular · Nov 18, 2024 · fb05e7f · fb05e7f
1 parent 4b4e000
commit fb05e7f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/angular/ssr/src/routes/ng-routes.ts b/packages/angular/ssr/src/routes/ng-routes.ts
@@ -480,11 +480,16 @@ export async function getRoutesFromAngularRouterConfig(
         }
       }
     } else {
-      const renderMode = serverConfigRouteTree?.match('')?.renderMode ?? RenderMode.Prerender;
+      const rootRouteMetadata = serverConfigRouteTree?.match('') ?? {
+        route: '',
+        renderMode: RenderMode.Prerender,
+      };
 
       routesResults.push({
+        ...rootRouteMetadata,
+        // Matched route might be `/*` or `/**`, which would make Angular serve all routes rather than just `/`.
+        // So we limit to just `/` for the empty app router case.
         route: '',
-        renderMode,
       });
     }
 

diff --git a/packages/angular/ssr/test/routes/ng-routes_spec.ts b/packages/angular/ssr/test/routes/ng-routes_spec.ts
@@ -340,8 +340,8 @@ describe('extractRoutesAndCreateRouteTree', () => {
     );
   });
 
-  it('should apply RenderMode matching the wildcard when no Angular routes are defined', async () => {
-    setAngularAppTestingManifest([], [{ path: '**', renderMode: RenderMode.Server }]);
+  it('should use wildcard configuration when no Angular routes are defined', async () => {
+    setAngularAppTestingManifest([], [{ path: '**', renderMode: RenderMode.Server, status: 201 }]);
 
     const { errors, routeTree } = await extractRoutesAndCreateRouteTree(
       url,
@@ -351,6 +351,8 @@ describe('extractRoutesAndCreateRouteTree', () => {
     );
 
     expect(errors).toHaveSize(0);
-    expect(routeTree.toObject()).toEqual([{ route: '/', renderMode: RenderMode.Server }]);
+    expect(routeTree.toObject()).toEqual([
+      { route: '/', renderMode: RenderMode.Server, status: 201 },
+    ]);
   });
 });