Unverified Commit 3c3fd736 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Use React 19 stable in Pages Router (#73562)

parent a17f2d2c
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
}, },
"dependencies": { "dependencies": {
"next": "canary", "next": "canary",
"react": "19.0.0-rc-de68d2f4-20241204", "react": "^19.0.0",
"react-dom": "19.0.0-rc-de68d2f4-20241204" "react-dom": "^19.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "20.12.12", "@types/node": "20.12.12",
......
...@@ -206,9 +206,9 @@ ...@@ -206,9 +206,9 @@
"pretty-bytes": "5.3.0", "pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0", "pretty-ms": "7.0.0",
"random-seed": "0.3.0", "random-seed": "0.3.0",
"react": "19.0.0-rc-de68d2f4-20241204", "react": "19.0.0",
"react-builtin": "npm:react@19.0.0-rc-de68d2f4-20241204", "react-builtin": "npm:react@19.0.0-rc-de68d2f4-20241204",
"react-dom": "19.0.0-rc-de68d2f4-20241204", "react-dom": "19.0.0",
"react-dom-builtin": "npm:react-dom@19.0.0-rc-de68d2f4-20241204", "react-dom-builtin": "npm:react-dom@19.0.0-rc-de68d2f4-20241204",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-de68d2f4-20241204", "react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-de68d2f4-20241204",
"react-experimental-builtin": "npm:react@0.0.0-experimental-de68d2f4-20241204", "react-experimental-builtin": "npm:react@0.0.0-experimental-de68d2f4-20241204",
......
...@@ -13,7 +13,7 @@ import { GetTemplateFileArgs, InstallTemplateArgs } from "./types"; ...@@ -13,7 +13,7 @@ import { GetTemplateFileArgs, InstallTemplateArgs } from "./types";
// Do not rename or format. sync-react script relies on this line. // Do not rename or format. sync-react script relies on this line.
// prettier-ignore // prettier-ignore
const nextjsReactPeerVersion = "19.0.0-rc-de68d2f4-20241204"; const nextjsReactPeerVersion = "^19.0.0";
/** /**
* Get the file path for a given file in a template, e.g. "next.config.js". * Get the file path for a given file in a template, e.g. "next.config.js".
......
...@@ -109,8 +109,8 @@ ...@@ -109,8 +109,8 @@
"@opentelemetry/api": "^1.1.0", "@opentelemetry/api": "^1.1.0",
"@playwright/test": "^1.41.2", "@playwright/test": "^1.41.2",
"babel-plugin-react-compiler": "*", "babel-plugin-react-compiler": "*",
"react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204", "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
"react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204", "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0",
"sass": "^1.3.0" "sass": "^1.3.0"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
......
...@@ -33,6 +33,6 @@ ...@@ -33,6 +33,6 @@
}, },
"peerDependencies": { "peerDependencies": {
"next": "^13.0.0 || ^14.0.0 || ^15.0.0", "next": "^13.0.0 || ^14.0.0 || ^15.0.0",
"react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204" "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0"
} }
} }
...@@ -20,7 +20,7 @@ const { getTestFilter } = require('./test/get-test-filter') ...@@ -20,7 +20,7 @@ const { getTestFilter } = require('./test/get-test-filter')
// Do not rename or format. sync-react script relies on this line. // Do not rename or format. sync-react script relies on this line.
// prettier-ignore // prettier-ignore
const nextjsReactPeerVersion = "19.0.0-rc-de68d2f4-20241204"; const nextjsReactPeerVersion = "^19.0.0";
let argv = require('yargs/yargs')(process.argv.slice(2)) let argv = require('yargs/yargs')(process.argv.slice(2))
.string('type') .string('type')
......
...@@ -19,7 +19,7 @@ const pullRequestReviewers = ['eps1lon'] ...@@ -19,7 +19,7 @@ const pullRequestReviewers = ['eps1lon']
* Set to a specific version to override the Pages Router React version e.g. `^19.0.0`. * Set to a specific version to override the Pages Router React version e.g. `^19.0.0`.
* @type {string | null} * @type {string | null}
*/ */
const pagesRouterReact = null const pagesRouterReact = '^19.0.0'
const filesReferencingReactPeerDependencyVersion = [ const filesReferencingReactPeerDependencyVersion = [
'run-tests.js', 'run-tests.js',
...@@ -371,13 +371,14 @@ Or, run this command with no arguments to use the most recently published versio ...@@ -371,13 +371,14 @@ Or, run this command with no arguments to use the most recently published versio
const packageJsonPath = path.join(cwd, fileName) const packageJsonPath = path.join(cwd, fileName)
const packageJson = await fsp.readFile(packageJsonPath, 'utf-8') const packageJson = await fsp.readFile(packageJsonPath, 'utf-8')
const manifest = JSON.parse(packageJson) const manifest = JSON.parse(packageJson)
// Need to specify last supported RC version to avoid breaking changes.
if (manifest.peerDependencies['react']) { if (manifest.peerDependencies['react']) {
manifest.peerDependencies['react'] = manifest.peerDependencies['react'] =
`^18.2.0 || ${pagesRouterReactVersion}` `^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ${pagesRouterReactVersion}`
} }
if (manifest.peerDependencies['react-dom']) { if (manifest.peerDependencies['react-dom']) {
manifest.peerDependencies['react-dom'] = manifest.peerDependencies['react-dom'] =
`^18.2.0 || ${pagesRouterReactVersion}` `^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ${pagesRouterReactVersion}`
} }
await fsp.writeFile( await fsp.writeFile(
packageJsonPath, packageJsonPath,
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"next": "latest", "next": "latest",
"react": "19.0.0-rc-de68d2f4-20241204", "react": "^19.0.0",
"react-dom": "19.0.0-rc-de68d2f4-20241204" "react-dom": "^19.0.0"
}, },
"engines": { "engines": {
"node": ">=18.18.0" "node": ">=18.18.0"
......
...@@ -7,7 +7,6 @@ import cheerio from 'cheerio' ...@@ -7,7 +7,6 @@ import cheerio from 'cheerio'
// on experimental flags. For example, as a first step we could all the common // on experimental flags. For example, as a first step we could all the common
// gates like this one into a single module. // gates like this one into a single module.
const isPPREnabledByDefault = process.env.__NEXT_EXPERIMENTAL_PPR === 'true' const isPPREnabledByDefault = process.env.__NEXT_EXPERIMENTAL_PPR === 'true'
const isReact18 = parseInt(process.env.NEXT_TEST_REACT_VERSION) === 18
async function resolveStreamResponse(response: any, onData?: any) { async function resolveStreamResponse(response: any, onData?: any) {
let result = '' let result = ''
...@@ -515,14 +514,7 @@ describe('app dir - rsc basics', () => { ...@@ -515,14 +514,7 @@ describe('app dir - rsc basics', () => {
] ]
ssrPagesReactVersions.forEach((version) => { ssrPagesReactVersions.forEach((version) => {
if (isReact18 || isPPREnabledByDefault) { expect(version).not.toMatch(bundledReactVersionPattern)
expect(version).not.toMatch(bundledReactVersionPattern)
} else {
// TODO: Pages router only supports React 19 that is bundled
// Once we run with React 19 stable, this branch should be removed in
// favor of unconditional `not.toMatch`
expect(version).toMatch(bundledReactVersionPattern)
}
}) })
}) })
await Promise.all(promises) await Promise.all(promises)
...@@ -556,24 +548,10 @@ describe('app dir - rsc basics', () => { ...@@ -556,24 +548,10 @@ describe('app dir - rsc basics', () => {
`) `)
browserPagesReactVersions.forEach((version) => { browserPagesReactVersions.forEach((version) => {
if (isReact18 || isPPREnabledByDefault) { expect(version).not.toMatch(bundledReactVersionPattern)
expect(version).not.toMatch(bundledReactVersionPattern)
} else {
// TODO: Pages router only supports React 19 that is bundled
// Once we run with React 19 stable, this branch should be removed in
// favor of unconditional `not.toMatch`
expect(version).toMatch(bundledReactVersionPattern)
}
}) })
browserEdgePagesReactVersions.forEach((version) => { browserEdgePagesReactVersions.forEach((version) => {
if (isReact18 || isPPREnabledByDefault) { expect(version).not.toMatch(bundledReactVersionPattern)
expect(version).not.toMatch(bundledReactVersionPattern)
} else {
// TODO: Pages router only supports React 19 that is bundled
// Once we run with React 19 stable, this branch should be removed in
// favor of unconditional `not.toMatch`
expect(version).toMatch(bundledReactVersionPattern)
}
}) })
}) })
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
}, },
"dependencies": { "dependencies": {
"next": "canary", "next": "canary",
"react": "19.0.0-rc-de68d2f4-20241204", "react": "^19.0.0",
"react-dom": "19.0.0-rc-de68d2f4-20241204" "react-dom": "^19.0.0"
} }
} }
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
}, },
"dependencies": { "dependencies": {
"next": "canary", "next": "canary",
"react": "19.0.0-rc-de68d2f4-20241204", "react": "^19.0.0",
"react-dom": "19.0.0-rc-de68d2f4-20241204" "react-dom": "^19.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/react": "^18", "@types/react": "^18",
......
...@@ -52,7 +52,7 @@ type OmitFirstArgument<F> = F extends ( ...@@ -52,7 +52,7 @@ type OmitFirstArgument<F> = F extends (
// Do not rename or format. sync-react script relies on this line. // Do not rename or format. sync-react script relies on this line.
// prettier-ignore // prettier-ignore
const nextjsReactPeerVersion = "19.0.0-rc-de68d2f4-20241204"; const nextjsReactPeerVersion = "^19.0.0";
export class NextInstance { export class NextInstance {
protected files: FileRef | { [filename: string]: string | FileRef } protected files: FileRef | { [filename: string]: string | FileRef }
......
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