Skip to content

Update monorepo internal React deps #14639

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

Merged
brophdawg11 merged 26 commits into from
Dec 11, 2025
+355 −239
Merged

Update monorepo internal React deps #14639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3445757
Update integration/playground/tutoprial react dependencies to ^19.2.1
brophdawg11 Dec 8, 2025
db36a63
Update packages/* dev dependencies to react ^19.2.1
brophdawg11 Dec 8, 2025
9a85b4c
Remove root monorepo dep on react-server-dom-parcel
brophdawg11 Dec 8, 2025
f0ba69c
Update @vitejs/plugin-rsc dev deps to 0.5.6
brophdawg11 Dec 8, 2025
0a70866
Update lockfile
brophdawg11 Dec 8, 2025
bfc2967
Update unit test for updated useId format
brophdawg11 Dec 8, 2025
8f9fe46
Fix integration test failing due to 19.2 react performance script tag
brophdawg11 Dec 8, 2025
64f4a8a
Fix flaky defer test
brophdawg11 Dec 8, 2025
656a85b
Fix single fetch integration test due to new react 19.2 script tag
brophdawg11 Dec 8, 2025
60e4392
Add back root dep for integration tests
brophdawg11 Dec 8, 2025
a7f6975
Revert vite plugin update to get CI passing
brophdawg11 Dec 10, 2025
6f9ab90
Add lockfileupdates
brophdawg11 Dec 10, 2025
42143a8
Update e2e test to ignore react 19 performance track logs
brophdawg11 Dec 10, 2025
cf78dc7
Move react deps to pnpm catalog
brophdawg11 Dec 10, 2025
df42768
Move react-server-dom-parcel to pnpm catalog
brophdawg11 Dec 10, 2025
f57987c
Move vite rsc pliugin to pnpm catalog
brophdawg11 Dec 10, 2025
858df57
Add pnpm-workspace file to wireit configs
brophdawg11 Dec 10, 2025
155e949
Downgrade vite plugin to get CI passing
brophdawg11 Dec 10, 2025
7c0ba98
Update playwright reporter for debugging
brophdawg11 Dec 10, 2025
75bb5b0
Merge branch 'dev' into brophdawg11/repo-deps
brophdawg11 Dec 10, 2025
6ae1a9f
Merge branch 'dev' into brophdawg11/repo-deps
brophdawg11 Dec 11, 2025
62226cb
NAmed catalog for react canary for RSC templates
brophdawg11 Dec 11, 2025
d621f36
Merge branch 'dev' into brophdawg11/repo-deps
brophdawg11 Dec 11, 2025
7b64bde
Revert test updates
brophdawg11 Dec 11, 2025
2926a7a
Merge branch 'dev' into brophdawg11/repo-deps
brophdawg11 Dec 11, 2025
a46ef11
Move react types to catalog
brophdawg11 Dec 11, 2025
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: 2 additions & 2 deletions integration/helpers/cloudflare-dev-proxy-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@react-router/remix-routes-option-adapter": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"typescript": "catalog:",
"vite": "^6.3.0",
"wrangler": "^4.23.0"
Expand Down
10 changes: 5 additions & 5 deletions integration/helpers/rsc-vite-framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@react-router/fs-routes": "workspace:*",
"@types/express": "^5.0.0",
"@types/node": "^22.13.1",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@types/react": "catalog:react-canary",
"@types/react-dom": "catalog:react-canary",
"@vanilla-extract/css": "^1.17.4",
"@vanilla-extract/vite-plugin": "^5.1.1",
"@vitejs/plugin-react": "^4.5.2",
Expand All @@ -33,9 +33,9 @@
"@react-router/serve": "workspace:*",
"compression": "^1.8.1",
"express": "^4.21.2",
"react": "catalog:",
"react-dom": "catalog:",
"react": "catalog:react-canary",
"react-dom": "catalog:react-canary",
"react-router": "workspace:*",
"react-server-dom-webpack": "catalog:"
"react-server-dom-webpack": "catalog:react-canary"
}
}
10 changes: 5 additions & 5 deletions integration/helpers/rsc-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@vitejs/plugin-rsc": "catalog:",
"@types/express": "^5.0.0",
"@types/node": "^22.13.1",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@types/react": "catalog:react-canary",
"@types/react-dom": "catalog:react-canary",
"@vitejs/plugin-react": "^4.5.2",
"typescript": "catalog:",
"vite": "^6.3.0"
Expand All @@ -24,9 +24,9 @@
"compression": "^1.8.1",
"cross-env": "^7.0.3",
"express": "^4.21.2",
"react": "catalog:",
"react-dom": "catalog:",
"react": "catalog:react-canary",
"react-dom": "catalog:react-canary",
"react-router": "workspace:*",
"react-server-dom-webpack": "catalog:"
"react-server-dom-webpack": "catalog:react-canary"
}
}
4 changes: 2 additions & 2 deletions integration/helpers/vite-5-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@react-router/remix-routes-option-adapter": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"eslint": "^8.38.0",
"typescript": "catalog:",
"vite": "^5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/vite-6-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@react-router/remix-routes-option-adapter": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"eslint": "^8.38.0",
"typescript": "catalog:",
"vite": "^6.3.0",
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/vite-7-beta-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@react-router/remix-routes-option-adapter": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"eslint": "^8.38.0",
"typescript": "catalog:",
"vite": "7.0.0-beta.0",
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/vite-plugin-cloudflare-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@types/node": "^20.0.0",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"eslint": "^8.38.0",
"typescript": "catalog:",
"vite": "^6.3.0",
Expand Down
4 changes: 2 additions & 2 deletions integration/helpers/vite-rolldown-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@react-router/dev": "workspace:*",
"@react-router/fs-routes": "workspace:*",
"@react-router/remix-routes-option-adapter": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"cross-env": "^7.0.3",
"eslint": "^8.38.0",
"typescript": "catalog:",
Expand Down
10 changes: 10 additions & 0 deletions integration/link-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,17 @@ test.describe("route module link export", () => {
let app = new PlaywrightFixture(appFixture, page);
await app.goto("/");
let scripts = await page.$$("script");

// Scripts:
// RR: window.__reactRouterContext
// RR: window.__reactRouterManifest/window.__reactRouterRouteModules
// React: requestAnimationFrame(function(){$RT=performance.now()});
// RR: window.__reactRouterContext.streamController.enqueue()
// React: $RC=function(b,c,e){...
// RR: window.__reactRouterContext.streamController.close();
// React: $RC("B:1","S:1")
expect(scripts.length).toEqual(7);

expect(await scripts[0].innerText()).toContain(
"__reactRouterContext",
);
Expand Down
10 changes: 10 additions & 0 deletions integration/single-fetch-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4368,7 +4368,17 @@ test.describe("single-fetch", () => {
let app = new PlaywrightFixture(appFixture, page);
await app.goto("/data", true);
let scripts = await page.$$("script");

// Scripts:
// RR: window.__reactRouterContext
// RR: window.__reactRouterManifest/window.__reactRouterRouteModules
// React: requestAnimationFrame(function(){$RT=performance.now()});
// RR: window.__reactRouterContext.streamController.enqueue()
// React: $RC=function(b,c,e){...
// RR: window.__reactRouterContext.streamController.close();
// React: $RC("B:1","S:1")
expect(scripts.length).toBe(7);

let remixScriptsCount = 0;
for (let script of scripts) {
let content = await script.innerHTML();
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
},
"packageManager": "pnpm@9.10.0",
"resolutions": {
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@types/react-test-renderer": "^18.3.1",
"jsdom": "22.1.0"
},
Expand All @@ -59,8 +59,8 @@
"@remix-run/changelog-github": "^0.0.5",
"@types/jest": "^29.5.4",
"@types/jsdom": "^21.1.1",
"@types/react": "^19.0.12",
"@types/react-dom": "^19.0.4",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@types/react-test-renderer": "^19.0.0",
"@typescript-eslint/eslint-plugin": "^7.5.0",
"@typescript-eslint/parser": "^7.5.0",
Expand Down
1 change: 1 addition & 0 deletions packages/create-react-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
Copy link
Contributor Author

@brophdawg11 brophdawg11 Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trigger a new wireit build if we update any catalog versions

"*.ts",
"tsconfig.json",
"package.json"
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-architect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"sessions/**",
"*.ts",
"tsconfig.json",
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-cloudflare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"sessions/**",
"*.ts",
"tsconfig.json",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-router-dev/__tests__/fixtures/basic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
},
"devDependencies": {
"@react-router/dev": "*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"eslint": "^8.38.0",
"typescript": "catalog:"
},
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"cli/**",
"config/**",
"module-sync-enabled/**",
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-dom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"*.ts",
"tsconfig.json",
"package.json"
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"*.ts",
"tsconfig.json",
"package.json"
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-fs-routes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"*.ts",
"tsconfig.json",
"package.json"
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"sessions/**",
"*.ts",
"tsconfig.json",
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-remix-routes-option-adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"*.ts",
"tsconfig.json",
"package.json"
Expand Down
1 change: 1 addition & 0 deletions packages/react-router-serve/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"build": {
"command": "tsup",
"files": [
"../../pnpm-workspace.yaml",
"*.ts",
"bin.js",
"tsconfig.json",
Expand Down
1 change: 1 addition & 0 deletions packages/react-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
"build": {
"command": "premove dist && tsup && tsup --config tsup.config.rsc.ts",
"files": [
"../../pnpm-workspace.yaml",
"lib/**",
"*.ts",
"tsconfig.json",
Expand Down
4 changes: 2 additions & 2 deletions playground/framework-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"@types/compression": "^1.8.1",
"@types/express": "^4.17.20",
"@types/morgan": "^1.9.10",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"cross-env": "^7.0.3",
"typescript": "catalog:",
"vite": "^6.3.0",
Expand Down
4 changes: 2 additions & 2 deletions playground/framework-rolldown-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
},
"devDependencies": {
"@react-router/dev": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"typescript": "catalog:",
"vite": "npm:rolldown-vite@6.3.0-beta.3",
"vite-tsconfig-paths": "^4.2.1"
Expand Down
4 changes: 2 additions & 2 deletions playground/framework-spa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
},
"devDependencies": {
"@react-router/dev": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"typescript": "catalog:",
"vite": "^6.3.0",
"vite-tsconfig-paths": "^4.2.1"
Expand Down
4 changes: 2 additions & 2 deletions playground/framework-vite-5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"devDependencies": {
"@react-router/dev": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"typescript": "catalog:",
"vite": "^5.1.0",
"vite-tsconfig-paths": "^4.2.1"
Expand Down
4 changes: 2 additions & 2 deletions playground/framework-vite-7-beta/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"devDependencies": {
"@react-router/dev": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"typescript": "catalog:",
"vite": "7.0.0-beta.0",
"vite-tsconfig-paths": "^4.2.1"
Expand Down
4 changes: 2 additions & 2 deletions playground/framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"devDependencies": {
"@react-router/dev": "workspace:*",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"typescript": "catalog:",
"vite": "^6.3.0",
"vite-tsconfig-paths": "^4.2.1"
Expand Down
4 changes: 2 additions & 2 deletions playground/middleware/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"@types/express-serve-static-core": "^5.0.6",
"@types/morgan": "^1.9.10",
"@types/node": "^20.0.0",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"tsx": "^4.19.3",
"typescript": "catalog:",
"vite": "^6.3.0",
Expand Down
9 changes: 5 additions & 4 deletions playground/rsc-vite-framework/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@react-router/serve": "workspace:*",
"@types/express": "^5.0.0",
"@types/node": "^22.13.1",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@types/react": "catalog:react-canary",
"@types/react-dom": "catalog:react-canary",
"@vitejs/plugin-rsc": "catalog:",
"cross-env": "^7.0.3",
"remark-frontmatter": "^5.0.0",
Expand All @@ -31,9 +31,10 @@
"@mjackson/node-fetch-server": "0.6.1",
"compression": "^1.8.1",
"express": "^4.21.2",
"react": "catalog:",
"react-dom": "catalog:",
"react": "catalog:react-canary",
"react-dom": "catalog:react-canary",
"react-router": "workspace:*",
"react-server-dom-webpack": "catalog:react-canary",
"remix-utils": "^8.7.0"
}
}
11 changes: 6 additions & 5 deletions playground/rsc-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"devDependencies": {
"@types/express": "^5.0.0",
"@types/node": "^22.13.1",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@types/react": "catalog:react-canary",
"@types/react-dom": "catalog:react-canary",
"@vitejs/plugin-react": "^4.5.2",
"@vitejs/plugin-rsc": "catalog:",
"cross-env": "^7.0.3",
Expand All @@ -24,8 +24,9 @@
"@mjackson/node-fetch-server": "0.6.1",
"compression": "^1.8.1",
"express": "^4.21.2",
"react": "catalog:",
"react-dom": "catalog:",
"react-router": "workspace:*"
"react": "catalog:react-canary",
"react-dom": "catalog:react-canary",
"react-router": "workspace:*",
"react-server-dom-webpack": "catalog:react-canary"
}
}
Loading