Skip to content

Commit 492aa81

Browse files
sebmarkbagesebmarkbage
committed
Disable ServerContext in canary (#27474)
We previously added a warning in #27424. This just removes it from canary/stable channels but keeps it in experimental for now. DiffTrain build for commit 1fc5828.
1 parent 35acb58 commit 492aa81

File tree

15 files changed

+56
-333
lines changed

15 files changed

+56
-333
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<97bac0ab36e9567435451d873bea4dcf>>
10+
* @generated SignedSource<<714756724eaa1bcdef36d80f02d51c1a>>
1111
*/
1212

1313
'use strict';
@@ -201,9 +201,6 @@ var REACT_OFFSCREEN_TYPE = Symbol.for("react.offscreen");
201201
var REACT_LEGACY_HIDDEN_TYPE = Symbol.for("react.legacy_hidden");
202202
var REACT_CACHE_TYPE = Symbol.for("react.cache");
203203
var REACT_TRACING_MARKER_TYPE = Symbol.for("react.tracing_marker");
204-
var REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED = Symbol.for(
205-
"react.default_value"
206-
);
207204
var MAYBE_ITERATOR_SYMBOL = Symbol.iterator;
208205
var FAUX_ITERATOR_SYMBOL = "@@iterator";
209206
function getIteratorFn(maybeIterable) {
@@ -319,11 +316,6 @@ function getComponentNameFromType(type) {
319316
return null;
320317
}
321318
}
322-
323-
case REACT_SERVER_CONTEXT_TYPE: {
324-
var context2 = type;
325-
return (context2.displayName || context2._globalName) + ".Provider";
326-
}
327319
}
328320
}
329321

