Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: duplicate app server #36710

Merged
merged 4 commits into from May 5, 2022
Merged

fix: duplicate app server #36710

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5558405
fix: duplicate app server
huozhi May 5, 2022
efed274
fix: duplicate app server
huozhi May 5, 2022
f8e4aa2
rm logs
huozhi May 5, 2022
799c142
Merge branch 'canary' into fix/duplicate-rsc-app
kodiakhq[bot] May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions packages/next/server/render.tsx
View file
Open in desktop
Expand Up @@ -208,13 +208,8 @@ function renderPageTree(
isServerComponent: boolean
) {
const { router: _, ...rest } = props

if (isServerComponent) {
return (
<App>
<Component {...rest} />
</App>
)
return <Component {...rest} />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should keep App here but remove it from ServerComponentWrapper, _app shouldn't be rendered as a part of server components. What's your take?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have to keep it inside ServerComponentWrapper for now since AppServer needs to be sent through streaming response as well

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since AppServer needs to be sent through streaming response as well

The definition of _app.server is blurry. If it is a client component, it shouldn't be included in the flight response. If it's a server component, it should be allowed to exist at the same time along with _app.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_app is the client one, which is not included in flight response yet. and you can have _app.server and _app at the same time.

}

return <App Component={Component} {...props} />
Expand Down
7 changes: 7 additions & 0 deletions test/integration/react-streaming-and-server-components/switchable-runtime/pages/_app.js
View file
Open in desktop
@@ -0,0 +1,7 @@
export default function App({ Component, pageProps }) {
return (
<div className="app-client-root">
<Component {...pageProps} />
</div>
)
}
7 changes: 4 additions & 3 deletions test/integration/react-streaming-and-server-components/test/switchable-runtime.test.js
View file
Open in desktop
Expand Up @@ -38,11 +38,12 @@ async function testRoute(appPort, url, { isStatic, isEdge, isRSC }) {
// Should be re-rendered.
expect(renderedAt1).toBeLessThan(renderedAt2)
}
const customAppServerHtml = '<div class="app-server-root"'
if (isRSC) {
expect(html1).toContain(customAppServerHtml)
const appServerOccurrence = html1.match(/class="app-server-root"/g) || []
expect(appServerOccurrence.length).toBe(1)
expect(html1).not.toContain('"app-client-root"')
} else {
expect(html1).not.toContain(customAppServerHtml)
expect(html1).not.toContain('"app-server-root"')
huozhi marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down