-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(nextjs): Inject manifest into client for webpack builds #16857
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
73e0637
build manifest function
chargome 9b28d79
tests
chargome 657dd55
rename file
chargome a82b977
simplify page check
chargome 7d6e198
que
chargome 71b1121
fix handling optional catchall routes
chargome 3114f5c
update if else block
chargome 75305f5
..
chargome 4ad310f
inject manifest
chargome e105620
update interface + rename func
chargome 685bf04
Merge branch 'cg-next-client-manifest' into cg-next-manifest-webpack
chargome f593c49
Merge branch 'develop' into cg-next-client-manifest
chargome 2a4a35c
Merge branch 'cg-next-client-manifest' into cg-next-manifest-webpack
chargome f9430fe
rename option
chargome 6071f76
split routes again
chargome e416a2c
add option for route-groups
chargome 78ff933
Merge branch 'cg-next-client-manifest' into cg-next-manifest-webpack
chargome aeb2e6d
Merge branch 'develop' into cg-next-manifest-webpack
chargome 681cb29
más jsdocs
chargome File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,196 @@ | ||
import * as fs from 'fs'; | ||
import * as path from 'path'; | ||
|
||
export type RouteInfo = { | ||
path: string; | ||
dynamic: boolean; | ||
pattern?: string; | ||
paramNames?: string[]; | ||
}; | ||
|
||
export type RouteManifest = { | ||
dynamic: RouteInfo[]; | ||
static: RouteInfo[]; | ||
}; | ||
|
||
export type CreateRouteManifestOptions = { | ||
// For starters we only support app router | ||
appDirPath?: string; | ||
}; | ||
|
||
let manifestCache: RouteManifest | null = null; | ||
let lastAppDirPath: string | null = null; | ||
|
||
function isPageFile(filename: string): boolean { | ||
return filename === 'page.tsx' || filename === 'page.jsx' || filename === 'page.ts' || filename === 'page.js'; | ||
} | ||
|
||
function isRouteGroup(name: string): boolean { | ||
return name.startsWith('(') && name.endsWith(')'); | ||
} | ||
|
||
function getDynamicRouteSegment(name: string): string { | ||
if (name.startsWith('[[...') && name.endsWith(']]')) { | ||
// Optional catchall: [[...param]] | ||
const paramName = name.slice(5, -2); // Remove [[... and ]] | ||
return `:${paramName}*?`; // Mark with ? as optional | ||
} else if (name.startsWith('[...') && name.endsWith(']')) { | ||
// Required catchall: [...param] | ||
const paramName = name.slice(4, -1); // Remove [... and ] | ||
return `:${paramName}*`; | ||
} else { | ||
// Regular dynamic: [param] | ||
return `:${name.slice(1, -1)}`; | ||
} | ||
} | ||
|
||
function buildRegexForDynamicRoute(routePath: string): { pattern: string; paramNames: string[] } { | ||
const segments = routePath.split('/').filter(Boolean); | ||
const regexSegments: string[] = []; | ||
const paramNames: string[] = []; | ||
let hasOptionalCatchall = false; | ||
|
||
for (const segment of segments) { | ||
if (segment.startsWith(':')) { | ||
const paramName = segment.substring(1); | ||
|
||
if (paramName.endsWith('*?')) { | ||
// Optional catchall: matches zero or more segments | ||
const cleanParamName = paramName.slice(0, -2); | ||
paramNames.push(cleanParamName); | ||
// Handling this special case in pattern construction below | ||
hasOptionalCatchall = true; | ||
} else if (paramName.endsWith('*')) { | ||
// Required catchall: matches one or more segments | ||
const cleanParamName = paramName.slice(0, -1); | ||
paramNames.push(cleanParamName); | ||
regexSegments.push('(.+)'); | ||
} else { | ||
// Regular dynamic segment | ||
paramNames.push(paramName); | ||
regexSegments.push('([^/]+)'); | ||
} | ||
} else { | ||
// Static segment | ||
regexSegments.push(segment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); | ||
} | ||
} | ||
|
||
let pattern: string; | ||
if (hasOptionalCatchall) { | ||
// For optional catchall, make the trailing slash and segments optional | ||
// This allows matching both /catchall and /catchall/anything | ||
const staticParts = regexSegments.join('/'); | ||
pattern = `^/${staticParts}(?:/(.*))?$`; | ||
} else { | ||
pattern = `^/${regexSegments.join('/')}$`; | ||
} | ||
|
||
return { pattern, paramNames }; | ||
} | ||
|
||
function scanAppDirectory(dir: string, basePath: string = ''): RouteInfo[] { | ||
const routes: RouteInfo[] = []; | ||
|
||
try { | ||
const entries = fs.readdirSync(dir, { withFileTypes: true }); | ||
const pageFile = entries.some(entry => isPageFile(entry.name)); | ||
|
||
if (pageFile) { | ||
const routePath = basePath || '/'; | ||
const isDynamic = routePath.includes(':'); | ||
|
||
if (isDynamic) { | ||
const { pattern, paramNames } = buildRegexForDynamicRoute(routePath); | ||
routes.push({ | ||
path: routePath, | ||
dynamic: true, | ||
pattern, | ||
paramNames, | ||
}); | ||
} else { | ||
routes.push({ | ||
path: routePath, | ||
dynamic: false, | ||
}); | ||
} | ||
} | ||
|
||
for (const entry of entries) { | ||
if (entry.isDirectory()) { | ||
const fullPath = path.join(dir, entry.name); | ||
|
||
if (isRouteGroup(entry.name)) { | ||
// Route groups don't affect the URL, just scan them | ||
const subRoutes = scanAppDirectory(fullPath, basePath); | ||
routes.push(...subRoutes); | ||
continue; | ||
} | ||
|
||
const isDynamic = entry.name.startsWith('[') && entry.name.endsWith(']'); | ||
let routeSegment: string; | ||
|
||
if (isDynamic) { | ||
routeSegment = getDynamicRouteSegment(entry.name); | ||
} else { | ||
routeSegment = entry.name; | ||
} | ||
|
||
const newBasePath = `${basePath}/${routeSegment}`; | ||
const subRoutes = scanAppDirectory(fullPath, newBasePath); | ||
routes.push(...subRoutes); | ||
} | ||
} | ||
} catch (error) { | ||
// eslint-disable-next-line no-console | ||
console.warn('Error building route manifest:', error); | ||
} | ||
|
||
return routes; | ||
} | ||
|
||
/** | ||
* Returns a route manifest for the given app directory | ||
*/ | ||
export function createRouteManifest(options?: CreateRouteManifestOptions): RouteManifest { | ||
let targetDir: string | undefined; | ||
|
||
if (options?.appDirPath) { | ||
targetDir = options.appDirPath; | ||
} else { | ||
const projectDir = process.cwd(); | ||
const maybeAppDirPath = path.join(projectDir, 'app'); | ||
const maybeSrcAppDirPath = path.join(projectDir, 'src', 'app'); | ||
|
||
if (fs.existsSync(maybeAppDirPath) && fs.lstatSync(maybeAppDirPath).isDirectory()) { | ||
targetDir = maybeAppDirPath; | ||
} else if (fs.existsSync(maybeSrcAppDirPath) && fs.lstatSync(maybeSrcAppDirPath).isDirectory()) { | ||
targetDir = maybeSrcAppDirPath; | ||
} | ||
} | ||
|
||
if (!targetDir) { | ||
return { | ||
dynamic: [], | ||
static: [], | ||
}; | ||
} | ||
|
||
// Check if we can use cached version | ||
if (manifestCache && lastAppDirPath === targetDir) { | ||
return manifestCache; | ||
} | ||
|
||
const routes = scanAppDirectory(targetDir); | ||
|
||
const manifest: RouteManifest = { | ||
dynamic: routes.filter(route => route.dynamic), | ||
static: routes.filter(route => !route.dynamic), | ||
}; | ||
|
||
// set cache | ||
manifestCache = manifest; | ||
lastAppDirPath = targetDir; | ||
|
||
return manifest; | ||
} |
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
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
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
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/catchall/app/catchall/[[...path]]/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// beep |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/catchall/app/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// Ciao |
33 changes: 33 additions & 0 deletions
33
packages/nextjs/test/config/manifest/suites/catchall/catchall.test.ts
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import path from 'path'; | ||
import { describe, expect, test } from 'vitest'; | ||
import { createRouteManifest } from '../../../../../src/config/manifest/buildManifest'; | ||
|
||
describe('catchall', () => { | ||
const manifest = createRouteManifest({ appDirPath: path.join(__dirname, 'app') }); | ||
|
||
test('should generate a manifest with catchall route', () => { | ||
expect(manifest).toEqual({ | ||
dynamic: [ | ||
{ | ||
path: '/catchall/:path*?', | ||
dynamic: true, | ||
pattern: '^/catchall(?:/(.*))?$', | ||
paramNames: ['path'], | ||
}, | ||
], | ||
static: [{ path: '/', dynamic: false }], | ||
}); | ||
}); | ||
|
||
test('should generate correct pattern for catchall route', () => { | ||
const regex = new RegExp(manifest.dynamic[0]?.pattern ?? ''); | ||
expect(regex.test('/catchall/123')).toBe(true); | ||
expect(regex.test('/catchall/abc')).toBe(true); | ||
expect(regex.test('/catchall/123/456')).toBe(true); | ||
expect(regex.test('/catchall/123/abc/789')).toBe(true); | ||
expect(regex.test('/catchall/')).toBe(true); | ||
expect(regex.test('/catchall')).toBe(true); | ||
expect(regex.test('/123/catchall/123')).toBe(false); | ||
expect(regex.test('/')).toBe(false); | ||
}); | ||
}); |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/dynamic/app/dynamic/[id]/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// beep |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/dynamic/app/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// Ciao |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/dynamic/app/static/nested/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// Hola |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/dynamic/app/users/[id]/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// User profile page |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/dynamic/app/users/[id]/posts/[postId]/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// Post detail page |
1 change: 1 addition & 0 deletions
1
packages/nextjs/test/config/manifest/suites/dynamic/app/users/[id]/settings/page.tsx
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
// User settings page |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.