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

package/dist/bin/next

@@ -79,7 +79,7 @@ const program = new NextRootCommand();
 program.name('next').description('The Next.js CLI allows you to develop, build, start your application, and more.').configureHelp({
     formatHelp: (cmd, helper)=>(0, _formatclihelpoutput.formatCliHelpOutput)(cmd, helper),
     subcommandTerm: (cmd)=>`${cmd.name()} ${cmd.usage()}`
-}).helpCommand(false).helpOption('-h, --help', 'Displays this message.').version(`Next.js v${"15.4.2-canary.17"}`, '-v, --version', 'Outputs the Next.js version.');
+}).helpCommand(false).helpOption('-h, --help', 'Displays this message.').version(`Next.js v${"15.4.2-canary.18"}`, '-v, --version', 'Outputs the Next.js version.');
 program.command('build').description('Creates an optimized production build of your application. The output displays information about each route.').argument('[directory]', `A directory on which to build the application. ${(0, _picocolors.italic)('If no directory is provided, the current directory will be used.')}`).option('-d, --debug', 'Enables a more verbose build output.').option('--debug-prerender', 'Enables debug mode for prerendering. Not for production use!').option('--no-lint', 'Disables linting.').option('--no-mangling', 'Disables mangling.').option('--profile', 'Enables production profiling for React.').option('--experimental-app-only', 'Builds only App Router routes.').option('--turbo', 'Starts development mode using Turbopack.').option('--turbopack', 'Starts development mode using Turbopack.').addOption(new _commander.Option('--experimental-build-mode [mode]', 'Uses an experimental build mode.').choices([
     'compile',
     'generate',

package/dist/build/index.js

@@ -394,7 +394,7 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
         const nextBuildSpan = (0, _trace.trace)('next-build', undefined, {
             buildMode: experimentalBuildMode,
             isTurboBuild: String(isTurbopack),
-            version: "15.4.2-canary.17"
+            version: "15.4.2-canary.18"
         });
         _buildcontext.NextBuildContext.nextBuildSpan = nextBuildSpan;
         _buildcontext.NextBuildContext.dir = dir;
@@ -781,7 +781,7 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
             // Files outside of the distDir can be "type": "module"
             await writeFileUtf8(_path.default.join(distDir, 'package.json'), '{"type": "commonjs"}');
             // These are written to distDir, so they need to come after creating and cleaning distDr.
-            await (0, _builddiagnostics.recordFrameworkVersion)("15.4.2-canary.17");
+            await (0, _builddiagnostics.recordFrameworkVersion)("15.4.2-canary.18");
             await (0, _builddiagnostics.updateBuildDiagnostics)({
                 buildStage: 'start'
             });
@@ -1989,9 +1989,23 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
                                             });
                                         }
                                     }
-                                    dynamicRoute.prefetchSegmentDataRoutes ??= [];
-                                    for (const segmentPath of metadata.segmentPaths){
-                                        dynamicRoute.prefetchSegmentDataRoutes.push((0, _buildprefetchsegmentdataroute.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 = (0, _buildprefetchsegmentdataroute.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, {
@@ -2239,30 +2253,6 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
                         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 = [
-                                (0, _buildprefetchsegmentdataroute.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.