Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
d8a60e34
Unverified
Commit
d8a60e34
authored
Jun 24, 2024
by
Jiachi Liu
Committed by
GitHub
Jun 24, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: turbopack metadata routes normalizing (#67159)
parent
f03fed04
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
18 deletions
+8
-18
is-metadata-route.ts
packages/next/src/lib/metadata/is-metadata-route.ts
+0
-1
hot-reloader-turbopack.ts
packages/next/src/server/dev/hot-reloader-turbopack.ts
+2
-2
turbopack-utils.ts
packages/next/src/server/dev/turbopack-utils.ts
+6
-4
setup-dev-bundler.ts
...ges/next/src/server/lib/router-utils/setup-dev-bundler.ts
+0
-11
No files found.
packages/next/src/lib/metadata/is-metadata-route.ts
View file @
d8a60e34
...
@@ -131,7 +131,6 @@ export function isStaticMetadataRouteFile(appDirRelativePath: string) {
...
@@ -131,7 +131,6 @@ export function isStaticMetadataRouteFile(appDirRelativePath: string) {
return
isMetadataRouteFile
(
appDirRelativePath
,
[],
true
)
return
isMetadataRouteFile
(
appDirRelativePath
,
[],
true
)
}
}
// @deprecated
export
function
isStaticMetadataRoute
(
page
:
string
)
{
export
function
isStaticMetadataRoute
(
page
:
string
)
{
return
(
return
(
page
===
'/robots'
||
page
===
'/robots'
||
...
...
packages/next/src/server/dev/hot-reloader-turbopack.ts
View file @
d8a60e34
...
@@ -63,7 +63,7 @@ import {
...
@@ -63,7 +63,7 @@ import {
type
TopLevelIssuesMap
,
type
TopLevelIssuesMap
,
isWellKnownError
,
isWellKnownError
,
printNonFatalIssue
,
printNonFatalIssue
,
normalize
AppMetadataRoutePag
e
,
normalize
dPageToTurbopackStructureRout
e
,
}
from
'./turbopack-utils'
}
from
'./turbopack-utils'
import
{
import
{
propagateServerField
,
propagateServerField
,
...
@@ -808,7 +808,7 @@ export async function createHotReloaderTurbopack(
...
@@ -808,7 +808,7 @@ export async function createHotReloaderTurbopack(
await
currentEntriesHandling
await
currentEntriesHandling
const
isInsideAppDir
=
routeDef
.
bundlePath
.
startsWith
(
'app/'
)
const
isInsideAppDir
=
routeDef
.
bundlePath
.
startsWith
(
'app/'
)
const
normalizedAppPage
=
normalize
AppMetadataRoutePag
e
(
const
normalizedAppPage
=
normalize
dPageToTurbopackStructureRout
e
(
page
,
page
,
extname
(
routeDef
.
filename
)
extname
(
routeDef
.
filename
)
)
)
...
...
packages/next/src/server/dev/turbopack-utils.ts
View file @
d8a60e34
...
@@ -520,9 +520,7 @@ export async function handleRouteType({
...
@@ -520,9 +520,7 @@ export async function handleRouteType({
const
type
=
writtenEndpoint
?.
type
const
type
=
writtenEndpoint
?.
type
await
manifestLoader
.
loadAppPathsManifest
(
await
manifestLoader
.
loadAppPathsManifest
(
page
)
normalizeAppMetadataRoutePage
(
page
,
false
)
)
if
(
type
===
'edge'
)
{
if
(
type
===
'edge'
)
{
await
manifestLoader
.
loadMiddlewareManifest
(
page
,
'app'
)
await
manifestLoader
.
loadMiddlewareManifest
(
page
,
'app'
)
...
@@ -1000,7 +998,11 @@ export async function handlePagesErrorRoute({
...
@@ -1000,7 +998,11 @@ export async function handlePagesErrorRoute({
})
})
}
}
export
function
normalizeAppMetadataRoutePage
(
// Since turbopack will create app pages/route entries based on the structure,
// which means the entry keys are based on file names.
// But for special metadata conventions we'll change the page/pathname to a different path.
// So we need this helper to map the new path back to original turbopack entry key.
export
function
normalizedPageToTurbopackStructureRoute
(
route
:
string
,
route
:
string
,
ext
:
string
|
false
ext
:
string
|
false
):
string
{
):
string
{
...
...
packages/next/src/server/lib/router-utils/setup-dev-bundler.ts
View file @
d8a60e34
...
@@ -415,17 +415,6 @@ async function startWatcher(opts: SetupOpts) {
...
@@ -415,17 +415,6 @@ async function startWatcher(opts: SetupOpts) {
pageName
,
pageName
,
!!
(
staticInfo
.
generateSitemaps
||
staticInfo
.
generateImageMetadata
)
!!
(
staticInfo
.
generateSitemaps
||
staticInfo
.
generateImageMetadata
)
)
)
// pageName = pageName.slice(0, -'/route'.length)
// if (pageName.endsWith('/sitemap')) {
// if (staticInfo.generateSitemaps) {
// pageName = `${pageName}/[__metadata_id__]`
// } else {
// pageName = `${pageName}.xml`
// }
// }
// pageName = `${pageName}/route`
}
}
if
(
if
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment