next 15.4.2-canary.17 → 15.4.2-canary.18

package/dist/esm/build/index.js

@@ -69,7 +69,7 @@ import { FallbackMode, fallbackModeToFallbackField } from '../lib/fallback';
 import { RenderingMode } from './rendering-mode';
 import { InvariantError } from '../shared/lib/invariant-error';
 import { HTML_LIMITED_BOT_UA_RE_STRING } from '../shared/lib/router/utils/is-bot';
-import { buildInversePrefetchSegmentDataRoute, buildPrefetchSegmentDataRoute } from '../server/lib/router-utils/build-prefetch-segment-data-route';
+import { buildPrefetchSegmentDataRoute } from '../server/lib/router-utils/build-prefetch-segment-data-route';
 import { turbopackBuild } from './turbopack-build';
 import { isPersistentCachingEnabled } from '../shared/lib/turbopack/utils';
 import { inlineStaticEnv } from '../lib/inline-static-env';
@@ -322,7 +322,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
         const nextBuildSpan = trace('next-build', undefined, {
             buildMode: experimentalBuildMode,
             isTurboBuild: String(isTurbopack),
-            version: "15.4.2-canary.17"
+            version: "15.4.2-canary.18"
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
         NextBuildContext.dir = dir;
@@ -709,7 +709,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
             // Files outside of the distDir can be "type": "module"
             await writeFileUtf8(path.join(distDir, 'package.json'), '{"type": "commonjs"}');
             // These are written to distDir, so they need to come after creating and cleaning distDr.
-            await recordFrameworkVersion("15.4.2-canary.17");
+            await recordFrameworkVersion("15.4.2-canary.18");
             await updateBuildDiagnostics({
                 buildStage: 'start'
             });
@@ -1917,9 +1917,23 @@ export default async function build(dir, reactProductionProfiling = false, debug
                                             });
                                         }
                                     }
-                                    dynamicRoute.prefetchSegmentDataRoutes ??= [];
-                                    for (const segmentPath of metadata.segmentPaths){
-                                        dynamicRoute.prefetchSegmentDataRoutes.push(buildPrefetchSegmentDataRoute(route.pathname, segmentPath));
+                                    if (metadata.segmentPaths) {
+                                        const pageSegmentPath = metadata.segmentPaths.find((item)=>item.endsWith('__PAGE__'));
+                                        if (!pageSegmentPath) {
+                                            throw Object.defineProperty(new Error(`Invariant: missing __PAGE__ segmentPath`), "__NEXT_ERROR_CODE", {
+                                                value: "E759",
+                                                enumerable: false,
+                                                configurable: true
+                                            });
+                                        }
+                                        // We build a combined segment data route from the
+                                        // page segment as we need to limit the number of
+                                        // routes we output and they can be shared
+                                        const builtSegmentDataRoute = buildPrefetchSegmentDataRoute(route.pathname, pageSegmentPath);
+                                        builtSegmentDataRoute.source = builtSegmentDataRoute.source.replace('/__PAGE__\\.segment\\.rsc$', `(?<segment>/__PAGE__\\.segment\\.rsc|\\.segment\\.rsc)(?:/)?$`);
+                                        builtSegmentDataRoute.destination = builtSegmentDataRoute.destination.replace('/__PAGE__.segment.rsc', '$segment');
+                                        dynamicRoute.prefetchSegmentDataRoutes ??= [];
+                                        dynamicRoute.prefetchSegmentDataRoutes.push(builtSegmentDataRoute);
                                     }
                                 }
                                 pageInfos.set(route.pathname, {
@@ -2167,30 +2181,6 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         force: true
                     });
                     await writeManifest(pagesManifestPath, pagesManifest);
-                    if (config.experimental.clientSegmentCache) {
-                        for (const route of [
-                            ...routesManifest.staticRoutes,
-                            ...routesManifest.dynamicRoutes
-                        ]){
-                            // If the segment paths aren't defined, we need to insert a
-                            // reverse routing rule so that there isn't any conflicts
-                            // with other dynamic routes for the prefetch segment
-                            // routes. This is true for any route that is not PPR-enabled,
-                            // including all routes defined by Pages Router.
-                            // We don't need to add the prefetch segment data routes if it was
-                            // added due to a page that was already generated. This would have
-                            // happened if the page was static or partially static.
-                            if (route.prefetchSegmentDataRoutes) {
-                                continue;
-                            }
-                            route.prefetchSegmentDataRoutes = [
-                                buildInversePrefetchSegmentDataRoute(route.page, // We use the special segment path of `/_tree` because it's
-                                // the first one sent by the client router so it's the only
-                                // one we need to rewrite to the regular prefetch RSC route.
-                                '/_tree')
-                            ];
-                        }
-                    }
                 });
                 // As we may have modified the dynamicRoutes, we need to sort the
                 // dynamic routes by page.