Merge branch 'main' into rh/test-event-listener-2

facebook · Feb 6, 2024 · 137a093 · 137a093
2 parents 6b73d5d + 952aa74
commit 137a093
Show file tree

Hide file tree

Showing 68 changed files with 540 additions and 1,572 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -3,7 +3,6 @@
 module.exports = {
   plugins: [
     '@babel/plugin-syntax-jsx',
-    '@babel/plugin-transform-react-jsx',
     '@babel/plugin-transform-flow-strip-types',
     ['@babel/plugin-proposal-class-properties', {loose: true}],
     'syntax-trailing-function-commas',

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-meta": "^7.10.4",
-    "@babel/plugin-syntax-jsx": "^7.10.4",
+    "@babel/plugin-syntax-jsx": "^7.23.3",
     "@babel/plugin-syntax-typescript": "^7.14.5",
     "@babel/plugin-transform-arrow-functions": "^7.10.4",
     "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
@@ -27,12 +27,13 @@
     "@babel/plugin-transform-modules-commonjs": "^7.10.4",
     "@babel/plugin-transform-object-super": "^7.10.4",
     "@babel/plugin-transform-parameters": "^7.10.5",
-    "@babel/plugin-transform-react-jsx-source": "^7.10.5",
+    "@babel/plugin-transform-react-jsx": "^7.23.4",
+    "@babel/plugin-transform-react-jsx-development": "^7.22.5",
     "@babel/plugin-transform-shorthand-properties": "^7.10.4",
     "@babel/plugin-transform-spread": "^7.11.0",
     "@babel/plugin-transform-template-literals": "^7.10.5",
     "@babel/preset-flow": "^7.10.4",
-    "@babel/preset-react": "^7.10.4",
+    "@babel/preset-react": "^7.23.3",
     "@babel/traverse": "^7.11.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^24.0.1",

diff --git a/packages/react-client/src/ReactFlightClient.js b/packages/react-client/src/ReactFlightClient.js
@@ -48,8 +48,6 @@ import {
   REACT_POSTPONE_TYPE,
 } from 'shared/ReactSymbols';
 
-import {getOrCreateServerContext} from 'shared/ReactServerContextRegistry';
-
 export type {CallServerCallback};
 
 type UninitializedModel = string;
@@ -634,10 +632,6 @@ function parseModelString(
         // Symbol
         return Symbol.for(value.slice(2));
       }
-      case 'P': {
-        // Server Context Provider
-        return getOrCreateServerContext(value.slice(2)).Provider;
-      }
       case 'F': {
         // Server Reference
         const id = parseInt(value.slice(2), 16);