Skip to content

Commit adfcd87

Browse files
committed
merging is hard
1 parent 5829f0b commit adfcd87

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

packages/react-client/src/ReactFlightClient.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import {
3737

3838
import {useContext, useMemo, createContext} from 'react';
3939

40+
import {getOrCreateServerContext} from 'shared/ReactServerContextRegistry';
41+
4042
export type JSONValue =
4143
| number
4244
| null

packages/react-reconciler/src/ReactInternalTypes.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ export type HookType =
5050

5151
export type ContextDependency<T> = {
5252
context: ReactContext<T>,
53-
next: ContextDependency<T> | null,
53+
next: ContextDependency<mixed> | null,
5454
memoizedValue: T,
5555
...
5656
};
5757

5858
export type Dependencies = {
5959
lanes: Lanes,
60-
firstContext: ContextDependency<any> | null,
60+
firstContext: ContextDependency<mixed> | null,
6161
...
6262
};
6363

packages/react/index.stable.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export {
2222
createElement,
2323
createFactory,
2424
createRef,
25-
createServerContext,
2625
forwardRef,
2726
isValidElement,
2827
lazy,

packages/shared/ReactTypes.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ export type ReactProviderType<T> = {
4242
...
4343
};
4444

45-
export type ReactServerProviderType<T: ServerContextJSONValue> = {
46-
$$typeof: Symbol | number,
47-
_context: ReactServerContext<T>,
48-
...
49-
};
50-
5145
export type ReactConsumer<T> = {
5246
$$typeof: Symbol | number,
5347
type: ReactContext<T>,

0 commit comments

Comments
 (0)