Update monorepo internal React deps (#14639)

brophdawg11 · web-flow · commit ff50507a7db5 · 2025-12-11T14:54:09.000-05:00
diff --git a/integration/helpers/cloudflare-dev-proxy-template/package.json b/integration/helpers/cloudflare-dev-proxy-template/package.json
@@ -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"
diff --git a/integration/helpers/rsc-vite-framework/package.json b/integration/helpers/rsc-vite-framework/package.json
@@ -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",
@@ -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"
   }
 }
diff --git a/integration/helpers/rsc-vite/package.json b/integration/helpers/rsc-vite/package.json
@@ -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"
@@ -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"
   }
 }
diff --git a/integration/helpers/vite-5-template/package.json b/integration/helpers/vite-5-template/package.json
@@ -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",
diff --git a/integration/helpers/vite-6-template/package.json b/integration/helpers/vite-6-template/package.json
@@ -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",
diff --git a/integration/helpers/vite-7-beta-template/package.json b/integration/helpers/vite-7-beta-template/package.json
@@ -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",
diff --git a/integration/helpers/vite-plugin-cloudflare-template/package.json b/integration/helpers/vite-plugin-cloudflare-template/package.json
@@ -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",
diff --git a/integration/helpers/vite-rolldown-template/package.json b/integration/helpers/vite-rolldown-template/package.json
@@ -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:",
diff --git a/integration/link-test.ts b/integration/link-test.ts
@@ -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",
           );
diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
@@ -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();
diff --git a/package.json b/package.json
@@ -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"
   },
@@ -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",
diff --git a/packages/create-react-router/package.json b/packages/create-react-router/package.json
@@ -26,6 +26,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "*.ts",
         "tsconfig.json",
         "package.json"
diff --git a/packages/react-router-architect/package.json b/packages/react-router-architect/package.json
@@ -39,6 +39,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "sessions/**",
         "*.ts",
         "tsconfig.json",
diff --git a/packages/react-router-cloudflare/package.json b/packages/react-router-cloudflare/package.json
@@ -34,6 +34,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "sessions/**",
         "*.ts",
         "tsconfig.json",
diff --git a/packages/react-router-dev/__tests__/fixtures/basic/package.json b/packages/react-router-dev/__tests__/fixtures/basic/package.json
@@ -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:"
   },
diff --git a/packages/react-router-dev/package.json b/packages/react-router-dev/package.json
@@ -52,6 +52,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "cli/**",
         "config/**",
         "module-sync-enabled/**",
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
@@ -48,6 +48,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "*.ts",
         "tsconfig.json",
         "package.json"
diff --git a/packages/react-router-express/package.json b/packages/react-router-express/package.json
@@ -39,6 +39,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "*.ts",
         "tsconfig.json",
         "package.json"
diff --git a/packages/react-router-fs-routes/package.json b/packages/react-router-fs-routes/package.json
@@ -28,6 +28,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "*.ts",
         "tsconfig.json",
         "package.json"
diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json
@@ -39,6 +39,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "sessions/**",
         "*.ts",
         "tsconfig.json",
diff --git a/packages/react-router-remix-routes-option-adapter/package.json b/packages/react-router-remix-routes-option-adapter/package.json
@@ -27,6 +27,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "*.ts",
         "tsconfig.json",
         "package.json"
diff --git a/packages/react-router-serve/package.json b/packages/react-router-serve/package.json
@@ -25,6 +25,7 @@
     "build": {
       "command": "tsup",
       "files": [
+        "../../pnpm-workspace.yaml",
         "*.ts",
         "bin.js",
         "tsconfig.json",
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
@@ -112,6 +112,7 @@
     "build": {
       "command": "premove dist && tsup && tsup --config tsup.config.rsc.ts",
       "files": [
+        "../../pnpm-workspace.yaml",
         "lib/**",
         "*.ts",
         "tsconfig.json",
diff --git a/playground/framework-express/package.json b/playground/framework-express/package.json
@@ -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",
diff --git a/playground/framework-rolldown-vite/package.json b/playground/framework-rolldown-vite/package.json
@@ -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"
diff --git a/playground/framework-spa/package.json b/playground/framework-spa/package.json
@@ -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"
diff --git a/playground/framework-vite-5/package.json b/playground/framework-vite-5/package.json
@@ -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"
diff --git a/playground/framework-vite-7-beta/package.json b/playground/framework-vite-7-beta/package.json
@@ -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"
diff --git a/playground/framework/package.json b/playground/framework/package.json
@@ -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"
diff --git a/playground/middleware/package.json b/playground/middleware/package.json
@@ -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",
diff --git a/playground/rsc-vite-framework/package.json b/playground/rsc-vite-framework/package.json
@@ -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",
@@ -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"
   }
 }
diff --git a/playground/rsc-vite/package.json b/playground/rsc-vite/package.json
@@ -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",
@@ -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"
   }
 }
diff --git a/playground/split-route-modules-spa/package.json b/playground/split-route-modules-spa/package.json
diff --git a/playground/split-route-modules/package.json b/playground/split-route-modules/package.json
diff --git a/playground/vite-plugin-cloudflare/package.json b/playground/vite-plugin-cloudflare/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
diff --git a/tutorials/address-book/package.json b/tutorials/address-book/package.json
