Skip to content

Commit f589fa2

Browse files
committed
Merge branch 'canary' into x-use-stream-with-react-root
2 parents 6923909 + fb80055 commit f589fa2

5 files changed

Lines changed: 28 additions & 8 deletions

File tree

packages/next/build/webpack/loaders/next-flight-client-loader.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ async function parseExportNamesInto(
6262
switch (node.type) {
6363
// TODO: support export * from module path
6464
// case 'ExportAllDeclaration':
65+
case 'ExportDefaultExpression':
6566
case 'ExportDefaultDeclaration':
6667
names.push('default')
6768
continue
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default () => 'client-default-export-arrow'

test/integration/react-streaming-and-server-components/app/pages/client-exports-all.server.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as all from '../components/client-exports-all'
22
import * as allClient from '../components/client-exports-all.client'
33

4+
// TODO: support export all declaration
45
export default function Page() {
56
const { a, b, c, d, e } = all
67
const { a: ac, b: bc, c: cc, d: dc, e: ec } = allClient
Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
import { a, b, c, d, e } from '../components/client-exports'
2+
import DefaultArrow from '../components/client-default-export-arrow.client'
23

34
export default function Page() {
45
return (
56
<div>
6-
{a}
7-
{b}
8-
{c}
9-
{d}
10-
{e[0]}
7+
<div id="named-exports">
8+
{a}
9+
{b}
10+
{c}
11+
{d}
12+
{e[0]}
13+
</div>
14+
<div id="default-exports-arrow">
15+
<DefaultArrow />
16+
</div>
1117
</div>
1218
)
1319
}

test/integration/react-streaming-and-server-components/test/rsc.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,21 @@ export default function (context) {
6666
'/client-exports'
6767
)
6868
const $clientExports = cheerio.load(clientExportsHTML)
69-
expect($clientExports('div[hidden] > div').text()).toBe('abcde')
69+
expect($clientExports('div[hidden] > div > #named-exports').text()).toBe(
70+
'abcde'
71+
)
72+
expect(
73+
$clientExports('div[hidden] > div > #default-exports-arrow').text()
74+
).toBe('client-default-export-arrow')
7075

7176
const browser = await webdriver(context.appPort, '/client-exports')
72-
const text = await browser.waitForElementByCss('#__next').text()
73-
expect(text).toBe('abcde')
77+
const textNamedExports = await browser
78+
.waitForElementByCss('#named-exports')
79+
.text()
80+
const textDefaultExportsArrow = await browser
81+
.waitForElementByCss('#default-exports-arrow')
82+
.text()
83+
expect(textNamedExports).toBe('abcde')
84+
expect(textDefaultExportsArrow).toBe('client-default-export-arrow')
7485
})
7586
}

0 commit comments

Comments
 (0)