{"body":"This has been statically enabled everywhere for months.","parents":["a21d1475ffd7225a463f2d0c0c9b732c8dd795eb"],"commit":{"subject":"Clean up enableUseHook flag (#26707)","revision":"7ce765ec321a6f213019b56b36f9dccb2a8a7d5c","authorEmail":"git@andrewclark.io","shortRevision":"7ce765ec32","authoredAt":"2023-04-23T14:50:17-04:00","authorName":"Andrew Clark"},"patch":"diff --git a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\nindex cb24048227..23a44a41ed 100644\n--- a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n+++ b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n@@ -530,7 +530,6 @@ describe('ReactFlight', () => {\n expect(ReactNoop).toMatchRenderedOutput(

I am client<\/div>);\n });\n \n- \/\/ @gate enableUseHook\n it('should error if a non-serializable value is passed to a host component', async () => {\n function ClientImpl({children}) {\n return children;\n@@ -641,7 +640,6 @@ describe('ReactFlight', () => {\n });\n });\n \n- \/\/ @gate enableUseHook\n it('should trigger the inner most error boundary inside a Client Component', async () => {\n function ServerComponent() {\n throw new Error('This was thrown in the Server Component.');\ndiff --git a\/packages\/react-debug-tools\/src\/ReactDebugHooks.js b\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\nindex bed4c2fead..362e5f36d2 100644\n--- a\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\n+++ b\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\n@@ -106,6 +106,13 @@ function readContext(context: ReactContext): T {\n return context._currentValue;\n }\n \n+function use(): T {\n+ \/\/ TODO: What should this do if it receives an unresolved promise?\n+ throw new Error(\n+ 'Support for `use` not yet implemented in react-debug-tools.',\n+ );\n+}\n+\n function useContext(context: ReactContext): T {\n hookLog.push({\n primitive: 'Context',\n@@ -327,6 +334,7 @@ function useId(): string {\n }\n \n const Dispatcher: DispatcherType = {\n+ use,\n readContext,\n useCacheRefresh,\n useCallback,\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\nindex 1f8746c0e9..40d996194c 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js\n@@ -5212,7 +5212,6 @@ describe('ReactDOMFizzServer', () => {\n });\n });\n \n- \/\/ @gate enableUseHook\n it('basic use(promise)', async () => {\n const promiseA = Promise.resolve('A');\n const promiseB = Promise.resolve('B');\n@@ -5258,7 +5257,6 @@ describe('ReactDOMFizzServer', () => {\n expect(getVisibleChildren(container)).toEqual('ABC');\n });\n \n- \/\/ @gate enableUseHook\n it('basic use(context)', async () => {\n const ContextA = React.createContext('default');\n const ContextB = React.createContext('B');\n@@ -5303,7 +5301,6 @@ describe('ReactDOMFizzServer', () => {\n expect(getVisibleChildren(container)).toEqual(['AB', 'C']);\n });\n \n- \/\/ @gate enableUseHook\n it('use(promise) in multiple components', async () => {\n const promiseA = Promise.resolve('A');\n const promiseB = Promise.resolve('B');\n@@ -5357,7 +5354,6 @@ describe('ReactDOMFizzServer', () => {\n expect(getVisibleChildren(container)).toEqual('ABCD');\n });\n \n- \/\/ @gate enableUseHook\n it('using a rejected promise will throw', async () => {\n const promiseA = Promise.resolve('A');\n const promiseB = Promise.reject(new Error('Oops!'));\n@@ -5443,7 +5439,6 @@ describe('ReactDOMFizzServer', () => {\n }\n });\n \n- \/\/ @gate enableUseHook\n it(\"use a promise that's already been instrumented and resolved\", async () => {\n const thenable = {\n status: 'fulfilled',\n@@ -5467,7 +5462,6 @@ describe('ReactDOMFizzServer', () => {\n expect(getVisibleChildren(container)).toEqual('Hi');\n });\n \n- \/\/ @gate enableUseHook\n it('unwraps thenable that fulfills synchronously without suspending', async () => {\n function App() {\n const thenable = {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex fa0f155bf8..b4b193233b 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -37,7 +37,6 @@ import {\n enableLazyContextPropagation,\n enableUseMutableSource,\n enableTransitionTracing,\n- enableUseHook,\n enableUseMemoCacheHook,\n enableUseEffectEventHook,\n enableLegacyCache,\n@@ -2944,6 +2943,7 @@ function markUpdateInDevTools(fiber: Fiber, lane: Lane, action: A): void {\n export const ContextOnlyDispatcher: Dispatcher = {\n readContext,\n \n+ use,\n useCallback: throwInvalidHookError,\n useContext: throwInvalidHookError,\n useEffect: throwInvalidHookError,\n@@ -2964,9 +2964,6 @@ export const ContextOnlyDispatcher: Dispatcher = {\n if (enableCache) {\n (ContextOnlyDispatcher: Dispatcher).useCacheRefresh = throwInvalidHookError;\n }\n-if (enableUseHook) {\n- (ContextOnlyDispatcher: Dispatcher).use = throwInvalidHookError;\n-}\n if (enableUseMemoCacheHook) {\n (ContextOnlyDispatcher: Dispatcher).useMemoCache = throwInvalidHookError;\n }\n@@ -2977,6 +2974,7 @@ if (enableUseEffectEventHook) {\n const HooksDispatcherOnMount: Dispatcher = {\n readContext,\n \n+ use,\n useCallback: mountCallback,\n useContext: readContext,\n useEffect: mountEffect,\n@@ -2997,9 +2995,6 @@ const HooksDispatcherOnMount: Dispatcher = {\n if (enableCache) {\n (HooksDispatcherOnMount: Dispatcher).useCacheRefresh = mountRefresh;\n }\n-if (enableUseHook) {\n- (HooksDispatcherOnMount: Dispatcher).use = use;\n-}\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnMount: Dispatcher).useMemoCache = useMemoCache;\n }\n@@ -3009,6 +3004,7 @@ if (enableUseEffectEventHook) {\n const HooksDispatcherOnUpdate: Dispatcher = {\n readContext,\n \n+ use,\n useCallback: updateCallback,\n useContext: readContext,\n useEffect: updateEffect,\n@@ -3032,9 +3028,6 @@ if (enableCache) {\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnUpdate: Dispatcher).useMemoCache = useMemoCache;\n }\n-if (enableUseHook) {\n- (HooksDispatcherOnUpdate: Dispatcher).use = use;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnUpdate: Dispatcher).useEffectEvent = updateEvent;\n }\n@@ -3042,6 +3035,7 @@ if (enableUseEffectEventHook) {\n const HooksDispatcherOnRerender: Dispatcher = {\n readContext,\n \n+ use,\n useCallback: updateCallback,\n useContext: readContext,\n useEffect: updateEffect,\n@@ -3062,9 +3056,6 @@ const HooksDispatcherOnRerender: Dispatcher = {\n if (enableCache) {\n (HooksDispatcherOnRerender: Dispatcher).useCacheRefresh = updateRefresh;\n }\n-if (enableUseHook) {\n- (HooksDispatcherOnRerender: Dispatcher).use = use;\n-}\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnRerender: Dispatcher).useMemoCache = useMemoCache;\n }\n@@ -3103,6 +3094,7 @@ if (__DEV__) {\n readContext(context: ReactContext): T {\n return readContext(context);\n },\n+ use,\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n mountHookTypesDev();\n@@ -3243,9 +3235,6 @@ if (__DEV__) {\n return mountRefresh();\n };\n }\n- if (enableUseHook) {\n- (HooksDispatcherOnMountInDEV: Dispatcher).use = use;\n- }\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnMountInDEV: Dispatcher).useMemoCache = useMemoCache;\n }\n@@ -3264,6 +3253,7 @@ if (__DEV__) {\n readContext(context: ReactContext): T {\n return readContext(context);\n },\n+ use,\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n updateHookTypesDev();\n@@ -3398,9 +3388,6 @@ if (__DEV__) {\n return mountRefresh();\n };\n }\n- if (enableUseHook) {\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).use = use;\n- }\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useMemoCache =\n useMemoCache;\n@@ -3420,6 +3407,7 @@ if (__DEV__) {\n readContext(context: ReactContext): T {\n return readContext(context);\n },\n+ use,\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n updateHookTypesDev();\n@@ -3557,9 +3545,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseHook) {\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).use = use;\n- }\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnUpdateInDEV: Dispatcher).useMemoCache = useMemoCache;\n }\n@@ -3578,7 +3563,7 @@ if (__DEV__) {\n readContext(context: ReactContext): T {\n return readContext(context);\n },\n-\n+ use,\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n updateHookTypesDev();\n@@ -3716,9 +3701,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseHook) {\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).use = use;\n- }\n if (enableUseMemoCacheHook) {\n (HooksDispatcherOnRerenderInDEV: Dispatcher).useMemoCache = useMemoCache;\n }\n@@ -3738,6 +3720,10 @@ if (__DEV__) {\n warnInvalidContextAccess();\n return readContext(context);\n },\n+ use(usable: Usable): T {\n+ warnInvalidHookAccess();\n+ return use(usable);\n+ },\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n warnInvalidHookAccess();\n@@ -3888,14 +3874,6 @@ if (__DEV__) {\n return mountRefresh();\n };\n }\n- if (enableUseHook) {\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).use = function (\n- usable: Usable,\n- ): T {\n- warnInvalidHookAccess();\n- return use(usable);\n- };\n- }\n if (enableUseMemoCacheHook) {\n (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useMemoCache =\n function (size: number): Array {\n@@ -3920,6 +3898,10 @@ if (__DEV__) {\n warnInvalidContextAccess();\n return readContext(context);\n },\n+ use(usable: Usable): T {\n+ warnInvalidHookAccess();\n+ return use(usable);\n+ },\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n warnInvalidHookAccess();\n@@ -4073,14 +4055,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseHook) {\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).use = function (\n- usable: Usable,\n- ): T {\n- warnInvalidHookAccess();\n- return use(usable);\n- };\n- }\n if (enableUseMemoCacheHook) {\n (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useMemoCache =\n function (size: number): Array {\n@@ -4105,7 +4079,10 @@ if (__DEV__) {\n warnInvalidContextAccess();\n return readContext(context);\n },\n-\n+ use(usable: Usable): T {\n+ warnInvalidHookAccess();\n+ return use(usable);\n+ },\n useCallback(callback: T, deps: Array | void | null): T {\n currentHookNameInDev = 'useCallback';\n warnInvalidHookAccess();\n@@ -4259,14 +4236,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseHook) {\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).use = function <\n- T,\n- >(usable: Usable): T {\n- warnInvalidHookAccess();\n- return use(usable);\n- };\n- }\n if (enableUseMemoCacheHook) {\n (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useMemoCache =\n function (size: number): Array {\ndiff --git a\/packages\/react-reconciler\/src\/ReactInternalTypes.js b\/packages\/react-reconciler\/src\/ReactInternalTypes.js\nindex 281186c53d..1421181cb8 100644\n--- a\/packages\/react-reconciler\/src\/ReactInternalTypes.js\n+++ b\/packages\/react-reconciler\/src\/ReactInternalTypes.js\n@@ -372,7 +372,7 @@ type BasicStateAction ~~= (S => S) | S;\n type Dispatch~~ = A => void;\n \n export type Dispatcher = {\n- use?: (Usable) => T,\n+ use: (Usable) => T,\n readContext(context: ReactContext): T,\n useState(initialState: (() => S) | S): [S, Dispatch>],\n useReducer(\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js\nindex 8615d4ab26..28b5333e4c 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js\n@@ -206,7 +206,6 @@ describe('isomorphic act()', () => {\n });\n \n \/\/ @gate __DEV__\n- \/\/ @gate enableUseHook\n test('unwraps promises by yielding to microtasks (async act scope)', async () => {\n const promise = Promise.resolve('Async');\n \n@@ -232,7 +231,6 @@ describe('isomorphic act()', () => {\n });\n \n \/\/ @gate __DEV__\n- \/\/ @gate enableUseHook\n test('unwraps promises by yielding to microtasks (non-async act scope)', async () => {\n const promise = Promise.resolve('Async');\n \n@@ -260,7 +258,6 @@ describe('isomorphic act()', () => {\n });\n \n \/\/ @gate __DEV__\n- \/\/ @gate enableUseHook\n test('warns if a promise is used in a non-awaited `act` scope', async () => {\n const promise = new Promise(() => {});\n \ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactUse-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactUse-test.js\nindex ec3b86acb1..1057dc2718 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactUse-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactUse-test.js\n@@ -184,7 +184,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('Loading...');\n });\n \n- \/\/ @gate enableUseHook\n test('basic use(promise)', async () => {\n const promiseA = Promise.resolve('A');\n const promiseB = Promise.resolve('B');\n@@ -213,7 +212,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('ABC');\n });\n \n- \/\/ @gate enableUseHook\n test(\"using a promise that's not cached between attempts\", async () => {\n function Async() {\n const text =\n@@ -241,7 +239,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('ABC');\n });\n \n- \/\/ @gate enableUseHook\n test('using a rejected promise will throw', async () => {\n class ErrorBoundary extends React.Component {\n state = {error: null};\n@@ -286,7 +283,6 @@ describe('ReactUse', () => {\n assertLog(['Oops!', 'Oops!']);\n });\n \n- \/\/ @gate enableUseHook\n test('use(promise) in multiple components', async () => {\n \/\/ This tests that the state for tracking promises is reset per component.\n const promiseA = Promise.resolve('A');\n@@ -320,7 +316,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('ABCD');\n });\n \n- \/\/ @gate enableUseHook\n test('use(promise) in multiple sibling components', async () => {\n \/\/ This tests that the state for tracking promises is reset per component.\n \n@@ -356,7 +351,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('Loading...');\n });\n \n- \/\/ @gate enableUseHook\n test('erroring in the same component as an uncached promise does not result in an infinite loop', async () => {\n class ErrorBoundary extends React.Component {\n state = {error: null};\n@@ -434,7 +428,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('Caught an error: Oops!');\n });\n \n- \/\/ @gate enableUseHook\n test('basic use(context)', async () => {\n const ContextA = React.createContext('');\n const ContextB = React.createContext('B');\n@@ -458,7 +451,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('AB');\n });\n \n- \/\/ @gate enableUseHook\n test('interrupting while yielded should reset contexts', async () => {\n let resolve;\n const promise = new Promise(r => {\n@@ -505,7 +497,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput(
Hello world!<\/div>);\n });\n \n- \/\/ @gate enableUseHook || !__DEV__\n test('warns if use(promise) is wrapped with try\/catch block', async () => {\n function Async() {\n try {\n@@ -541,7 +532,6 @@ describe('ReactUse', () => {\n }\n });\n \n- \/\/ @gate enableUseHook\n test('during a transition, can unwrap async operations even if nothing is cached', async () => {\n function App() {\n return ;\n@@ -577,7 +567,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('Async');\n });\n \n- \/\/ @gate enableUseHook\n test(\"does not prevent a Suspense fallback from showing if it's a new boundary, even during a transition\", async () => {\n function App() {\n return ;\n@@ -620,7 +609,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('Async');\n });\n \n- \/\/ @gate enableUseHook\n test('when waiting for data to resolve, a fresh update will trigger a restart', async () => {\n function App() {\n return ;\n@@ -652,7 +640,6 @@ describe('ReactUse', () => {\n assertLog(['Something different']);\n });\n \n- \/\/ @gate enableUseHook\n test('when waiting for data to resolve, an update on a different root does not cause work to be dropped', async () => {\n const getCachedAsyncText = cache(getAsyncText);\n \n@@ -693,7 +680,6 @@ describe('ReactUse', () => {\n expect(root1).toMatchRenderedOutput('Hi');\n });\n \n- \/\/ @gate enableUseHook\n test('while suspended, hooks cannot be called (i.e. current dispatcher is unset correctly)', async () => {\n function App() {\n return ;\n@@ -722,7 +708,6 @@ describe('ReactUse', () => {\n );\n });\n \n- \/\/ @gate enableUseHook\n test('unwraps thenable that fulfills synchronously without suspending', async () => {\n function App() {\n const thenable = {\n@@ -750,7 +735,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('Hi');\n });\n \n- \/\/ @gate enableUseHook\n test('does not suspend indefinitely if an interleaved update was skipped', async () => {\n function Child({childShouldSuspend}) {\n return (\n@@ -979,7 +963,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('aguacate avocat');\n });\n \n- \/\/ @gate enableUseHook\n test(\n 'wrap an async function with useMemo to skip running the function ' +\n 'twice when loading new data',\n@@ -1012,7 +995,6 @@ describe('ReactUse', () => {\n },\n );\n \n- \/\/ @gate enableUseHook\n test('load multiple nested Suspense boundaries', async () => {\n const getCachedAsyncText = cache(getAsyncText);\n \n@@ -1056,7 +1038,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('ABC');\n });\n \n- \/\/ @gate enableUseHook\n test('load multiple nested Suspense boundaries (uncached requests)', async () => {\n \/\/ This the same as the previous test, except the requests are not cached.\n \/\/ The tree should still eventually resolve, despite the\n@@ -1139,7 +1120,6 @@ describe('ReactUse', () => {\n expect(root).toMatchRenderedOutput('ABC');\n });\n \n- \/\/ @gate enableUseHook\n test('use() combined with render phase updates', async () => {\n function Async() {\n const a = use(Promise.resolve('A'));\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js\nindex fb99875425..32224491e4 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js\n@@ -130,7 +130,6 @@ describe('ReactFlightDOM', () => {\n });\n });\n \n- \/\/ @gate enableUseHook\n it('should resolve the root', async () => {\n \/\/ Model\n function Text({children}) {\n@@ -180,7 +179,6 @@ describe('ReactFlightDOM', () => {\n );\n });\n \n- \/\/ @gate enableUseHook\n it('should not get confused by $', async () => {\n \/\/ Model\n function RootModel() {\n@@ -215,7 +213,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
$1<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should not get confused by @', async () => {\n \/\/ Model\n function RootModel() {\n@@ -250,7 +247,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
@div<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to esm compat test module references', async () => {\n const ESMCompatModule = {\n __esModule: true,\n@@ -300,7 +296,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
Hello World<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to render a named component export', async () => {\n const Module = {\n Component: function ({greeting}) {\n@@ -338,7 +333,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
Hello World<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to render a module split named component export', async () => {\n const Module = {\n \/\/ This gets split into a separate module from the original one.\n@@ -377,7 +371,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
Hello World<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should unwrap async module references', async () => {\n const AsyncModule = Promise.resolve(function AsyncModule({text}) {\n return 'Async: ' + text;\n@@ -418,7 +411,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
Async: Module<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should unwrap async module references using use', async () => {\n const AsyncModule = Promise.resolve('Async Text');\n \n@@ -457,7 +449,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
Async Text<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to import a name called \"then\"', async () => {\n const thenExports = {\n then: function then() {\n@@ -531,7 +522,6 @@ describe('ReactFlightDOM', () => {\n );\n });\n \n- \/\/ @gate enableUseHook\n it('should progressively reveal server components', async () => {\n let reportedErrors = [];\n \n@@ -728,7 +718,6 @@ describe('ReactFlightDOM', () => {\n expect(reportedErrors).toEqual([]);\n });\n \n- \/\/ @gate enableUseHook\n it('should preserve state of client components on refetch', async () => {\n \/\/ Client\n \n@@ -814,7 +803,6 @@ describe('ReactFlightDOM', () => {\n expect(inputB.value).toBe('goodbye');\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to complete after aborting and throw the reason client-side', async () => {\n const reportedErrors = [];\n \n@@ -873,7 +861,6 @@ describe('ReactFlightDOM', () => {\n expect(reportedErrors).toEqual(['for reasons']);\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to recover from a direct reference erroring client-side', async () => {\n const reportedErrors = [];\n \n@@ -919,7 +906,6 @@ describe('ReactFlightDOM', () => {\n expect(reportedErrors).toEqual([]);\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to recover from a direct reference erroring client-side async', async () => {\n const reportedErrors = [];\n \n@@ -977,7 +963,6 @@ describe('ReactFlightDOM', () => {\n expect(reportedErrors).toEqual([]);\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to recover from a direct reference erroring server-side', async () => {\n const reportedErrors = [];\n \n@@ -1044,7 +1029,6 @@ describe('ReactFlightDOM', () => {\n expect(reportedErrors).toEqual(['bug in the bundler']);\n });\n \n- \/\/ @gate enableUseHook\n it('should pass a Promise through props and be able use() it on the client', async () => {\n async function getData() {\n return 'async hello';\n@@ -1090,7 +1074,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
async hello<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should throw on the client if a passed promise eventually rejects', async () => {\n const reportedErrors = [];\n const theError = new Error('Server throw');\n@@ -1158,7 +1141,6 @@ describe('ReactFlightDOM', () => {\n expect(reportedErrors).toEqual([theError]);\n });\n \n- \/\/ @gate enableUseHook\n it('should support ReactDOM.preload when rendering in Fiber', async () => {\n function Component() {\n return
hello world<\/p>;\n@@ -1214,7 +1196,6 @@ describe('ReactFlightDOM', () => {\n expect(container.innerHTML).toBe('
hello world<\/p>');\n });\n \n- \/\/ @gate enableUseHook\n it('should support ReactDOM.preload when rendering in Fizz', async () => {\n function Component() {\n return
hello world<\/p>;\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js\nindex c846493de8..b1e41f2a23 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js\n@@ -182,7 +182,6 @@ describe('ReactFlightDOMBrowser', () => {\n });\n });\n \n- \/\/ @gate enableUseHook\n it('should progressively reveal server components', async () => {\n let reportedErrors = [];\n \n@@ -492,7 +491,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(isDone).toBeTruthy();\n });\n \n- \/\/ @gate enableUseHook\n it('should be able to complete after aborting and throw the reason client-side', async () => {\n const reportedErrors = [];\n \n@@ -576,7 +574,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(reportedErrors).toEqual(['for reasons']);\n });\n \n- \/\/ @gate enableUseHook\n it('basic use(promise)', async () => {\n function Server() {\n return (\n@@ -605,7 +602,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(container.innerHTML).toBe('ABC');\n });\n \n- \/\/ @gate enableUseHook\n it('basic use(context)', async () => {\n const ContextA = React.createServerContext('ContextA', '');\n const ContextB = React.createServerContext('ContextB', 'B');\n@@ -639,7 +635,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(container.innerHTML).toBe('AB');\n });\n \n- \/\/ @gate enableUseHook\n it('use(promise) in multiple components', async () => {\n function Child({prefix}) {\n return prefix + use(Promise.resolve('C')) + use(Promise.resolve('D'));\n@@ -670,7 +665,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(container.innerHTML).toBe('ABCD');\n });\n \n- \/\/ @gate enableUseHook\n it('using a rejected promise will throw', async () => {\n const promiseA = Promise.resolve('A');\n const promiseB = Promise.reject(new Error('Oops!'));\n@@ -732,7 +726,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(reportedErrors[0].message).toBe('Oops!');\n });\n \n- \/\/ @gate enableUseHook\n it(\"use a promise that's already been instrumented and resolved\", async () => {\n const thenable = {\n status: 'fulfilled',\n@@ -760,7 +753,6 @@ describe('ReactFlightDOMBrowser', () => {\n expect(container.innerHTML).toBe('Hi');\n });\n \n- \/\/ @gate enableUseHook\n it('unwraps thenable that fulfills synchronously without suspending', async () => {\n function Server() {\n const thenable = {\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js\nindex e090add747..ee110d483d 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js\n@@ -54,7 +54,6 @@ describe('ReactFlightDOMEdge', () => {\n }\n }\n \n- \/\/ @gate enableUseHook\n it('should allow an alternative module mapping to be used for SSR', async () => {\n function ClientComponent() {\n return Client Component<\/span>;\ndiff --git a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\nindex 17b65bcddf..c720b4434c 100644\n--- a\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\n+++ b\/packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js\n@@ -56,7 +56,6 @@ describe('ReactFlightDOMNode', () => {\n });\n }\n \n- \/\/ @gate enableUseHook\n it('should allow an alternative module mapping to be used for SSR', async () => {\n function ClientComponent() {\n return Client Component<\/span>;\ndiff --git a\/packages\/react-server\/src\/ReactFizzHooks.js b\/packages\/react-server\/src\/ReactFizzHooks.js\nindex a389c09261..62e4586f74 100644\n--- a\/packages\/react-server\/src\/ReactFizzHooks.js\n+++ b\/packages\/react-server\/src\/ReactFizzHooks.js\n@@ -31,7 +31,6 @@ import {makeId} from '.\/ReactFizzConfig';\n \n import {\n enableCache,\n- enableUseHook,\n enableUseEffectEventHook,\n enableUseMemoCacheHook,\n } from 'shared\/ReactFeatureFlags';\n@@ -610,6 +609,7 @@ function noop(): void {}\n \n export const HooksDispatcher: Dispatcher = {\n readContext,\n+ use,\n useContext,\n useMemo,\n useReducer,\n@@ -641,9 +641,6 @@ if (enableUseEffectEventHook) {\n if (enableUseMemoCacheHook) {\n HooksDispatcher.useMemoCache = useMemoCache;\n }\n-if (enableUseHook) {\n- HooksDispatcher.use = use;\n-}\n \n export let currentResponseState: null | ResponseState = (null: any);\n export function setCurrentResponseState(\ndiff --git a\/packages\/react-server\/src\/ReactFlightHooks.js b\/packages\/react-server\/src\/ReactFlightHooks.js\nindex 270e1f2400..190292515e 100644\n--- a\/packages\/react-server\/src\/ReactFlightHooks.js\n+++ b\/packages\/react-server\/src\/ReactFlightHooks.js\n@@ -16,7 +16,6 @@ import {\n REACT_MEMO_CACHE_SENTINEL,\n } from 'shared\/ReactSymbols';\n import {readContext as readContextImpl} from '.\/ReactFlightNewContext';\n-import {enableUseHook} from 'shared\/ReactFeatureFlags';\n import {createThenableState, trackUsedThenable} from '.\/ReactFlightThenable';\n import {isClientReference} from '.\/ReactFlightServerConfig';\n \n@@ -100,7 +99,7 @@ export const HooksDispatcher: Dispatcher = {\n }\n return data;\n },\n- use: enableUseHook ? use : (unsupportedHook: any),\n+ use,\n };\n \n function unsupportedHook(): void {\ndiff --git a\/packages\/react\/src\/__tests__\/ReactFetch-test.js b\/packages\/react\/src\/__tests__\/ReactFetch-test.js\nindex 2993ed564c..b3f8843b88 100644\n--- a\/packages\/react\/src\/__tests__\/ReactFetch-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactFetch-test.js\n@@ -135,7 +135,6 @@ describe('ReactFetch', () => {\n expect(fetchCount).toBe(1);\n });\n \n- \/\/ @gate enableUseHook\n it('can opt-out of deduping fetches inside of render with custom signal', async () => {\n const controller = new AbortController();\n function useCustomHook() {\n@@ -154,7 +153,6 @@ describe('ReactFetch', () => {\n expect(fetchCount).not.toBe(1);\n });\n \n- \/\/ @gate enableUseHook\n it('opts out of deduping for POST requests', async () => {\n function useCustomHook() {\n return use(\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 6129bb1476..791ed622a0 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -106,8 +106,6 @@ export const enableHostSingletons = true;\n \n export const enableFloat = true;\n \n-export const enableUseHook = true;\n-\n \/\/ Enables unstable_useMemoCache hook, intended as a compilation target for\n \/\/ auto-memoization.\n export const enableUseMemoCacheHook = __EXPERIMENTAL__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 9345b0bb85..2392289016 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -53,7 +53,6 @@ export const disableModulePatternComponents = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = true;\n-export const enableUseHook = true;\n export const enableUseMemoCacheHook = true;\n export const enableUseEffectEventHook = false;\n export const enableClientRenderFallbackOnTextMismatch = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex c5888b2837..326f7d5385 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -39,7 +39,6 @@ export const disableModulePatternComponents = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = false;\n-export const enableUseHook = true;\n export const enableUseMemoCacheHook = false;\n export const enableUseEffectEventHook = false;\n export const enableClientRenderFallbackOnTextMismatch = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 63f3c9f6eb..f3d296f257 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -39,7 +39,6 @@ export const disableModulePatternComponents = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = false;\n-export const enableUseHook = true;\n export const enableUseMemoCacheHook = false;\n export const enableUseEffectEventHook = false;\n export const enableClientRenderFallbackOnTextMismatch = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\nindex 771362d6bf..751695f8eb 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n@@ -43,7 +43,6 @@ export const enableGetInspectorDataForInstanceInProduction = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = false;\n-export const enableUseHook = true;\n export const enableUseMemoCacheHook = false;\n export const enableUseEffectEventHook = false;\n export const enableClientRenderFallbackOnTextMismatch = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 433d18d918..31d2292dcf 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -39,7 +39,6 @@ export const disableModulePatternComponents = true;\n export const enableSuspenseAvoidThisFallback = true;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = false;\n-export const enableUseHook = true;\n export const enableUseMemoCacheHook = false;\n export const enableUseEffectEventHook = false;\n export const enableClientRenderFallbackOnTextMismatch = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex a4a64c0d93..949811e681 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -51,7 +51,6 @@ export const enableSuspenseAvoidThisFallbackFizz = false;\n export const disableSchedulerTimeoutInWorkLoop = false;\n export const enableCPUSuspense = true;\n export const enableFloat = true;\n-export const enableUseHook = true;\n export const enableUseMemoCacheHook = true;\n export const enableUseEffectEventHook = true;\n export const enableHostSingletons = true;\n","files":[{"status":"M","path":"packages\/react-client\/src\/__tests__\/ReactFlight-test.js"},{"status":"M","path":"packages\/react-debug-tools\/src\/ReactDebugHooks.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMFizzServer-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactInternalTypes.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactUse-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOM-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMBrowser-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMEdge-test.js"},{"status":"M","path":"packages\/react-server-dom-webpack\/src\/__tests__\/ReactFlightDOMNode-test.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzHooks.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFlightHooks.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactFetch-test.js"},{"status":"M","path":"packages\/shared\/ReactFeatureFlags.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js"},{"status":"M","path":"packages\/shared\/forks\/ReactFeatureFlags.www.js"}]}

dillon1000/react

Files changed