[pull] canary from vercel:canary #697
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…5835) ## What Fixes a bug where interception routes in parallel slots could not be prerendered using `generateStaticParams`, causing 404 responses when these routes were accessed directly. ## Why **The Problem:** Interception routes like `app/@modal/(.)photo/[id]/page.tsx` could not be prerendered even when they exported `generateStaticParams`. This was because the static path generation code only examined "children" segments in the loader tree, completely missing segments from parallel routes (like `@modal`) that actually contribute to the pathname. **Root Cause:** The previous implementation used `childrenRouteParamSegments` which only traversed the `children` branch of the loader tree: ```typescript // OLD: Only looked at children const childrenRouteParamSegments = [...segments from children only...] // This missed parallel routes like @modal that have dynamic segments ``` For a route structure like: ``` app/ [username]/ page.tsx @modal/ (.)[username]/ [id]/ page.tsx // ← This route's segments were MISSED ``` The build system couldn't discover the `[id]` parameter in the parallel route because it never traversed that branch of the tree. ## How **Solution:** Introduces `extractPathnameSegments()` which properly traverses the ENTIRE loader tree (not just children) to find ALL segments that contribute to the pathname: 1. **BFS Traversal**: Explores both `children` AND all parallel route slots (e.g., `@modal`, `@sidebar`) 2. **Depth Tracking**: Correctly tracks URL depth by: - Skipping route groups `(marketing)` - not in URL - Skipping parallel markers `@modal` - not in URL - Including interception markers `(.)photo` - ARE in URL 3. **Prefix Validation**: Ensures static segments match the target pathname before including dynamic segments 4. **Complete Parameter Discovery**: Returns all segments that contribute to pathname construction, regardless of which tree branch they're in **Example:** For `app/@modal/(.)photo/[id]/page.tsx`: - Old: Missed the `[id]` parameter entirely - New: Discovers `[id]` and enables prerendering with `generateStaticParams` ## Changes **New Module**: `extract-pathname-segments.ts` (192 lines) - Core algorithm for traversing loader tree and extracting pathname segments - Handles complex cases: parallel routes, interception routes, route groups - Well-documented with examples and algorithm explanation **Comprehensive Tests**: `extract-pathname-segments.test.ts` (897 lines) - Tests for simple cases, nested structures, parallel routes - Interception route handling in various configurations - Route group behavior and edge cases - Depth tracking validation **Integration**: `static-paths/app.ts` - Replaced `childrenRouteParamSegments` with `extractPathnameSegments()` - Updated pathname construction to use segments from parallel routes - Maintained backward compatibility **E2E Test**: Added test validating prerendering works for intercepted routes ## Test Plan The new E2E test verifies: ```typescript it('should prerender a dynamic intercepted route', async () => { // Verifies build output contains the prerendered interception route expect(next.cliOutput).toContain('/(.)john/1') // Verifies it doesn't generate the non-intercepted path expect(next.cliOutput).not.toContain('/john/1') }) ``` ## Impact **Before**: Interception routes with dynamic segments returned 404 when accessed directly, even with `generateStaticParams` **After**: These routes are properly prerendered at build time and return correct responses
### What? Refactor making dependencies outdated and use batch add
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )