Skip to content

Commit 5e2ad29

Browse files
authored
Migrate rsc tests to app dir tests (vercel#38158)
### Tests * keep node & edge for streaming * separate rsc tests from streaming tests * move rsc tests to app-dir, disable the broken ones for now
1 parent 8a5c59b commit 5e2ad29

File tree

117 files changed

+765
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+765
-586
lines changed

.github/workflows/build_test_deploy.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -804,8 +804,6 @@ jobs:
804804
# test rsc hydration on firefox due to limited support of TransformStream api
805805
- run: npm i -g pnpm@${PNPM_VERSION}
806806
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
807-
- run: xvfb-run pnpm testheadless test/integration/react-streaming-and-server-components/test/index.test.js -t "should handle streaming server components correctly"
808-
if: ${{needs.build.outputs.docsChange != 'docs only change'}}
809807

810808
testSafari:
811809
name: Test Safari (production)

packages/next/build/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ export default async function build(
10741074
)
10751075

10761076
await Promise.all(
1077-
pageKeys.map(async (page) => {
1077+
pageKeys.map((page) => {
10781078
const checkPageSpan = staticCheckSpan.traceChild('check-page', {
10791079
page,
10801080
})

test/integration/react-streaming-and-server-components/app/pages/css-modules.server.js renamed to test/integration/react-server-components/basic/app/css-modules/page.server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// CSS modules can only be imported inside client components for now.
2-
import RedText from '../components/red/index.client'
2+
import RedText from '../../components/red/index.client'
33

44
export default function CSSM() {
55
return (
6-
<RedText>
6+
<RedText id="red-text">
77
<h1>This should be in red</h1>
88
</RedText>
99
)

test/integration/react-streaming-and-server-components/app/pages/escaping-rsc.server.js renamed to test/integration/react-server-components/basic/app/escaping-rsc/page.server.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Suspense } from 'react'
2-
import Nav from '../components/nav'
2+
import Nav from '../../components/nav'
33

44
let result
55
let promise
@@ -30,7 +30,3 @@ export default function Page() {
3030
</div>
3131
)
3232
}
33-
34-
export const config = {
35-
runtime: 'experimental-edge',
36-
}

test/integration/react-streaming-and-server-components/app/pages/multi.server.js renamed to test/integration/react-server-components/basic/app/multi/page.server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Bar from '../components/bar.server'
1+
import Bar from '../../components/bar.server'
22

33
export default function Multi() {
44
return <Bar />

test/integration/react-streaming-and-server-components/app/pages/native-module.server.js renamed to test/integration/react-server-components/basic/app/native-module/page.server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fs from 'fs'
22

3-
import Foo from '../components/foo.client'
3+
import Foo from '../../components/foo.client'
44

55
export default function Page() {
66
return (
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import NextImage from 'next/image'
2-
import src from '../../public/test.jpg'
2+
import src from '../../../public/test.jpg'
33

44
// Keep arrow function to test rsc loaders
55
const Page = () => {
66
return <NextImage src={src} />
77
}
88

99
export default Page
10-
11-
export const config = {
12-
runtime: 'experimental-edge',
13-
}

0 commit comments

Comments
 (0)