next 15.4.0-canary.0 → 15.4.0-canary.1

package/dist/esm/build/index.js

@@ -73,7 +73,7 @@ import { getParamKeys } from '../server/request/fallback-params';
 import { formatNodeOptions, getParsedNodeOptionsWithoutInspect } from '../server/lib/utils';
 import { InvariantError } from '../shared/lib/invariant-error';
 import { HTML_LIMITED_BOT_UA_RE_STRING } from '../shared/lib/router/utils/is-bot';
-import { buildPrefetchSegmentDataRoute } from '../server/lib/router-utils/build-prefetch-segment-data-route';
+import { buildInversePrefetchSegmentDataRoute, 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';
@@ -307,7 +307,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
         const nextBuildSpan = trace('next-build', undefined, {
             buildMode: experimentalBuildMode,
             isTurboBuild: String(isTurbopack),
-            version: "15.4.0-canary.0"
+            version: "15.4.0-canary.1"
         });
         NextBuildContext.nextBuildSpan = nextBuildSpan;
         NextBuildContext.dir = dir;
@@ -688,7 +688,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.0-canary.0");
+            await recordFrameworkVersion("15.4.0-canary.1");
             await updateBuildDiagnostics({
                 buildStage: 'start'
             });
@@ -1202,6 +1202,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                             }
                         }
                         pageInfos.set(page, {
+                            originalAppPath,
                             size,
                             totalSize,
                             isStatic,
@@ -1857,8 +1858,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
                                     }
                                     dynamicRoute.prefetchSegmentDataRoutes ??= [];
                                     for (const segmentPath of metadata.segmentPaths){
-                                        const result = buildPrefetchSegmentDataRoute(route.pathname, segmentPath);
-                                        dynamicRoute.prefetchSegmentDataRoutes.push(result);
+                                        dynamicRoute.prefetchSegmentDataRoutes.push(buildPrefetchSegmentDataRoute(route.pathname, segmentPath));
                                     }
                                 }
                                 pageInfos.set(route.pathname, {
@@ -2106,6 +2106,39 @@ export default async function build(dir, reactProductionProfiling = false, debug
                         force: true
                     });
                     await writeManifest(pagesManifestPath, pagesManifest);
+                    if (config.experimental.clientSegmentCache) {
+                        for (const dynamicRoute of routesManifest.dynamicRoutes){
+                            var _pageInfos_get;
+                            // We only want to handle pages that are using the app router. We
+                            // need this path in order to determine if it's an app route or an
+                            // app page.
+                            const originalAppPath = (_pageInfos_get = pageInfos.get(dynamicRoute.page)) == null ? void 0 : _pageInfos_get.originalAppPath;
+                            if (!originalAppPath) {
+                                continue;
+                            }
+                            // We only want to handle app pages, not app routes.
+                            if (isAppRouteRoute(originalAppPath)) {
+                                continue;
+                            }
+                            // 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 (dynamicRoute.prefetchSegmentDataRoutes) {
+                                continue;
+                            }
+                            // 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 only an issue for pages that do not have
+                            // partial prerendering enabled.
+                            dynamicRoute.prefetchSegmentDataRoutes = [
+                                buildInversePrefetchSegmentDataRoute(dynamicRoute.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')
+                            ];
+                        }
+                    }
                 });
                 // We need to write the manifest with rewrites after build as it might
                 // have been modified.