Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure async_hooks are not resolved for client #41778

Merged
merged 2 commits into from Oct 25, 2022
Merged

Ensure async_hooks are not resolved for client #41778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
172324a
Ensure async_hooks are not resolved for client
ijjk Oct 25, 2022
a170217
ensure package.json is copied to dist
ijjk Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/build/webpack/loaders/next-app-loader.ts
View file
Open in desktop
Expand Up @@ -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')
Expand Down
13 changes: 13 additions & 0 deletions packages/next/client/components/static-generation-async-storage/browser.ts
View file
Open in desktop
@@ -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 = {}
0 ...onents/static-generation-async-storage.ts → ...s/static-generation-async-storage/node.ts
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions packages/next/client/components/static-generation-async-storage/package.json
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"browser": "./browser.js",
"main": "./node.js"
}
29 changes: 28 additions & 1 deletion packages/next/taskfile.js
View file
Open in desktop
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)')
Expand Down