Unverified Commit a4aa1df7 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

rsc: keep static page props (#36157)

parent be3c804b
......@@ -431,14 +431,7 @@ function createServerComponentRenderer(
return root
}
// Although it's not allowed to attach some static methods to Component,
// we still re-assign all the component APIs to keep the behavior unchanged.
for (const methodName of [
'getInitialProps',
'getStaticProps',
'getServerSideProps',
'getStaticPaths',
]) {
for (const methodName of Object.keys(Component)) {
const method = (Component as any)[methodName]
if (method) {
;(ServerComponentWrapper as any)[methodName] = method
......@@ -1375,7 +1368,7 @@ export async function renderToHTML(
<AppContainerWithIsomorphicFiberStructure>
{isServerComponent && !!AppMod.__next_rsc__ ? (
// _app.server.js is used.
<Component {...props.pageProps} router={router} />
<Component {...props.pageProps} />
) : (
<App {...props} Component={Component} router={router} />
)}
......
export default function AppServer({ children }) {
return (
<div className="app-server-root">
<div className="app-server-root" data-title={children.type.title || ''}>
<style>{`.app-server-root { border: 2px solid blue; }`}</style>
{children}
</div>
......
......@@ -13,6 +13,8 @@ export default function Page() {
)
}
Page.title = 'node-rsc'
export const config = {
runtime: 'nodejs',
}
......@@ -38,7 +38,7 @@ async function testRoute(appPort, url, { isStatic, isEdge, isRSC }) {
// Should be re-rendered.
expect(renderedAt1).toBeLessThan(renderedAt2)
}
const customAppServerHtml = '<div class="app-server-root">'
const customAppServerHtml = '<div class="app-server-root"'
if (isRSC) {
expect(html1).toContain(customAppServerHtml)
} else {
......@@ -101,6 +101,9 @@ describe('Switchable runtime (prod)', () => {
isEdge: false,
isRSC: true,
})
const html = await renderViaHTTP(context.appPort, '/node-rsc')
expect(html).toContain('data-title="node-rsc"')
})
it('should build /node-rsc-ssr as a dynamic page with the nodejs runtime', async () => {
......
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