Ensure async_hooks are not resolved for client (#41778)

Fixes: [slack thread](https://vercel.slack.com/archives/C02UJN0A1UL/p1666689839050269)
vercel · Oct 25, 2022 · a090b5c · a090b5c
1 parent e7f97c3
commit a090b5c
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 2 deletions.
diff --git a/packages/next/build/webpack/loaders/next-app-loader.ts b/packages/next/build/webpack/loaders/next-app-loader.ts
@@ -243,7 +243,7 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{
     export const LayoutRouter = require('next/dist/client/components/layout-router.js').default
     export const RenderFromTemplateContext = require('next/dist/client/components/render-from-template-context.js').default
 
-    export const staticGenerationAsyncStorage = require('next/dist/client/components/static-generation-async-storage.js').staticGenerationAsyncStorage
+    export const staticGenerationAsyncStorage = require('next/dist/client/components/static-generation-async-storage').staticGenerationAsyncStorage
     export const requestAsyncStorage = require('next/dist/client/components/request-async-storage.js').requestAsyncStorage
 
     export const serverHooks = require('next/dist/client/components/hooks-server-context.js')

diff --git a/packages/next/client/components/static-generation-async-storage/browser.ts b/packages/next/client/components/static-generation-async-storage/browser.ts
@@ -0,0 +1,13 @@
+import type { AsyncLocalStorage } from 'async_hooks'
+
+export interface StaticGenerationStore {
+  inUse?: boolean
+  pathname?: string
+  revalidate?: number
+  fetchRevalidate?: number
+  isStaticGeneration?: boolean
+}
+
+export let staticGenerationAsyncStorage:
+  | AsyncLocalStorage<StaticGenerationStore>
+  | StaticGenerationStore = {}
diff --git a/...onents/static-generation-async-storage.ts → ...s/static-generation-async-storage/node.ts b/...onents/static-generation-async-storage.ts → ...s/static-generation-async-storage/node.ts
diff --git a/packages/next/client/components/static-generation-async-storage/package.json b/packages/next/client/components/static-generation-async-storage/package.json
@@ -0,0 +1,4 @@
+{
+  "browser": "./browser.js",
+  "main": "./node.js"
+}
diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -2109,7 +2109,11 @@ export async function compile(task, opts) {
     ],
     opts
   )
-  await task.serial(['ncc_react_refresh_utils', 'ncc_next__react_dev_overlay'])
+  await task.serial([
+    'ncc_react_refresh_utils',
+    'ncc_next__react_dev_overlay',
+    'copy_package_json',
+  ])
 }
 
 export async function bin(task, opts) {
@@ -2196,6 +2200,29 @@ export async function nextbuildjest(task, opts) {
   notify('Compiled build/jest files')
 }
 
+export async function copy_package_json(task, opts) {
+  await fs.copy(
+    join(
+      __dirname,
+      'client/components/static-generation-async-storage/package.json'
+    ),
+    join(
+      __dirname,
+      'dist/client/components/static-generation-async-storage/package.json'
+    )
+  )
+  await fs.copy(
+    join(
+      __dirname,
+      'client/components/static-generation-async-storage/package.json'
+    ),
+    join(
+      __dirname,
+      'dist/esm/client/components/static-generation-async-storage/package.json'
+    )
+  )
+}
+
 export async function client(task, opts) {
   await task
     .source(opts.src || 'client/**/*.+(js|ts|tsx)')