Skip to content

Commit 6f13243

Browse files
authored
Move ReactCurrentDispatcher back to shared internals (facebook#27462)
The jsx-runtime uses the ReactCurrentDispatcher from shared internals. Recently this was moved to ReactServerSharedInternals which broke jsx-runtime. This change moves it back to ReactSharedInternals until we can come up with a new forking mechanism.
1 parent ca237d6 commit 6f13243

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

packages/react-server/src/ReactFlightServer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ import {
108108
} from 'shared/ReactSerializationErrors';
109109

110110
import {getOrCreateServerContext} from 'shared/ReactServerContextRegistry';
111+
import ReactSharedInternals from 'shared/ReactSharedInternals';
111112
import ReactServerSharedInternals from './ReactServerSharedInternals';
112113
import isArray from 'shared/isArray';
113114
import binaryToComparableString from 'shared/binaryToComparableString';
@@ -209,9 +210,9 @@ const {
209210
TaintRegistryValues,
210211
TaintRegistryByteLengths,
211212
TaintRegistryPendingRequests,
212-
ReactCurrentDispatcher,
213213
ReactCurrentCache,
214214
} = ReactServerSharedInternals;
215+
const ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;
215216

216217
function throwTaintViolation(message: string) {
217218
// eslint-disable-next-line react-internal/prod-error-codes

packages/react/src/ReactServerSharedInternals.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
import ReactCurrentDispatcher from './ReactCurrentDispatcher';
98
import ReactCurrentCache from './ReactCurrentCache';
109
import {
1110
TaintRegistryObjects,
@@ -17,7 +16,6 @@ import {
1716
import {enableTaint} from 'shared/ReactFeatureFlags';
1817

1918
const ReactServerSharedInternals = {
20-
ReactCurrentDispatcher,
2119
ReactCurrentCache,
2220
};
2321

packages/react/src/ReactSharedInternalsServer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
import ReactCurrentDispatcher from './ReactCurrentDispatcher';
89
import ReactCurrentOwner from './ReactCurrentOwner';
910
import ReactDebugCurrentFrame from './ReactDebugCurrentFrame';
1011
import {enableServerContext} from 'shared/ReactFeatureFlags';
1112
import {ContextRegistry} from './ReactServerContextRegistry';
1213

1314
const ReactSharedInternals = {
15+
ReactCurrentDispatcher,
1416
ReactCurrentOwner,
1517
};
1618

0 commit comments

Comments
 (0)