Upgrade to React 19 RC.

GitOrigin-RevId: 9b492c1c8afa079e8a069a415c1785c4ca96b3d5
tjamesmac · May 15, 2024 · 89a4693 · 89a4693
1 parent 978c02e
commit 89a4693
Show file tree

Hide file tree

Showing 12 changed files with 415 additions and 395 deletions.
diff --git a/ares/package.json b/ares/package.json
@@ -33,8 +33,8 @@
     "@stripe/stripe-js": "^3.4.0",
     "fbt": "^1.0.2",
     "framer-motion": "^11.2.0",
-    "react": "19.0.0-canary-fd0da3eef-20240404",
-    "react-dom": "19.0.0-canary-fd0da3eef-20240404",
+    "react": "19.0.0-rc-915b914b3a-20240515",
+    "react-dom": "19.0.0-rc-915b914b3a-20240515",
     "react-error-boundary": "^4.0.13",
     "react-relay": "^16.2.0",
     "react-router-dom": "^6.23.1",

diff --git a/deimos/package.json b/deimos/package.json
@@ -20,8 +20,8 @@
     "array-shuffle": "^3.0.0",
     "fbt": "^1.0.2",
     "framer-motion": "^11.2.0",
-    "react": "19.0.0-canary-fd0da3eef-20240404",
-    "react-dom": "19.0.0-canary-fd0da3eef-20240404",
+    "react": "19.0.0-rc-915b914b3a-20240515",
+    "react-dom": "19.0.0-rc-915b914b3a-20240515",
     "react-error-boundary": "^4.0.13"
   },
   "devDependencies": {

diff --git a/docs/package.json b/docs/package.json
@@ -28,8 +28,8 @@
     "fbt": "^1.0.2",
     "framer-motion": "^11.2.0",
     "licht-theme": "^1.7.1",
-    "react": "19.0.0-canary-fd0da3eef-20240404",
-    "react-dom": "19.0.0-canary-fd0da3eef-20240404",
+    "react": "19.0.0-rc-915b914b3a-20240515",
+    "react-dom": "19.0.0-rc-915b914b3a-20240515",
     "vocs": "1.0.0-alpha.52"
   }
 }
diff --git a/docs/vocs.config.tsx b/docs/vocs.config.tsx
@@ -3,7 +3,7 @@ import babelPluginEmotion from '@emotion/babel-plugin';
 import react from '@vitejs/plugin-react';
 import React from 'react';
 import { defineConfig } from 'vocs';
-import babelFbtPlugins from '../infra/babelFbtPlugins.tsx';
+import babelPlugins from '../infra/babelPlugins.tsx';
 import resolver from '../infra/resolver.tsx';
 
 const Licht = JSON.parse(
@@ -148,7 +148,7 @@ export default defineConfig({
     plugins: [
       react({
         babel: {
-          plugins: [...babelFbtPlugins, babelPluginEmotion],
+          plugins: [...babelPlugins, babelPluginEmotion],
         },
       }),
     ],

diff --git a/hera/package.json b/hera/package.json
@@ -25,8 +25,8 @@
     "array-shuffle": "^3.0.0",
     "fbt": "^1.0.2",
     "framer-motion": "^11.2.0",
-    "react": "19.0.0-canary-fd0da3eef-20240404",
-    "react-dom": "19.0.0-canary-fd0da3eef-20240404",
+    "react": "19.0.0-rc-915b914b3a-20240515",
+    "react-dom": "19.0.0-rc-915b914b3a-20240515",
     "react-fps": "^1.0.6"
   },
   "devDependencies": {

diff --git a/infra/babelFbtPlugins.tsx → infra/babelPlugins.tsx b/infra/babelFbtPlugins.tsx → infra/babelPlugins.tsx
@@ -10,7 +10,7 @@ const enumManifest = (() => {
     return require('../ares/.enum_manifest.json');
   } catch {
     if (!isOpenSource()) {
-      throw new Error('babelFbtPlugins: Missing enum manifest.');
+      throw new Error('babelPlugins: Missing enum manifest.');
     }
   }
   return {};

diff --git a/package.json b/package.json
@@ -103,6 +103,7 @@
       ]
     },
     "overrides": {
+      "react@^18.0.0": "19.0.0-rc-915b914b3a-20240515",
       "rollup@^2.0.0": "^4.16.4"
     },
     "patchedDependencies": {

diff --git a/patches/[email protected] b/patches/[email protected]
@@ -1,5 +1,31 @@
+diff --git a/dist/fbt.js b/dist/fbt.js
+index 271853b2299af4bb36869c100a9b374de0157571..87bd30760621336790bab2d7de61cd915e6c6d61 100644
+--- a/dist/fbt.js
++++ b/dist/fbt.js
+@@ -487,7 +487,7 @@ module.exports = FbtQTOverrides;
+  * @noformat
+  * @nogrep
+  */
+-var REACT_ELEMENT_TYPE = typeof Symbol === 'function' && Symbol["for"] && Symbol["for"]('react.element') || 0xeac7;
++var REACT_ELEMENT_TYPE = typeof Symbol === 'function' && Symbol["for"] && Symbol["for"]('react.transitional.element') || 0xeac7;
+ var canDefineProperty = false;
+
+ if (true) {
+diff --git a/lib/FbtReactUtil.js b/lib/FbtReactUtil.js
+index becb60e893478abf6b5edf1baa176c69b009d33f..74eb840877e41b28b90c9e7785621f4534f3bb1a 100644
+--- a/lib/FbtReactUtil.js
++++ b/lib/FbtReactUtil.js
+@@ -16,7 +16,7 @@
+  * @noformat
+  * @nogrep
+  */
+-var REACT_ELEMENT_TYPE = typeof Symbol === 'function' && Symbol["for"] && Symbol["for"]('react.element') || 0xeac7;
++var REACT_ELEMENT_TYPE = typeof Symbol === 'function' && Symbol["for"] && Symbol["for"]('react.transitional.element') || 0xeac7;
+ var canDefineProperty = false;
+
+ if (process.env.NODE_ENV !== "production") {
 diff --git a/lib/substituteTokens.js b/lib/substituteTokens.js
-index 144db1d6553417bb9ec67f537c40c0c4cc4f0067..c90d1c5631b56a6e5ce4cd5af287b4447a55b98b 100644
+index 144db1d6553417bb9ec67f537c40c0c4cc4f0067..95e6cca7bb4e87598c467420ce81d6a6d29536cf 100644
 --- a/lib/substituteTokens.js
 +++ b/lib/substituteTokens.js
 @@ -66,12 +66,6 @@ function substituteTokens(template, args, errorListener) {