Skip to content

Commit 65aa775

Browse files
committed
Enforce that the "react-server" build of "react" is used (#27436)
I do this by simply renaming the secret export name in the "subset" bundle and this renamed version is what the FlightServer uses. This requires us to be more diligent about always using the correct instance of "react" in our tests so there's a bunch of clean up for that. DiffTrain build for commit c7ba8c0.
1 parent a49e06d commit 65aa775

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23997,7 +23997,7 @@ function createFiberRoot(
2399723997
return root;
2399823998
}
2399923999

24000-
var ReactVersion = "18.3.0-canary-d900fadbf-20230929";
24000+
var ReactVersion = "18.3.0-canary-c7ba8c098-20230929";
2400124001

2400224002
// Might add PROFILE later.
2400324003

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-prod.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8623,7 +8623,7 @@ var devToolsConfig$jscomp$inline_1030 = {
86238623
throw Error("TestRenderer does not support findFiberByHostInstance()");
86248624
},
86258625
bundleType: 0,
8626-
version: "18.3.0-canary-d900fadbf-20230929",
8626+
version: "18.3.0-canary-c7ba8c098-20230929",
86278627
rendererPackageName: "react-test-renderer"
86288628
};
86298629
var internals$jscomp$inline_1229 = {
@@ -8654,7 +8654,7 @@ var internals$jscomp$inline_1229 = {
86548654
scheduleRoot: null,
86558655
setRefreshHandler: null,
86568656
getCurrentFiber: null,
8657-
reconcilerVersion: "18.3.0-canary-d900fadbf-20230929"
8657+
reconcilerVersion: "18.3.0-canary-c7ba8c098-20230929"
86588658
};
86598659
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
86608660
var hook$jscomp$inline_1230 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react-test-renderer/cjs/ReactTestRenderer-profiling.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9049,7 +9049,7 @@ var devToolsConfig$jscomp$inline_1072 = {
90499049
throw Error("TestRenderer does not support findFiberByHostInstance()");
90509050
},
90519051
bundleType: 0,
9052-
version: "18.3.0-canary-d900fadbf-20230929",
9052+
version: "18.3.0-canary-c7ba8c098-20230929",
90539053
rendererPackageName: "react-test-renderer"
90549054
};
90559055
var internals$jscomp$inline_1270 = {
@@ -9080,7 +9080,7 @@ var internals$jscomp$inline_1270 = {
90809080
scheduleRoot: null,
90819081
setRefreshHandler: null,
90829082
getCurrentFiber: null,
9083-
reconcilerVersion: "18.3.0-canary-d900fadbf-20230929"
9083+
reconcilerVersion: "18.3.0-canary-c7ba8c098-20230929"
90849084
};
90859085
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
90869086
var hook$jscomp$inline_1271 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-dev.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<8e6aba2a8a22d8a171df886dcebe4930>>
10+
* @generated SignedSource<<e3459cf1c934729db6159301ee96abb3>>
1111
*/
1212

1313
'use strict';
@@ -27,7 +27,7 @@ if (
2727
}
2828
"use strict";
2929

30-
var ReactVersion = "18.3.0-canary-d900fadbf-20230929";
30+
var ReactVersion = "18.3.0-canary-c7ba8c098-20230929";
3131

3232
// ATTENTION
3333
// When adding new symbols to this file,
@@ -159,7 +159,7 @@ var enableDebugTracing = false;
159159
var enableScopeAPI = false;
160160
var enableTransitionTracing = false;
161161

162-
var ContextRegistry$1 = {};
162+
var ContextRegistry = {};
163163

164164
var ReactSharedInternals = {
165165
ReactCurrentDispatcher: ReactCurrentDispatcher,
@@ -174,7 +174,7 @@ var ReactSharedInternals = {
174174
}
175175

176176
{
177-
ReactSharedInternals.ContextRegistry = ContextRegistry$1;
177+
ReactSharedInternals.ContextRegistry = ContextRegistry;
178178
}
179179

180180
// by calls to these methods by a Babel plugin.
@@ -2704,7 +2704,6 @@ function cloneElementWithValidation(element, props, children) {
27042704
return newElement;
27052705
}
27062706

2707-
var ContextRegistry = ReactSharedInternals.ContextRegistry;
27082707
function createServerContext(globalName, defaultValue) {
27092708
{
27102709
error(

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-prod.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<baa752d40dc19ca131b74496ee679c02>>
10+
* @generated SignedSource<<22271ab359f8fb6e33230ec4e7180433>>
1111
*/
1212

1313
"use strict";
@@ -282,14 +282,14 @@ function createCacheNode() {
282282
}
283283
var ReactCurrentDispatcher = { current: null },
284284
ReactCurrentBatchConfig = { transition: null },
285+
ContextRegistry = {},
285286
ReactSharedInternals = {
286287
ReactCurrentDispatcher: ReactCurrentDispatcher,
287288
ReactCurrentCache: ReactCurrentCache,
288289
ReactCurrentBatchConfig: ReactCurrentBatchConfig,
289290
ReactCurrentOwner: ReactCurrentOwner$1,
290-
ContextRegistry: {}
291+
ContextRegistry: ContextRegistry
291292
},
292-
ContextRegistry = ReactSharedInternals.ContextRegistry,
293293
ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner,
294294
RESERVED_PROPS = { key: !0, ref: !0, __self: !0, __source: !0 };
295295
function jsx$1(type, config, maybeKey) {
@@ -616,4 +616,4 @@ exports.useSyncExternalStore = function (
616616
exports.useTransition = function () {
617617
return ReactCurrentDispatcher.current.useTransition();
618618
};
619-
exports.version = "18.3.0-canary-d900fadbf-20230929";
619+
exports.version = "18.3.0-canary-c7ba8c098-20230929";

compiled-rn/facebook-fbsource/xplat/js/RKJSModules/vendor/react/cjs/React-profiling.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<fc291aa88e57315493fc94dd7aab82be>>
10+
* @generated SignedSource<<c82cbcaf7bd2b54bba5420820659796c>>
1111
*/
1212

1313

@@ -260,14 +260,14 @@ function createCacheNode() {
260260
}
261261
var ReactCurrentDispatcher = { current: null },
262262
ReactCurrentBatchConfig = { transition: null },
263+
ContextRegistry = {},
263264
ReactSharedInternals = {
264265
ReactCurrentDispatcher: ReactCurrentDispatcher,
265266
ReactCurrentCache: ReactCurrentCache,
266267
ReactCurrentBatchConfig: ReactCurrentBatchConfig,
267268
ReactCurrentOwner: ReactCurrentOwner$1,
268-
ContextRegistry: {}
269+
ContextRegistry: ContextRegistry
269270
},
270-
ContextRegistry = ReactSharedInternals.ContextRegistry,
271271
ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner,
272272
RESERVED_PROPS = { key: !0, ref: !0, __self: !0, __source: !0 };
273273
function jsx$1(type, config, maybeKey) {
@@ -619,7 +619,7 @@ exports.useSyncExternalStore = function (
619619
exports.useTransition = function () {
620620
return ReactCurrentDispatcher.current.useTransition();
621621
};
622-
exports.version = "18.3.0-canary-d900fadbf-20230929";
622+
exports.version = "18.3.0-canary-c7ba8c098-20230929";
623623

624624
/* global __REACT_DEVTOOLS_GLOBAL_HOOK__ */
625625
if (
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d900fadbf9017063fecb2641b7e99303b82a6f17
1+
c7ba8c098889b6dc47fa9c807bbba3975a658584

0 commit comments

Comments
 (0)