Unverified Commit fa5dcbd7 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Fix React.cache() in layout/page file (#43187)

Co-authored-by: 's avatarJJ Kasper <jj@jjsweb.site>
parent 27434137
...@@ -375,7 +375,7 @@ function useFlightResponse( ...@@ -375,7 +375,7 @@ function useFlightResponse(
* This is only used for renderToHTML, the Flight response does not need additional wrappers. * This is only used for renderToHTML, the Flight response does not need additional wrappers.
*/ */
function createServerComponentRenderer( function createServerComponentRenderer(
ComponentToRender: React.ComponentType, ComponentToRender: any,
ComponentMod: { ComponentMod: {
renderToReadableStream: any renderToReadableStream: any
__next_app_webpack_require__?: any __next_app_webpack_require__?: any
...@@ -1442,9 +1442,9 @@ export async function renderToHTMLOrFlight( ...@@ -1442,9 +1442,9 @@ export async function renderToHTMLOrFlight(
isPrefetch && !Boolean(loaderTreeToFilter[2].loading) isPrefetch && !Boolean(loaderTreeToFilter[2].loading)
? null ? null
: // Create component tree using the slice of the loaderTree : // Create component tree using the slice of the loaderTree
React.createElement( // @ts-expect-error TODO-APP: fix async component type
( React.createElement(async () => {
await createComponentTree( const { Component } = await createComponentTree(
// This ensures flightRouterPath is valid and filters down the tree // This ensures flightRouterPath is valid and filters down the tree
{ {
createSegmentPath: (child) => { createSegmentPath: (child) => {
...@@ -1455,8 +1455,8 @@ export async function renderToHTMLOrFlight( ...@@ -1455,8 +1455,8 @@ export async function renderToHTMLOrFlight(
firstItem: isFirst, firstItem: isFirst,
} }
) )
).Component return <Component />
), }),
isPrefetch && !Boolean(loaderTreeToFilter[2].loading) ? null : ( isPrefetch && !Boolean(loaderTreeToFilter[2].loading) ? null : (
<>{rscPayloadHead}</> <>{rscPayloadHead}</>
), ),
...@@ -1529,14 +1529,6 @@ export async function renderToHTMLOrFlight( ...@@ -1529,14 +1529,6 @@ export async function renderToHTMLOrFlight(
// Below this line is handling for rendering to HTML. // Below this line is handling for rendering to HTML.
// Create full component tree from root to leaf.
const { Component: ComponentTree } = await createComponentTree({
createSegmentPath: (child) => child,
loaderTree: loaderTree,
parentParams: {},
firstItem: true,
})
// AppRouter is provided by next-app-loader // AppRouter is provided by next-app-loader
const AppRouter = const AppRouter =
ComponentMod.AppRouter as typeof import('../client/components/app-router').default ComponentMod.AppRouter as typeof import('../client/components/app-router').default
...@@ -1579,7 +1571,14 @@ export async function renderToHTMLOrFlight( ...@@ -1579,7 +1571,14 @@ export async function renderToHTMLOrFlight(
* using Flight which can then be rendered to HTML. * using Flight which can then be rendered to HTML.
*/ */
const ServerComponentsRenderer = createServerComponentRenderer( const ServerComponentsRenderer = createServerComponentRenderer(
() => { async () => {
// Create full component tree from root to leaf.
const { Component: ComponentTree } = await createComponentTree({
createSegmentPath: (child) => child,
loaderTree: loaderTree,
parentParams: {},
firstItem: true,
})
const initialTree = createFlightRouterStateFromLoaderTree(loaderTree) const initialTree = createFlightRouterStateFromLoaderTree(loaderTree)
return ( return (
......
'use client'
import { cache } from 'react'
const getRandomMemoized = cache(() => Math.random())
export default function Page() {
const val1 = getRandomMemoized()
const val2 = getRandomMemoized()
return (
<>
<h1>React Cache Client Component</h1>
<p id="value-1">{val1}</p>
<p id="value-2">{val2}</p>
</>
)
}
import Link from 'next/link'
export default function Page() {
return (
<>
<p>
<Link id="to-server-component" href="/react-cache/server-component">
To Server Component
</Link>
</p>
<p>
<Link id="to-client-component" href="/react-cache/client-component">
To Client Component
</Link>
</p>
</>
)
}
import { cache } from 'react'
const getRandomMemoized = cache(() => Math.random())
export default function Page() {
const val1 = getRandomMemoized()
const val2 = getRandomMemoized()
return (
<>
<h1>React Cache Server Component</h1>
<p id="value-1">{val1}</p>
<p id="value-2">{val2}</p>
</>
)
}
import Link from 'next/link'
export default function Page() {
return (
<>
<p>
<Link id="to-server-component" href="/react-fetch/server-component">
To Server Component
</Link>
</p>
<p>
<Link id="to-client-component" href="/react-fetch/client-component">
To Client Component
</Link>
</p>
</>
)
}
async function getRandomMemoizedByFetch() {
const res = await fetch(
'https://next-data-api-endpoint.vercel.app/api/random'
)
return res.text()
}
export default async function Page() {
const val1 = await getRandomMemoizedByFetch()
const val2 = await getRandomMemoizedByFetch()
return (
<>
<h1>React Fetch Server Component</h1>
<p id="value-1">{val1}</p>
<p id="value-2">{val2}</p>
</>
)
}
...@@ -2165,6 +2165,99 @@ describe('app dir', () => { ...@@ -2165,6 +2165,99 @@ describe('app dir', () => {
}) })
describe('known bugs', () => { describe('known bugs', () => {
describe('should support React cache', () => {
it('server component', async () => {
const browser = await webdriver(
next.url,
'/react-cache/server-component'
)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
it('server component client-navigation', async () => {
const browser = await webdriver(next.url, '/react-cache')
await browser
.elementByCss('#to-server-component')
.click()
.waitForElementByCss('#value-1', 10000)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
it('client component', async () => {
const browser = await webdriver(
next.url,
'/react-cache/client-component'
)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
it('client component client-navigation', async () => {
const browser = await webdriver(next.url, '/react-cache')
await browser
.elementByCss('#to-client-component')
.click()
.waitForElementByCss('#value-1', 10000)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
})
describe('should support React fetch instrumentation', () => {
it('server component', async () => {
const browser = await webdriver(
next.url,
'/react-fetch/server-component'
)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
it('server component client-navigation', async () => {
const browser = await webdriver(next.url, '/react-fetch')
await browser
.elementByCss('#to-server-component')
.click()
.waitForElementByCss('#value-1', 10000)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
// TODO-APP: React doesn't have fetch deduping for client components yet.
it.skip('client component', async () => {
const browser = await webdriver(
next.url,
'/react-fetch/client-component'
)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
// TODO-APP: React doesn't have fetch deduping for client components yet.
it.skip('client component client-navigation', async () => {
const browser = await webdriver(next.url, '/react-fetch')
await browser
.elementByCss('#to-client-component')
.click()
.waitForElementByCss('#value-1', 10000)
const val1 = await browser.elementByCss('#value-1').text()
const val2 = await browser.elementByCss('#value-2').text()
expect(val1).toBe(val2)
})
})
it('should not share flight data between requests', async () => { it('should not share flight data between requests', async () => {
const fetches = await Promise.all( const fetches = await Promise.all(
[...new Array(5)].map(() => [...new Array(5)].map(() =>
......
...@@ -104,7 +104,7 @@ describe('app dir - rsc errors', () => { ...@@ -104,7 +104,7 @@ describe('app dir - rsc errors', () => {
'/server-with-errors/page-export' '/server-with-errors/page-export'
) )
expect(html).toContain( expect(html).toContain(
'The default export is not a React Component in page: \\"/server-with-errors/page-export\\"' 'The default export is not a React Component in page:'
) )
}) })
}) })
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