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

Use react-dom/server.edge instead of .browser in Next.js runtime #66954

Merged
merged 3 commits into from
Jun 19, 2024
Merged

Use react-dom/server.edge instead of .browser in Next.js runtime #66954

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
12cc42f
Use react-dom/server.edge instead of .browser in Edge Runtime
eps1lon Jun 17, 2024
810c529
Import .edge instead
eps1lon Jun 18, 2024
797bb8c
Use next-swc from branch for PR size stats (#66964)
eps1lon Jun 18, 2024
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
4 changes: 4 additions & 0 deletions .github/actions/next-stats-action/native/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
15 changes: 13 additions & 2 deletions .github/actions/next-stats-action/src/prepare/repo-setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ module.exports = (actionInfo) => {
* @param {{ repoDir: string, nextSwcVersion: null | string }} options Required options
* @returns {Promise<Map<string, string>>} List packages key is the package name, value is the path to the packed tar file.'
*/
async linkPackages({ repoDir, nextSwcVersion, parentSpan }) {
async linkPackages({
repoDir,
nextSwcVersion: nextSwcVersionSpecified,
parentSpan,
}) {
if (!parentSpan) {
// Not all callers provide a parent span
parentSpan = mockSpan()
Expand Down Expand Up @@ -118,6 +122,11 @@ module.exports = (actionInfo) => {
}
})

const nextSwcVersion =
nextSwcVersionSpecified ??
pkgDatas.get('@next/swc')?.packedPackageTarPath ??
null

await parentSpan
.traceChild('write-packagejson')
.traceAsyncFn(async () => {
Expand Down Expand Up @@ -171,9 +180,11 @@ module.exports = (actionInfo) => {
})
if (nextSwcVersion) {
Object.assign(packageJson.dependencies, {
// CI
'@next/swc-linux-x64-gnu': nextSwcVersion,
// Vercel issued laptops
'@next/swc-darwin-arm64': nextSwcVersion,
})
} else {
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/next/src/server/render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import type { Revalidate, SwrDelta } from './lib/revalidate'
import type { COMPILER_NAMES } from '../shared/lib/constants'

import React, { type JSX } from 'react'
import ReactDOMServer from 'react-dom/server.browser'
import ReactDOMServerEdge from 'react-dom/server.edge'
import { StyleRegistry, createStyleRegistry } from 'styled-jsx'
import {
GSP_NO_RETURNED_VALUE,
Expand Down Expand Up @@ -128,7 +128,7 @@ function noRouter() {
}

async function renderToString(element: React.ReactElement) {
const renderStream = await ReactDOMServer.renderToReadableStream(element)
const renderStream = await ReactDOMServerEdge.renderToReadableStream(element)
await renderStream.allReady
return streamToString(renderStream)
}
Expand Down Expand Up @@ -1320,7 +1320,7 @@ export async function renderToHTMLImpl(
) => {
const content = renderContent(EnhancedApp, EnhancedComponent)
return await renderToInitialFizzStream({
ReactDOMServer,
ReactDOMServer: ReactDOMServerEdge,
element: content,
})
}
Expand Down
2 changes: 1 addition & 1 deletion test/.stats-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"license": "MIT",
"dependencies": {
"next": "19.0.0-rc-6230622a1a-20240610",
"next": "latest",
"react": "19.0.0-rc-6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610"
},
Expand Down
Loading