@@ -15332,9 +15324,7 @@ function popProvider(context, providerFiber) {
1533215324
var currentValue = valueCursor.current;
1533315325

1533415326
{
15335-
if (currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED) {
15336-
context._currentValue2 = context._defaultValue;
15337-
} else {
15327+
{
1533815328
context._currentValue2 = currentValue;
1533915329
}
1534015330

@@ -24780,7 +24770,7 @@ function createFiberRoot(
2478024770
return root;
2478124771
}
2478224772

24783-
var ReactVersion = "18.3.0-canary-537228f9f-20231010";
24773+
var ReactVersion = "18.3.0-canary-1fc58281a-20231011";
2478424774

2478524775
// Might add PROFILE later.
2478624776

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<74789ed84a7dc01a6249e9f3418afe20>>
10+
* @generated SignedSource<<fb94d4d2ffdeb0cf3ea79a5a45198f2a>>
1111
*/
1212

1313
"use strict";
@@ -50,10 +50,7 @@ var REACT_OFFSCREEN_TYPE = Symbol.for("react.offscreen"),
5050
REACT_LEGACY_HIDDEN_TYPE = Symbol.for("react.legacy_hidden"),
5151
REACT_CACHE_TYPE = Symbol.for("react.cache");
5252
Symbol.for("react.tracing_marker");
53-
var REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED = Symbol.for(
54-
"react.default_value"
55-
),
56-
MAYBE_ITERATOR_SYMBOL = Symbol.iterator;
53+
var MAYBE_ITERATOR_SYMBOL = Symbol.iterator;
5754
function getIteratorFn(maybeIterable) {
5855
if (null === maybeIterable || "object" !== typeof maybeIterable) return null;
5956
maybeIterable =
@@ -106,11 +103,7 @@ function getComponentNameFromType(type) {
106103
type = type._init;
107104
try {
108105
return getComponentNameFromType(type(innerType));
109-
} catch (x) {
110-
break;
111-
}
112-
case REACT_SERVER_CONTEXT_TYPE:
113-
return (type.displayName || type._globalName) + ".Provider";
106+
} catch (x) {}
114107
}
115108
return null;
116109
}
@@ -4646,11 +4639,7 @@ function pushProvider(providerFiber, context, nextValue) {
46464639
context._currentValue2 = nextValue;
46474640
}
46484641
function popProvider(context) {
4649-
var currentValue = valueCursor.current;
4650-
context._currentValue2 =
4651-
currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
4652-
? context._defaultValue
4653-
: currentValue;
4642+
context._currentValue2 = valueCursor.current;
46544643
pop(valueCursor);
46554644
}
46564645
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
@@ -8979,7 +8968,7 @@ var devToolsConfig$jscomp$inline_1008 = {
89798968
throw Error("TestRenderer does not support findFiberByHostInstance()");
89808969
},
89818970
bundleType: 0,
8982-
version: "18.3.0-canary-537228f9f-20231010",
8971+
version: "18.3.0-canary-1fc58281a-20231011",
89838972
rendererPackageName: "react-test-renderer"
89848973
};
89858974
var internals$jscomp$inline_1201 = {
@@ -9010,7 +8999,7 @@ var internals$jscomp$inline_1201 = {
90108999
scheduleRoot: null,
90119000
setRefreshHandler: null,
90129001
getCurrentFiber: null,
9013-
reconcilerVersion: "18.3.0-canary-537228f9f-20231010"
9002+
reconcilerVersion: "18.3.0-canary-1fc58281a-20231011"
90149003
};
90159004
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
90169005
var hook$jscomp$inline_1202 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<82a7b6543c19ebb61157ecb409194495>>
10+
* @generated SignedSource<<f9f817a0cad8e4e654f55fa0ed9eb33e>>
1111
*/
1212

1313
"use strict";
@@ -50,10 +50,7 @@ var REACT_OFFSCREEN_TYPE = Symbol.for("react.offscreen"),
5050
REACT_LEGACY_HIDDEN_TYPE = Symbol.for("react.legacy_hidden"),
5151
REACT_CACHE_TYPE = Symbol.for("react.cache");
5252
Symbol.for("react.tracing_marker");
53-
var REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED = Symbol.for(
54-
"react.default_value"
55-
),
56-
MAYBE_ITERATOR_SYMBOL = Symbol.iterator;
53+
var MAYBE_ITERATOR_SYMBOL = Symbol.iterator;
5754
function getIteratorFn(maybeIterable) {
5855
if (null === maybeIterable || "object" !== typeof maybeIterable) return null;
5956
maybeIterable =
@@ -106,11 +103,7 @@ function getComponentNameFromType(type) {
106103
type = type._init;
107104
try {
108105
return getComponentNameFromType(type(innerType));
109-
} catch (x) {
110-
break;
111-
}
112-
case REACT_SERVER_CONTEXT_TYPE:
113-
return (type.displayName || type._globalName) + ".Provider";
106+
} catch (x) {}
114107
}
115108
return null;
116109
}
@@ -4750,11 +4743,7 @@ function pushProvider(providerFiber, context, nextValue) {
47504743
context._currentValue2 = nextValue;
47514744
}
47524745
function popProvider(context) {
4753-
var currentValue = valueCursor.current;
4754-
context._currentValue2 =
4755-
currentValue === REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED
4756-
? context._defaultValue
4757-
: currentValue;
4746+
context._currentValue2 = valueCursor.current;
47584747
pop(valueCursor);
47594748
}
47604749
function scheduleContextWorkOnParentPath(parent, renderLanes, propagationRoot) {
@@ -9405,7 +9394,7 @@ var devToolsConfig$jscomp$inline_1050 = {
94059394
throw Error("TestRenderer does not support findFiberByHostInstance()");
94069395
},
94079396
bundleType: 0,
9408-
version: "18.3.0-canary-537228f9f-20231010",
9397+
version: "18.3.0-canary-1fc58281a-20231011",
94099398
rendererPackageName: "react-test-renderer"
94109399
};
94119400
var internals$jscomp$inline_1242 = {
@@ -9436,7 +9425,7 @@ var internals$jscomp$inline_1242 = {
94369425
scheduleRoot: null,
94379426
setRefreshHandler: null,
94389427
getCurrentFiber: null,
9439-
reconcilerVersion: "18.3.0-canary-537228f9f-20231010"
9428+
reconcilerVersion: "18.3.0-canary-1fc58281a-20231011"
94409429
};
94419430
if ("undefined" !== typeof __REACT_DEVTOOLS_GLOBAL_HOOK__) {
94429431
var hook$jscomp$inline_1243 = __REACT_DEVTOOLS_GLOBAL_HOOK__;

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<26475298aa34ad2cd59665f1ded7480c>>
10+
* @generated SignedSource<<d07d0c4418febbfa3a7af950bf5a35a9>>
1111
*/
1212

1313
'use strict';
@@ -29,7 +29,6 @@ var REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode");
2929
var REACT_PROFILER_TYPE = Symbol.for("react.profiler");
3030
var REACT_PROVIDER_TYPE = Symbol.for("react.provider");
3131
var REACT_CONTEXT_TYPE = Symbol.for("react.context");
32-
var REACT_SERVER_CONTEXT_TYPE = Symbol.for("react.server_context");
3332
var REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref");
3433
var REACT_SUSPENSE_TYPE = Symbol.for("react.suspense");
3534
var REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list");
@@ -241,11 +240,6 @@ function getComponentNameFromType(type) {
241240
return null;
242241
}
243242
}
244-
245-
case REACT_SERVER_CONTEXT_TYPE: {
246-
var context2 = type;
247-
return (context2.displayName || context2._globalName) + ".Provider";
248-
}
249243
}
250244
}
251245

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @noflow
88
* @nolint
99
* @preventMunge
10-
* @generated SignedSource<<e2ceb6464d362e2cf22c09a1b8c1771b>>
10+
* @generated SignedSource<<80f486069e03d14e203b127506953943>>
1111
*/
1212

1313
'use strict';
@@ -29,7 +29,6 @@ var REACT_STRICT_MODE_TYPE = Symbol.for("react.strict_mode");
2929
var REACT_PROFILER_TYPE = Symbol.for("react.profiler");
3030
var REACT_PROVIDER_TYPE = Symbol.for("react.provider");
3131
var REACT_CONTEXT_TYPE = Symbol.for("react.context");
32-
var REACT_SERVER_CONTEXT_TYPE = Symbol.for("react.server_context");
3332
var REACT_FORWARD_REF_TYPE = Symbol.for("react.forward_ref");
3433
var REACT_SUSPENSE_TYPE = Symbol.for("react.suspense");
3534
var REACT_SUSPENSE_LIST_TYPE = Symbol.for("react.suspense_list");
@@ -241,11 +240,6 @@ function getComponentNameFromType(type) {
241240
return null;
242241
}
243242
}
244-
245-
case REACT_SERVER_CONTEXT_TYPE: {
246-
var context2 = type;
247-
return (context2.displayName || context2._globalName) + ".Provider";
248-
}
249243
}
250244
}
251245

0 commit comments

Comments
 (0)