@angular/ssr 19.1.6 → 19.2.0-next.1

package/fesm2022/ssr.mjs

@@ -838,26 +838,18 @@ async function* traverseRoutesConfig(options) {
  * preloads to a predefined maximum.
  */
 function appendPreloadToMetadata(entryName, entryPointToBrowserMapping, metadata, includeDynamicImports) {
-    const existingPreloads = metadata.preload ?? [];
-    if (!entryPointToBrowserMapping || existingPreloads.length >= MODULE_PRELOAD_MAX) {
+    if (!entryPointToBrowserMapping) {
         return;
     }
     const preload = entryPointToBrowserMapping[entryName];
-    if (!preload?.length) {
-        return;
-    }
-    // Merge existing preloads with new ones, ensuring uniqueness and limiting the total to the maximum allowed.
-    const combinedPreloads = new Set(existingPreloads);
-    for (const { dynamicImport, path } of preload) {
-        if (dynamicImport && !includeDynamicImports) {
-            continue;
-        }
-        combinedPreloads.add(path);
-        if (combinedPreloads.size === MODULE_PRELOAD_MAX) {
-            break;
-        }
+    if (preload?.length) {
+        // Merge existing preloads with new ones, ensuring uniqueness and limiting the total to the maximum allowed.
+        const preloadPaths = preload
+            .filter(({ dynamicImport }) => includeDynamicImports || !dynamicImport)
+            .map(({ path }) => path) ?? [];
+        const combinedPreloads = [...(metadata.preload ?? []), ...preloadPaths];
+        metadata.preload = Array.from(new Set(combinedPreloads)).slice(0, MODULE_PRELOAD_MAX);
     }
-    metadata.preload = Array.from(combinedPreloads);
 }
 /**
  * Handles SSG (Static Site Generation) routes by invoking `getPrerenderParams` and yielding
@@ -1062,6 +1054,7 @@ async function getRoutesFromAngularRouterConfig(bootstrap, document, url, invoke
         router.navigationTransitions.afterPreactivation()?.next?.();
         // Wait until the application is stable.
         await applicationRef.whenStable();
+        const routesResults = [];
         const errors = [];
         let baseHref = injector.get(APP_BASE_HREF, null, { optional: true }) ??
             injector.get(PlatformLocation).getBaseHrefFromDOM();
@@ -1079,11 +1072,10 @@ async function getRoutesFromAngularRouterConfig(bootstrap, document, url, invoke
         if (errors.length) {
             return {
                 baseHref,
-                routes: [],
+                routes: routesResults,
                 errors,
             };
         }
-        const routesResults = [];
         if (router.config.length) {
             // Retrieve all routes from the Angular router configuration.
             const traverseRoutes = traverseRoutesConfig({
@@ -1096,18 +1088,12 @@ async function getRoutesFromAngularRouterConfig(bootstrap, document, url, invoke
                 includePrerenderFallbackRoutes,
                 entryPointToBrowserMapping,
             });
-            const seenRoutes = new Set();
-            for await (const routeMetadata of traverseRoutes) {
-                if ('error' in routeMetadata) {
-                    errors.push(routeMetadata.error);
-                    continue;
+            for await (const result of traverseRoutes) {
+                if ('error' in result) {
+                    errors.push(result.error);
                 }
-                // If a result already exists for the exact same route, subsequent matches should be ignored.
-                // This aligns with Angular's app router behavior, which prioritizes the first route.
-                const routePath = routeMetadata.route;
-                if (!seenRoutes.has(routePath)) {
-                    routesResults.push(routeMetadata);
-                    seenRoutes.add(routePath);
+                else {
+                    routesResults.push(result);
                 }
             }
             // This timeout is necessary to prevent 'adev' from hanging in production builds.