Unverified Commit 0d0448be authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Fix client reference access causing metadata missing (#70732) (#70788)

parent 381d1f9a
...@@ -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) =>
......
export default function Layout({ children }: { children: React.ReactNode }) {
return (
<html>
<body>{children}</body>
</html>
)
}
export const metadata = {
title: 'Root Layout',
description: 'Root Description',
}
'use client'
export default function PageContent() {
return <h1>Page 2 Content</h1>
}
import PageContent from './page-content'
export default PageContent
'use client'
export default function PageContent() {
return <h1>Page 1 Content</h1>
}
import PageContent from './page-content'
export const metadata = {
title: 'Page 1',
description: 'Page 1 Description',
}
export default PageContent
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')
})
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment