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 hydration issue in the switchable runtime tests #35616

Merged
merged 3 commits into from
Mar 27, 2022
Merged

Fix hydration issue in the switchable runtime tests #35616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
003f954
fix hydration issues in the switchable runtime tests
shuding Mar 26, 2022
04641f3
fix test
shuding Mar 26, 2022
7f1478e
Merge branch 'canary' into shu/1670
kodiakhq[bot] Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...gration/react-streaming-and-server-components/switchable-runtime/pages/edge-rsc.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page() {
return (
<div>
This is a SSR RSC page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions test/integration/react-streaming-and-server-components/switchable-runtime/pages/edge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page() {
return (
<div>
This is a SSR page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions ...ion/react-streaming-and-server-components/switchable-runtime/pages/node-rsc-ssg.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page({ type }) {
return (
<div>
This is a {type} RSC page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions ...ion/react-streaming-and-server-components/switchable-runtime/pages/node-rsc-ssr.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page({ type }) {
return (
<div>
This is a {type} RSC page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions ...gration/react-streaming-and-server-components/switchable-runtime/pages/node-rsc.server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page() {
return (
<div>
This is a static RSC page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions test/integration/react-streaming-and-server-components/switchable-runtime/pages/node-ssg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page({ type }) {
return (
<div>
This is a {type} page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions test/integration/react-streaming-and-server-components/switchable-runtime/pages/node-ssr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page({ type }) {
return (
<div>
This is a {type} page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions test/integration/react-streaming-and-server-components/switchable-runtime/pages/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page() {
return (
<div>
This is a static page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
Expand Down
8 changes: 4 additions & 4 deletions test/integration/react-streaming-and-server-components/switchable-runtime/pages/static.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import getRuntime from '../utils/runtime'
import getTime from '../utils/time'
import Runtime from '../utils/runtime'
import Time from '../utils/time'

export default function Page() {
return (
<div>
This is a static page.
<br />
{'Runtime: ' + getRuntime()}
<Runtime />
<br />
{'Time: ' + getTime()}
<Time />
</div>
)
}
15 changes: 13 additions & 2 deletions test/integration/react-streaming-and-server-components/switchable-runtime/utils/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
export default function getRuntime() {
return process.version ? `Node.js ${process.version}` : 'Edge/Browser'
export default function Runtime() {
let runtime

if (typeof window !== 'undefined') {
// We have to make sure it matches the existing markup when hydrating.
runtime = document.getElementById('__runtime').textContent
} else {
runtime =
'Runtime: ' +
(process.version ? `Node.js ${process.version}` : 'Edge/Browser')
}

return <span id="__runtime">{runtime}</span>
}
13 changes: 11 additions & 2 deletions test/integration/react-streaming-and-server-components/switchable-runtime/utils/time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
export default function getTime() {
return Date.now()
export default function Time() {
let time

if (typeof window !== 'undefined') {
// We have to make sure it matches the existing markup when hydrating.
time = document.getElementById('__time').textContent
} else {
time = 'Time: ' + Date.now()
}

return <span id="__time">{time}</span>
}