Skip to content

Commit a69b80d

Browse files
potetopoteto
authored
[crud] Remove useResourceEffect (#32206)
Removes useResourceEffect. --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/facebook/react/pull/32206). * __->__ #32206 * #32205
1 parent 2c5fd26 commit a69b80d

File tree

9 files changed

+1
-227
lines changed

9 files changed

+1
-227
lines changed

‎packages/react-debug-tools/src/ReactDebugHooks.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ function getPrimitiveStackCache(): Map<string, Array<any>> {
128128

129129
Dispatcher.useId();
130130

131-
if (typeof Dispatcher.useResourceEffect === 'function') {
132-
Dispatcher.useResourceEffect(() => ({}), []);
133-
}
134131
if (typeof Dispatcher.useEffectEvent === 'function') {
135132
Dispatcher.useEffectEvent((args: empty) => {});
136133
}
@@ -741,24 +738,6 @@ function useHostTransitionStatus(): TransitionStatus {
741738
return status;
742739
}
743740

744-
function useResourceEffect(
745-
create: () => {...} | void | null,
746-
createDeps: Array<mixed> | void | null,
747-
update: ((resource: {...} | void | null) => void) | void,
748-
updateDeps: Array<mixed> | void | null,
749-
destroy: ((resource: {...} | void | null) => void) | void,
750-
) {
751-
nextHook();
752-
hookLog.push({
753-
displayName: null,
754-
primitive: 'ResourceEffect',
755-
stackError: new Error(),
756-
value: create,
757-
debugInfo: null,
758-
dispatcherHookName: 'ResourceEffect',
759-
});
760-
}
761-
762741
function useEffectEvent<Args, F: (...Array<Args>) => mixed>(callback: F): F {
763742
nextHook();
764743
hookLog.push({
@@ -798,7 +777,6 @@ const Dispatcher: DispatcherType = {
798777
useActionState,
799778
useHostTransitionStatus,
800779
useEffectEvent,
801-
useResourceEffect,
802780
};
803781

804782
// create a proxy to throw a custom error

‎packages/react-reconciler/src/ReactFiberHooks.js

Lines changed: 0 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -3989,9 +3989,6 @@ export const ContextOnlyDispatcher: Dispatcher = {
39893989
if (enableUseEffectEventHook) {
39903990
(ContextOnlyDispatcher: Dispatcher).useEffectEvent = throwInvalidHookError;
39913991
}
3992-
if (enableUseEffectCRUDOverload) {
3993-
(ContextOnlyDispatcher: Dispatcher).useResourceEffect = throwInvalidHookError;
3994-
}
39953992

39963993
const HooksDispatcherOnMount: Dispatcher = {
39973994
readContext,
@@ -4022,9 +4019,6 @@ const HooksDispatcherOnMount: Dispatcher = {
40224019
if (enableUseEffectEventHook) {
40234020
(HooksDispatcherOnMount: Dispatcher).useEffectEvent = mountEvent;
40244021
}
4025-
if (enableUseEffectCRUDOverload) {
4026-
(HooksDispatcherOnMount: Dispatcher).useResourceEffect = mountResourceEffect;
4027-
}
40284022

40294023
const HooksDispatcherOnUpdate: Dispatcher = {
40304024
readContext,
@@ -4055,10 +4049,6 @@ const HooksDispatcherOnUpdate: Dispatcher = {
40554049
if (enableUseEffectEventHook) {
40564050
(HooksDispatcherOnUpdate: Dispatcher).useEffectEvent = updateEvent;
40574051
}
4058-
if (enableUseEffectCRUDOverload) {
4059-
(HooksDispatcherOnUpdate: Dispatcher).useResourceEffect =
4060-
updateResourceEffect;
4061-
}
40624052

40634053
const HooksDispatcherOnRerender: Dispatcher = {
40644054
readContext,
@@ -4089,10 +4079,6 @@ const HooksDispatcherOnRerender: Dispatcher = {
40894079
if (enableUseEffectEventHook) {
40904080
(HooksDispatcherOnRerender: Dispatcher).useEffectEvent = updateEvent;
40914081
}
4092-
if (enableUseEffectCRUDOverload) {
4093-
(HooksDispatcherOnRerender: Dispatcher).useResourceEffect =
4094-
updateResourceEffect;
4095-
}
40964082

40974083
let HooksDispatcherOnMountInDEV: Dispatcher | null = null;
40984084
let HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher | null = null;
@@ -4310,27 +4296,6 @@ if (__DEV__) {
43104296
return mountEvent(callback);
43114297
};
43124298
}
4313-
if (enableUseEffectCRUDOverload) {
4314-
(HooksDispatcherOnMountInDEV: Dispatcher).useResourceEffect =
4315-
function useResourceEffect(
4316-
create: () => {...} | void | null,
4317-
createDeps: Array<mixed> | void | null,
4318-
update: ((resource: {...} | void | null) => void) | void,
4319-
updateDeps: Array<mixed> | void | null,
4320-
destroy: ((resource: {...} | void | null) => void) | void,
4321-
): void {
4322-
currentHookNameInDev = 'useResourceEffect';
4323-
mountHookTypesDev();
4324-
checkDepsAreNonEmptyArrayDev(updateDeps);
4325-
return mountResourceEffect(
4326-
create,
4327-
createDeps,
4328-
update,
4329-
updateDeps,
4330-
destroy,
4331-
);
4332-
};
4333-
}
43344299

43354300
HooksDispatcherOnMountWithHookTypesInDEV = {
43364301
readContext<T>(context: ReactContext<T>): T {
@@ -4514,26 +4479,6 @@ if (__DEV__) {
45144479
return mountEvent(callback);
45154480
};
45164481
}
4517-
if (enableUseEffectCRUDOverload) {
4518-
(HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useResourceEffect =
4519-
function useResourceEffect(
4520-
create: () => {...} | void | null,
4521-
createDeps: Array<mixed> | void | null,
4522-
update: ((resource: {...} | void | null) => void) | void,
4523-
updateDeps: Array<mixed> | void | null,
4524-
destroy: ((resource: {...} | void | null) => void) | void,
4525-
): void {
4526-
currentHookNameInDev = 'useResourceEffect';
4527-
updateHookTypesDev();
4528-
return mountResourceEffect(
4529-
create,
4530-
createDeps,
4531-
update,
4532-
updateDeps,
4533-
destroy,
4534-
);
4535-
};
4536-
}
45374482

45384483
HooksDispatcherOnUpdateInDEV = {
45394484
readContext<T>(context: ReactContext<T>): T {
@@ -4717,26 +4662,6 @@ if (__DEV__) {
47174662
return updateEvent(callback);
47184663
};
47194664
}
4720-
if (enableUseEffectCRUDOverload) {
4721-
(HooksDispatcherOnUpdateInDEV: Dispatcher).useResourceEffect =
4722-
function useResourceEffect(
4723-
create: () => {...} | void | null,
4724-
createDeps: Array<mixed> | void | null,
4725-
update: ((resource: {...} | void | null) => void) | void,
4726-
updateDeps: Array<mixed> | void | null,
4727-
destroy: ((resource: {...} | void | null) => void) | void,
4728-
) {
4729-
currentHookNameInDev = 'useResourceEffect';
4730-
updateHookTypesDev();
4731-
return updateResourceEffect(
4732-
create,
4733-
createDeps,
4734-
update,
4735-
updateDeps,
4736-
destroy,
4737-
);
4738-
};
4739-
}
47404665

47414666
HooksDispatcherOnRerenderInDEV = {
47424667
readContext<T>(context: ReactContext<T>): T {
@@ -4920,26 +4845,6 @@ if (__DEV__) {
49204845
return updateEvent(callback);
49214846
};
49224847
}
4923-
if (enableUseEffectCRUDOverload) {
4924-
(HooksDispatcherOnRerenderInDEV: Dispatcher).useResourceEffect =
4925-
function useResourceEffect(
4926-
create: () => {...} | void | null,
4927-
createDeps: Array<mixed> | void | null,
4928-
update: ((resource: {...} | void | null) => void) | void,
4929-
updateDeps: Array<mixed> | void | null,
4930-
destroy: ((resource: {...} | void | null) => void) | void,
4931-
) {
4932-
currentHookNameInDev = 'useResourceEffect';
4933-
updateHookTypesDev();
4934-
return updateResourceEffect(
4935-
create,
4936-
createDeps,
4937-
update,
4938-
updateDeps,
4939-
destroy,
4940-
);
4941-
};
4942-
}
49434848

49444849
InvalidNestedHooksDispatcherOnMountInDEV = {
49454850
readContext<T>(context: ReactContext<T>): T {
@@ -5148,27 +5053,6 @@ if (__DEV__) {
51485053
return mountEvent(callback);
51495054
};
51505055
}
5151-
if (enableUseEffectCRUDOverload) {
5152-
(InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useResourceEffect =
5153-
function useResourceEffect(
5154-
create: () => {...} | void | null,
5155-
createDeps: Array<mixed> | void | null,
5156-
update: ((resource: {...} | void | null) => void) | void,
5157-
updateDeps: Array<mixed> | void | null,
5158-
destroy: ((resource: {...} | void | null) => void) | void,
5159-
): void {
5160-
currentHookNameInDev = 'useResourceEffect';
5161-
warnInvalidHookAccess();
5162-
mountHookTypesDev();
5163-
return mountResourceEffect(
5164-
create,
5165-
createDeps,
5166-
update,
5167-
updateDeps,
5168-
destroy,
5169-
);
5170-
};
5171-
}
51725056

51735057
InvalidNestedHooksDispatcherOnUpdateInDEV = {
51745058
readContext<T>(context: ReactContext<T>): T {
@@ -5377,27 +5261,6 @@ if (__DEV__) {
53775261
return updateEvent(callback);
53785262
};
53795263
}
5380-
if (enableUseEffectCRUDOverload) {
5381-
(InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useResourceEffect =
5382-
function useResourceEffect(
5383-
create: () => {...} | void | null,
5384-
createDeps: Array<mixed> | void | null,
5385-
update: ((resource: {...} | void | null) => void) | void,
5386-
updateDeps: Array<mixed> | void | null,
5387-
destroy: ((resource: {...} | void | null) => void) | void,
5388-
) {
5389-
currentHookNameInDev = 'useResourceEffect';
5390-
warnInvalidHookAccess();
5391-
updateHookTypesDev();
5392-
return updateResourceEffect(
5393-
create,
5394-
createDeps,
5395-
update,
5396-
updateDeps,
5397-
destroy,
5398-
);
5399-
};
5400-
}
54015264

54025265
InvalidNestedHooksDispatcherOnRerenderInDEV = {
54035266
readContext<T>(context: ReactContext<T>): T {
@@ -5606,25 +5469,4 @@ if (__DEV__) {
56065469
return updateEvent(callback);
56075470
};
56085471
}
5609-
if (enableUseEffectCRUDOverload) {
5610-
(InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useResourceEffect =
5611-
function useResourceEffect(
5612-
create: () => {...} | void | null,
5613-
createDeps: Array<mixed> | void | null,
5614-
update: ((resource: {...} | void | null) => void) | void,
5615-
updateDeps: Array<mixed> | void | null,
5616-
destroy: ((resource: {...} | void | null) => void) | void,
5617-
) {
5618-
currentHookNameInDev = 'useResourceEffect';
5619-
warnInvalidHookAccess();
5620-
updateHookTypesDev();
5621-
return updateResourceEffect(
5622-
create,
5623-
createDeps,
5624-
update,
5625-
updateDeps,
5626-
destroy,
5627-
);
5628-
};
5629-
}
56305472
}

‎packages/react-reconciler/src/ReactInternalTypes.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export type HookType =
4747
| 'useRef'
4848
| 'useEffect'
4949
| 'useEffectEvent'
50-
| 'useResourceEffect'
5150
| 'useInsertionEffect'
5251
| 'useLayoutEffect'
5352
| 'useCallback'
@@ -399,14 +398,6 @@ export type Dispatcher = {
399398
): void,
400399
// TODO: Non-nullable once `enableUseEffectEventHook` is on everywhere.
401400
useEffectEvent?: <Args, F: (...Array<Args>) => mixed>(callback: F) => F,
402-
// TODO: Non-nullable once `enableUseEffectCRUDOverload` is on everywhere.
403-
useResourceEffect?: (
404-
create: () => {...} | void | null,
405-
createDeps: Array<mixed> | void | null,
406-
update: ((resource: {...} | void | null) => void) | void,
407-
updateDeps: Array<mixed> | void | null,
408-
destroy: ((resource: {...} | void | null) => void) | void,
409-
) => void,
410401
useInsertionEffect(
411402
create: () => (() => void) | void,
412403
deps: Array<mixed> | void | null,

‎packages/react-server/src/ReactFizzHooks.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ import {
3838
} from './ReactFizzConfig';
3939
import {createFastHash} from './ReactServerStreamConfig';
4040

41-
import {
42-
enableUseEffectEventHook,
43-
enableUseEffectCRUDOverload,
44-
} from 'shared/ReactFeatureFlags';
41+
import {enableUseEffectEventHook} from 'shared/ReactFeatureFlags';
4542
import is from 'shared/objectIs';
4643
import {
4744
REACT_CONTEXT_TYPE,
@@ -866,11 +863,6 @@ export const HooksDispatcher: Dispatcher = supportsClientAPIs
866863
if (enableUseEffectEventHook) {
867864
HooksDispatcher.useEffectEvent = useEffectEvent;
868865
}
869-
if (enableUseEffectCRUDOverload) {
870-
HooksDispatcher.useResourceEffect = supportsClientAPIs
871-
? noop
872-
: clientHookNotSupported;
873-
}
874866

875867
export let currentResumableState: null | ResumableState = (null: any);
876868
export function setCurrentResumableState(

‎packages/react/index.development.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ export {
5959
useDeferredValue,
6060
useEffect,
6161
experimental_useEffectEvent,
62-
experimental_useResourceEffect,
6362
useImperativeHandle,
6463
useInsertionEffect,
6564
useLayoutEffect,

‎packages/react/index.experimental.development.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export {
4242
useDeferredValue,
4343
useEffect,
4444
experimental_useEffectEvent,
45-
experimental_useResourceEffect,
4645
useImperativeHandle,
4746
useInsertionEffect,
4847
useLayoutEffect,

‎packages/react/index.fb.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export {
2121
createElement,
2222
createRef,
2323
experimental_useEffectEvent,
24-
experimental_useResourceEffect,
2524
forwardRef,
2625
Fragment,
2726
isValidElement,

‎packages/react/src/ReactClient.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import {
4141
useContext,
4242
useEffect,
4343
useEffectEvent,
44-
useResourceEffect,
4544
useImperativeHandle,
4645
useDebugValue,
4746
useInsertionEffect,
@@ -65,7 +64,6 @@ import {addTransitionType} from './ReactTransitionType';
6564
import {act} from './ReactAct';
6665
import {captureOwnerStack} from './ReactOwnerStack';
6766
import * as ReactCompilerRuntime from './ReactCompilerRuntime';
68-
import {enableUseEffectCRUDOverload} from 'shared/ReactFeatureFlags';
6967

7068
const Children = {
7169
map,
@@ -132,6 +130,3 @@ export {
132130
act, // DEV-only
133131
captureOwnerStack, // DEV-only
134132
};
135-
136-
export const experimental_useResourceEffect: typeof useResourceEffect | void =
137-
enableUseEffectCRUDOverload ? useResourceEffect : undefined;

‎packages/react/src/ReactHooks.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -221,27 +221,6 @@ export function useEffectEvent<Args, F: (...Array<Args>) => mixed>(
221221
return dispatcher.useEffectEvent(callback);
222222
}
223223

224-
export function useResourceEffect(
225-
create: () => {...} | void | null,
226-
createDeps: Array<mixed> | void | null,
227-
update: ((resource: {...} | void | null) => void) | void,
228-
updateDeps: Array<mixed> | void | null,
229-
destroy: ((resource: {...} | void | null) => void) | void,
230-
): void {
231-
if (!enableUseEffectCRUDOverload) {
232-
throw new Error('Not implemented.');
233-
}
234-
const dispatcher = resolveDispatcher();
235-
// $FlowFixMe[not-a-function] This is unstable, thus optional
236-
return dispatcher.useResourceEffect(
237-
create,
238-
createDeps,
239-
update,
240-
updateDeps,
241-
destroy,
242-
);
243-
}
244-
245224
export function useOptimistic<S, A>(
246225
passthrough: S,
247226
reducer: ?(S, A) => S,

0 commit comments

Comments
 (0)