Unverified Commit feae4cc4 authored by Hendrik Liebau's avatar Hendrik Liebau Committed by GitHub

Remove unnecessary ALS re-exports from `entry-base.ts` (#91527)

The `workAsyncStorage`, `workUnitAsyncStorage`, and `actionAsyncStorage`
instances were re-exported from `entry-base.ts` so that they could be
accessed as properties of the bundled page module (`ComponentMod`). This
indirection is no longer necessary because the `.external.ts` naming
convention forces webpack to externalize these modules to `commonjs
next/dist/...` (via `resolveNextExternal` in `handle-externals.ts`), and
the `turbopack-transition: 'next-shared'` import attributes achieve the
same for Turbopack. Both mechanisms guarantee that the bundled page
module and direct imports resolve to the same singleton instance.

This removes the three re-exports from `entry-base.ts` and replaces all
`ComponentMod`-based access with direct imports from the `.external`
modules in `static-paths/app.ts` and `action-handler.ts`.
parent 2622a539
...@@ -9,9 +9,7 @@ import { ...@@ -9,9 +9,7 @@ import {
} from './app' } from './app'
import type { PrerenderedRoute } from './types' import type { PrerenderedRoute } from './types'
import type { WorkStore } from '../../server/app-render/work-async-storage.external' import type { WorkStore } from '../../server/app-render/work-async-storage.external'
import type { WorkUnitAsyncStorage } from '../../server/app-render/work-unit-async-storage.external'
import type { AppSegment } from '../segment-config/app/app-segments' import type { AppSegment } from '../segment-config/app/app-segments'
import { AsyncLocalStorage } from 'async_hooks'
function pathnameSegments( function pathnameSegments(
...segments: Array<string | [string, boolean]> ...segments: Array<string | [string, boolean]>
...@@ -983,8 +981,6 @@ const createMockWorkStore = (fetchCache?: WorkStore['fetchCache']) => ({ ...@@ -983,8 +981,6 @@ const createMockWorkStore = (fetchCache?: WorkStore['fetchCache']) => ({
page: '/test-page', page: '/test-page',
}) })
const mockWorkUnitAsyncStorage = new AsyncLocalStorage() as WorkUnitAsyncStorage
// Helper to create mock segments // Helper to create mock segments
const createMockSegment = ( const createMockSegment = (
generateStaticParams?: (options: { params?: Params }) => Promise<Params[]>, generateStaticParams?: (options: { params?: Params }) => Promise<Params[]>,
...@@ -1001,7 +997,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1001,7 +997,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
[], [],
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1017,7 +1013,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1017,7 +1013,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1032,7 +1028,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1032,7 +1028,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1054,7 +1050,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1054,7 +1050,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1079,7 +1075,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1079,7 +1075,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1101,7 +1097,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1101,7 +1097,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1116,7 +1112,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1116,7 +1112,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1132,7 +1128,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1132,7 +1128,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1150,7 +1146,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1150,7 +1146,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1172,7 +1168,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1172,7 +1168,7 @@ describe('generateRouteStaticParams', () => {
await generateRouteStaticParams( await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1187,7 +1183,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1187,7 +1183,7 @@ describe('generateRouteStaticParams', () => {
await generateRouteStaticParams( await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1207,7 +1203,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1207,7 +1203,7 @@ describe('generateRouteStaticParams', () => {
await generateRouteStaticParams( await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1228,7 +1224,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1228,7 +1224,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1246,7 +1242,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1246,7 +1242,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1266,7 +1262,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1266,7 +1262,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1283,7 +1279,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1283,7 +1279,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1312,7 +1308,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1312,7 +1308,7 @@ describe('generateRouteStaticParams', () => {
generateRouteStaticParams( generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1330,7 +1326,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1330,7 +1326,7 @@ describe('generateRouteStaticParams', () => {
generateRouteStaticParams( generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1352,7 +1348,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1352,7 +1348,7 @@ describe('generateRouteStaticParams', () => {
generateRouteStaticParams( generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1369,7 +1365,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1369,7 +1365,7 @@ describe('generateRouteStaticParams', () => {
generateRouteStaticParams( generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
true, true,
[] []
) )
...@@ -1387,7 +1383,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1387,7 +1383,7 @@ describe('generateRouteStaticParams', () => {
generateRouteStaticParams( generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
true, true,
[] []
) )
...@@ -1405,7 +1401,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1405,7 +1401,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1420,7 +1416,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1420,7 +1416,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1449,7 +1445,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1449,7 +1445,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1487,7 +1483,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1487,7 +1483,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1528,7 +1524,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1528,7 +1524,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
...@@ -1554,7 +1550,7 @@ describe('generateRouteStaticParams', () => { ...@@ -1554,7 +1550,7 @@ describe('generateRouteStaticParams', () => {
const result = await generateRouteStaticParams( const result = await generateRouteStaticParams(
segments, segments,
store, store,
mockWorkUnitAsyncStorage,
false, false,
[] []
) )
......
...@@ -21,16 +21,19 @@ import { ...@@ -21,16 +21,19 @@ import {
import escapePathDelimiters from '../../shared/lib/router/utils/escape-path-delimiters' import escapePathDelimiters from '../../shared/lib/router/utils/escape-path-delimiters'
import { createIncrementalCache } from '../../export/helpers/create-incremental-cache' import { createIncrementalCache } from '../../export/helpers/create-incremental-cache'
import type { NextConfigComplete } from '../../server/config-shared' import type { NextConfigComplete } from '../../server/config-shared'
import type { WorkStore } from '../../server/app-render/work-async-storage.external' import {
type WorkStore,
workAsyncStorage,
} from '../../server/app-render/work-async-storage.external'
import type { DynamicParamTypes } from '../../shared/lib/app-router-types' import type { DynamicParamTypes } from '../../shared/lib/app-router-types'
import { getParamProperties } from '../../shared/lib/router/utils/get-segment-param' import { getParamProperties } from '../../shared/lib/router/utils/get-segment-param'
import { throwEmptyGenerateStaticParamsError } from '../../shared/lib/errors/empty-generate-static-params-error' import { throwEmptyGenerateStaticParamsError } from '../../shared/lib/errors/empty-generate-static-params-error'
import type { AppRouteModule } from '../../server/route-modules/app-route/module.compiled' import type { AppRouteModule } from '../../server/route-modules/app-route/module.compiled'
import type { NormalizedAppRoute } from '../../shared/lib/router/routes/app' import type { NormalizedAppRoute } from '../../shared/lib/router/routes/app'
import { interceptionPrefixFromParamType } from '../../shared/lib/router/utils/interception-prefix-from-param-type' import { interceptionPrefixFromParamType } from '../../shared/lib/router/utils/interception-prefix-from-param-type'
import type { import {
GenerateStaticParamsStore, type GenerateStaticParamsStore,
WorkUnitAsyncStorage, workUnitAsyncStorage,
} from '../../server/app-render/work-unit-async-storage.external' } from '../../server/app-render/work-unit-async-storage.external'
import type { ImplicitTags } from '../../server/lib/implicit-tags' import type { ImplicitTags } from '../../server/lib/implicit-tags'
import { getImplicitTags } from '../../server/lib/implicit-tags' import { getImplicitTags } from '../../server/lib/implicit-tags'
...@@ -606,7 +609,6 @@ export function assignStaticShellMetadata( ...@@ -606,7 +609,6 @@ export function assignStaticShellMetadata(
*/ */
async function callGenerateStaticParams( async function callGenerateStaticParams(
generateStaticParams: NonNullable<AppSegment['generateStaticParams']>, generateStaticParams: NonNullable<AppSegment['generateStaticParams']>,
workUnitAsyncStorage: WorkUnitAsyncStorage,
parentParams: Params, parentParams: Params,
rootParamKeys: readonly string[], rootParamKeys: readonly string[],
implicitTags: ImplicitTags implicitTags: ImplicitTags
...@@ -638,7 +640,6 @@ async function callGenerateStaticParams( ...@@ -638,7 +640,6 @@ async function callGenerateStaticParams(
* *
* @param segments - Array of app directory segments to process * @param segments - Array of app directory segments to process
* @param store - Work store for tracking fetch cache configuration * @param store - Work store for tracking fetch cache configuration
* @param workUnitAsyncStorage - AsyncLocalStorage for work unit stores
* @param isRoutePPREnabled - Whether PPR is enabled for this route * @param isRoutePPREnabled - Whether PPR is enabled for this route
* @param rootParamKeys - The keys identifying which params are root params * @param rootParamKeys - The keys identifying which params are root params
* @returns Promise that resolves to an array of all parameter combinations * @returns Promise that resolves to an array of all parameter combinations
...@@ -648,7 +649,6 @@ export async function generateRouteStaticParams( ...@@ -648,7 +649,6 @@ export async function generateRouteStaticParams(
Readonly<Pick<AppSegment, 'config' | 'generateStaticParams'>> Readonly<Pick<AppSegment, 'config' | 'generateStaticParams'>>
>, >,
store: Pick<WorkStore, 'fetchCache' | 'page'>, store: Pick<WorkStore, 'fetchCache' | 'page'>,
workUnitAsyncStorage: WorkUnitAsyncStorage,
isRoutePPREnabled: boolean, isRoutePPREnabled: boolean,
rootParamKeys: readonly string[] rootParamKeys: readonly string[]
): Promise<Params[]> { ): Promise<Params[]> {
...@@ -696,7 +696,6 @@ export async function generateRouteStaticParams( ...@@ -696,7 +696,6 @@ export async function generateRouteStaticParams(
for (const parentParams of params) { for (const parentParams of params) {
const result = await callGenerateStaticParams( const result = await callGenerateStaticParams(
current.generateStaticParams, current.generateStaticParams,
workUnitAsyncStorage,
parentParams, parentParams,
rootParamKeys, rootParamKeys,
implicitTags implicitTags
...@@ -718,7 +717,6 @@ export async function generateRouteStaticParams( ...@@ -718,7 +717,6 @@ export async function generateRouteStaticParams(
// No parent params, call generateStaticParams with empty object // No parent params, call generateStaticParams with empty object
const result = await callGenerateStaticParams( const result = await callGenerateStaticParams(
current.generateStaticParams, current.generateStaticParams,
workUnitAsyncStorage,
{}, {},
rootParamKeys, rootParamKeys,
implicitTags implicitTags
...@@ -874,12 +872,11 @@ export async function buildAppStaticPaths({ ...@@ -874,12 +872,11 @@ export async function buildAppStaticPaths({
previouslyRevalidatedTags: [], previouslyRevalidatedTags: [],
}) })
const routeParams = await ComponentMod.workAsyncStorage.run( const routeParams = await workAsyncStorage.run(
store, store,
generateRouteStaticParams, generateRouteStaticParams,
segments, segments,
store, store,
ComponentMod.workUnitAsyncStorage,
isRoutePPREnabled, isRoutePPREnabled,
rootParamKeys rootParamKeys
) )
......
...@@ -32,6 +32,7 @@ import RenderResult, { ...@@ -32,6 +32,7 @@ import RenderResult, {
type AppPageRenderResultMetadata, type AppPageRenderResultMetadata,
} from '../render-result' } from '../render-result'
import type { WorkStore } from '../app-render/work-async-storage.external' import type { WorkStore } from '../app-render/work-async-storage.external'
import { actionAsyncStorage } from '../app-render/action-async-storage.external'
import { FlightRenderResult } from './flight-render-result' import { FlightRenderResult } from './flight-render-result'
import { import {
filterReqHeaders, filterReqHeaders,
...@@ -706,8 +707,6 @@ export async function handleAction({ ...@@ -706,8 +707,6 @@ export async function handleAction({
'no-cache, no-store, max-age=0, must-revalidate' 'no-cache, no-store, max-age=0, must-revalidate'
) )
const { actionAsyncStorage } = ComponentMod
const actionWasForwarded = Boolean(req.headers['x-action-forwarded']) const actionWasForwarded = Boolean(req.headers['x-action-forwarded'])
if (actionId) { if (actionId) {
......
...@@ -46,10 +46,6 @@ export { ...@@ -46,10 +46,6 @@ export {
LoadingBoundaryProvider, LoadingBoundaryProvider,
} from '../../client/components/layout-router' } from '../../client/components/layout-router'
export { default as RenderFromTemplateContext } from '../../client/components/render-from-template-context' export { default as RenderFromTemplateContext } from '../../client/components/render-from-template-context'
export { workAsyncStorage } from '../app-render/work-async-storage.external'
export { workUnitAsyncStorage } from './work-unit-async-storage.external'
export { actionAsyncStorage } from '../app-render/action-async-storage.external'
export { ClientPageRoot } from '../../client/components/client-page' export { ClientPageRoot } from '../../client/components/client-page'
export { ClientSegmentRoot } from '../../client/components/client-segment' export { ClientSegmentRoot } from '../../client/components/client-segment'
export { export {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment