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
0d0448be
Unverified
Commit
0d0448be
authored
Oct 04, 2024
by
Jiachi Liu
Committed by
GitHub
Oct 04, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix client reference access causing metadata missing (#70732) (#70788)
parent
381d1f9a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
72 additions
and
9 deletions
+72
-9
resolve-metadata.ts
packages/next/src/lib/metadata/resolve-metadata.ts
+0
-9
layout.tsx
...app-dir/reexport-client-component-metadata/app/layout.tsx
+12
-0
page-content.tsx
...lient-component-metadata/app/no-override/page-content.tsx
+5
-0
page.tsx
...export-client-component-metadata/app/no-override/page.tsx
+3
-0
page-content.tsx
...t-client-component-metadata/app/override/page-content.tsx
+5
-0
page.tsx
.../reexport-client-component-metadata/app/override/page.tsx
+8
-0
reexport-client-component-metadata.test.ts
...onent-metadata/reexport-client-component-metadata.test.ts
+39
-0
No files found.
packages/next/src/lib/metadata/resolve-metadata.ts
View file @
0d0448be
...
@@ -28,7 +28,6 @@ import {
...
@@ -28,7 +28,6 @@ import {
import
{
resolveOpenGraph
,
resolveTwitter
}
from
'./resolvers/resolve-opengraph'
import
{
resolveOpenGraph
,
resolveTwitter
}
from
'./resolvers/resolve-opengraph'
import
{
resolveTitle
}
from
'./resolvers/resolve-title'
import
{
resolveTitle
}
from
'./resolvers/resolve-title'
import
{
resolveAsArrayOrUndefined
}
from
'./generate/utils'
import
{
resolveAsArrayOrUndefined
}
from
'./generate/utils'
import
{
isClientReference
}
from
'../client-reference'
import
{
import
{
getComponentTypeModule
,
getComponentTypeModule
,
getLayoutOrPageModule
,
getLayoutOrPageModule
,
...
@@ -322,9 +321,6 @@ async function getDefinedViewport(
...
@@ -322,9 +321,6 @@ async function getDefinedViewport(
props
:
any
,
props
:
any
,
tracingProps
:
{
route
:
string
}
tracingProps
:
{
route
:
string
}
):
Promise
<
Viewport
|
ViewportResolver
|
null
>
{
):
Promise
<
Viewport
|
ViewportResolver
|
null
>
{
if
(
isClientReference
(
mod
))
{
return
null
}
if
(
typeof
mod
.
generateViewport
===
'function'
)
{
if
(
typeof
mod
.
generateViewport
===
'function'
)
{
const
{
route
}
=
tracingProps
const
{
route
}
=
tracingProps
return
(
parent
:
ResolvingViewport
)
=>
return
(
parent
:
ResolvingViewport
)
=>
...
@@ -347,11 +343,6 @@ async function getDefinedMetadata(
...
@@ -347,11 +343,6 @@ async function getDefinedMetadata(
props
:
any
,
props
:
any
,
tracingProps
:
{
route
:
string
}
tracingProps
:
{
route
:
string
}
):
Promise
<
Metadata
|
MetadataResolver
|
null
>
{
):
Promise
<
Metadata
|
MetadataResolver
|
null
>
{
// Layer is a client component, we just skip it. It can't have metadata exported.
// Return early to avoid accessing properties error for client references.
if
(
isClientReference
(
mod
))
{
return
null
}
if
(
typeof
mod
.
generateMetadata
===
'function'
)
{
if
(
typeof
mod
.
generateMetadata
===
'function'
)
{
const
{
route
}
=
tracingProps
const
{
route
}
=
tracingProps
return
(
parent
:
ResolvingMetadata
)
=>
return
(
parent
:
ResolvingMetadata
)
=>
...
...
test/e2e/app-dir/reexport-client-component-metadata/app/layout.tsx
0 → 100644
View file @
0d0448be
export
default
function
Layout
({
children
}:
{
children
:
React
.
ReactNode
})
{
return
(
<
html
>
<
body
>
{
children
}
</
body
>
</
html
>
)
}
export
const
metadata
=
{
title
:
'Root Layout'
,
description
:
'Root Description'
,
}
test/e2e/app-dir/reexport-client-component-metadata/app/no-override/page-content.tsx
0 → 100644
View file @
0d0448be
'use client'
export
default
function
PageContent
()
{
return
<
h1
>
Page 2 Content
</
h1
>
}
test/e2e/app-dir/reexport-client-component-metadata/app/no-override/page.tsx
0 → 100644
View file @
0d0448be
import
PageContent
from
'./page-content'
export
default
PageContent
test/e2e/app-dir/reexport-client-component-metadata/app/override/page-content.tsx
0 → 100644
View file @
0d0448be
'use client'
export
default
function
PageContent
()
{
return
<
h1
>
Page 1 Content
</
h1
>
}
test/e2e/app-dir/reexport-client-component-metadata/app/override/page.tsx
0 → 100644
View file @
0d0448be
import
PageContent
from
'./page-content'
export
const
metadata
=
{
title
:
'Page 1'
,
description
:
'Page 1 Description'
,
}
export
default
PageContent
test/e2e/app-dir/reexport-client-component-metadata/reexport-client-component-metadata.test.ts
0 → 100644
View file @
0d0448be
import
{
nextTestSetup
}
from
'e2e-utils'
describe
(
'app-dir - reexport-client-component-metadata'
,
()
=>
{
const
{
next
}
=
nextTestSetup
({
files
:
__dirname
,
})
it
(
'should render the page metadata if override'
,
async
()
=>
{
const
$
=
await
next
.
render$
(
'/override'
)
expect
(
$
(
'title'
).
text
()).
toBe
(
'Page 1'
)
expect
(
$
(
'meta[name="description"]'
).
attr
(
'content'
)).
toBe
(
'Page 1 Description'
)
const
browser
=
await
next
.
browser
(
'/override'
)
expect
(
await
browser
.
elementByCss
(
'title'
).
text
()).
toBe
(
'Page 1'
)
expect
(
await
browser
.
elementByCss
(
'meta[name="description"]'
)
.
getAttribute
(
'content'
)
).
toBe
(
'Page 1 Description'
)
})
it
(
'should render the layout metadata if not override'
,
async
()
=>
{
const
$
=
await
next
.
render$
(
'/no-override'
)
expect
(
$
(
'title'
).
text
()).
toBe
(
'Root Layout'
)
expect
(
$
(
'meta[name="description"]'
).
attr
(
'content'
)).
toBe
(
'Root Description'
)
const
browser
=
await
next
.
browser
(
'/no-override'
)
expect
(
await
browser
.
elementByCss
(
'title'
).
text
()).
toBe
(
'Root Layout'
)
expect
(
await
browser
.
elementByCss
(
'meta[name="description"]'
)
.
getAttribute
(
'content'
)
).
toBe
(
'Root Description'
)
})
})
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