Unverified Commit cd6b491c authored by Shu Ding's avatar Shu Ding Committed by GitHub

Fix styled-jsx not working in client components in the edge runtime when SSR (#37042)

The Edge SSR server and the client bundle should share the same Styled JSX instance to ensure the context can be passed correctly, same with the way we handle `next/head`.

## Bug

- [ ] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
parent f354f46b
...@@ -1035,7 +1035,7 @@ export default async function getBaseWebpackConfig( ...@@ -1035,7 +1035,7 @@ export default async function getBaseWebpackConfig(
enforce: true, enforce: true,
name: 'rsc-runtime-deps', name: 'rsc-runtime-deps',
filename: 'rsc-runtime-deps.js', filename: 'rsc-runtime-deps.js',
test: /(node_modules\/react\/|\/shared\/lib\/head-manager-context\.js)/, test: /(node_modules\/react\/|\/shared\/lib\/head-manager-context\.js|node_modules\/styled-jsx\/)/,
}, },
} }
: undefined : undefined
...@@ -1280,7 +1280,7 @@ export default async function getBaseWebpackConfig( ...@@ -1280,7 +1280,7 @@ export default async function getBaseWebpackConfig(
// Move shared dependencies from sc_server and sc_client into the // Move shared dependencies from sc_server and sc_client into the
// same layer. // same layer.
{ {
test: /(node_modules\/react\/|\/shared\/lib\/head-manager-context\.js)/, test: /(node_modules\/react\/|\/shared\/lib\/head-manager-context\.js|node_modules\/styled-jsx\/)/,
layer: 'rsc_shared_deps', layer: 'rsc_shared_deps',
}, },
] ]
......
export default function Comp() {
return (
<div>
<h1>Red</h1>
<style jsx>{`
h1 {
color: red;
}
`}</style>
</div>
)
}
import Comp from '../components/styled-jsx.client'
export default function Page() {
return (
<div>
<Comp />
</div>
)
}
export const config = {
runtime: 'edge',
}
...@@ -270,6 +270,13 @@ export default function (context, { runtime, env }) { ...@@ -270,6 +270,13 @@ export default function (context, { runtime, env }) {
expect(content).toContain('This should be in red') expect(content).toContain('This should be in red')
}) })
it('should SSR styled-jsx correctly', async () => {
const html = await renderViaHTTP(context.appPort, '/styled-jsx')
const styledJsxClass = getNodeBySelector(html, 'h1').attr('class')
expect(html).toContain(`h1.${styledJsxClass}{color:red}`)
})
it('should handle 404 requests and missing routes correctly', async () => { it('should handle 404 requests and missing routes correctly', async () => {
const id = '#text' const id = '#text'
const content = 'custom-404-page' const content = 'custom-404-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