Import executionAsyncId too

facebook · Dec 16, 2023 · 52c924e · 52c924e
1 parent 2ba9670
commit 52c924e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/packages/react-server/src/ReactFlightServerConfigDebugNode.js b/packages/react-server/src/ReactFlightServerConfigDebugNode.js
@@ -7,7 +7,7 @@
  * @flow
  */
 
-import {createAsyncHook} from './ReactFlightServerConfig';
+import {createAsyncHook, executionAsyncId} from './ReactFlightServerConfig';
 import {enableAsyncDebugInfo} from 'shared/ReactFeatureFlags';
 
 // Initialize the tracing of async operations.
@@ -23,6 +23,7 @@ export function initAsyncDebugInfo(): void {
       },
       promiseResolve(asyncId: number): void {
         // TODO
+        executionAsyncId();
       },
       destroy(asyncId: number): void {
         // TODO

diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge-turbopack.js
@@ -28,4 +28,6 @@ export const createAsyncHook: HookCallbacks => AsyncHook =
           disable() {},
         }: any);
       };
+export const executionAsyncId: () => number =
+  typeof async_hooks === 'object' ? async_hooks.executionAsyncId : (null: any);
 export * from '../ReactFlightServerConfigDebugNode';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-edge.js
@@ -28,4 +28,6 @@ export const createAsyncHook: HookCallbacks => AsyncHook =
           disable() {},
         }: any);
       };
+export const executionAsyncId: () => number =
+  typeof async_hooks === 'object' ? async_hooks.executionAsyncId : (null: any);
 export * from '../ReactFlightServerConfigDebugNode';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-esm.js
@@ -17,5 +17,5 @@ export const supportsRequestStorage = true;
 export const requestStorage: AsyncLocalStorage<Request> =
   new AsyncLocalStorage();
 
-export {createHook as createAsyncHook} from 'async_hooks';
+export {createHook as createAsyncHook, executionAsyncId} from 'async_hooks';
 export * from '../ReactFlightServerConfigDebugNode';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node-turbopack.js
@@ -18,5 +18,5 @@ export const supportsRequestStorage = true;
 export const requestStorage: AsyncLocalStorage<Request> =
   new AsyncLocalStorage();
 
-export {createHook as createAsyncHook} from 'async_hooks';
+export {createHook as createAsyncHook, executionAsyncId} from 'async_hooks';
 export * from '../ReactFlightServerConfigDebugNode';
diff --git a/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js b/packages/react-server/src/forks/ReactFlightServerConfig.dom-node.js
@@ -18,5 +18,5 @@ export const supportsRequestStorage = true;
 export const requestStorage: AsyncLocalStorage<Request> =
   new AsyncLocalStorage();
 
-export {createHook as createAsyncHook} from 'async_hooks';
+export {createHook as createAsyncHook, executionAsyncId} from 'async_hooks';
 export * from '../ReactFlightServerConfigDebugNode';
diff --git a/scripts/flow/environment.js b/scripts/flow/environment.js
@@ -322,6 +322,7 @@ declare class AsyncLocalStorage<T> {
 
 declare var async_hooks: {
   createHook(callbacks: any): any,
+  executionAsyncId(): number,
 };
 
 declare module 'node:worker_threads' {