Skip to content

Commit 345d4d4

Browse files
authored
Use proper reexports in entry-base.ts (#80988)
Purely a cosmetic change I noticed while debugging a Turbopack bug (but unrelated to that)
1 parent 3e17074 commit 345d4d4

File tree

1 file changed

+21
-39
lines changed

1 file changed

+21
-39
lines changed

packages/next/src/server/app-render/entry-base.ts

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,41 +10,45 @@ export {
1010
// eslint-disable-next-line import/no-extraneous-dependencies
1111
export { unstable_prerender as prerender } from 'react-server-dom-webpack/static.edge'
1212

13-
import LayoutRouter from '../../client/components/layout-router'
14-
import RenderFromTemplateContext from '../../client/components/render-from-template-context'
15-
import { workAsyncStorage } from '../app-render/work-async-storage.external'
16-
import { workUnitAsyncStorage } from './work-unit-async-storage.external'
17-
import { actionAsyncStorage } from '../app-render/action-async-storage.external'
18-
import { ClientPageRoot } from '../../client/components/client-page'
19-
import { ClientSegmentRoot } from '../../client/components/client-segment'
20-
import {
13+
export { default as LayoutRouter } from '../../client/components/layout-router'
14+
export { default as RenderFromTemplateContext } from '../../client/components/render-from-template-context'
15+
export { workAsyncStorage } from '../app-render/work-async-storage.external'
16+
export { workUnitAsyncStorage } from './work-unit-async-storage.external'
17+
export { actionAsyncStorage } from '../app-render/action-async-storage.external'
18+
19+
export { ClientPageRoot } from '../../client/components/client-page'
20+
export { ClientSegmentRoot } from '../../client/components/client-segment'
21+
export {
2122
createServerSearchParamsForServerPage,
2223
createPrerenderSearchParamsForClientPage,
2324
} from '../request/search-params'
24-
import {
25+
export {
2526
createServerParamsForServerSegment,
2627
createPrerenderParamsForClientSegment,
2728
} from '../request/params'
28-
import * as serverHooks from '../../client/components/hooks-server-context'
29-
import { HTTPAccessFallbackBoundary } from '../../client/components/http-access-fallback/error-boundary'
30-
import { createMetadataComponents } from '../../lib/metadata/metadata'
31-
import { patchFetch as _patchFetch } from '../lib/patch-fetch'
29+
export * as serverHooks from '../../client/components/hooks-server-context'
30+
export { HTTPAccessFallbackBoundary } from '../../client/components/http-access-fallback/error-boundary'
31+
export { createMetadataComponents } from '../../lib/metadata/metadata'
3232
// Not being directly used but should be included in the client manifest for /_not-found
3333
// * ErrorBoundary -> client/components/error-boundary
3434
// * GlobalError -> client/components/global-error
3535
import '../../client/components/error-boundary'
3636
import '../../client/components/builtin/global-error'
37-
import {
37+
export {
3838
MetadataBoundary,
3939
ViewportBoundary,
4040
OutletBoundary,
4141
} from '../../client/components/metadata/metadata-boundary'
4242

43-
import { preloadStyle, preloadFont, preconnect } from './rsc/preloads'
44-
import { Postpone } from './rsc/postpone'
45-
import { taintObjectReference } from './rsc/taint'
43+
export { preloadStyle, preloadFont, preconnect } from './rsc/preloads'
44+
export { Postpone } from './rsc/postpone'
45+
export { taintObjectReference } from './rsc/taint'
4646
export { collectSegmentData } from './collect-segment-data'
4747

48+
import { workAsyncStorage } from '../app-render/work-async-storage.external'
49+
import { workUnitAsyncStorage } from './work-unit-async-storage.external'
50+
import { patchFetch as _patchFetch } from '../lib/patch-fetch'
51+
4852
let SegmentViewNode: typeof import('../../next-devtools/userspace/app/segment-explorer').SegmentViewNode =
4953
() => null
5054
if (process.env.NODE_ENV === 'development') {
@@ -63,29 +67,7 @@ function patchFetch() {
6367
}
6468

6569
export {
66-
LayoutRouter,
67-
RenderFromTemplateContext,
68-
workAsyncStorage,
69-
workUnitAsyncStorage,
70-
actionAsyncStorage,
71-
createServerSearchParamsForServerPage,
72-
createPrerenderSearchParamsForClientPage,
73-
createServerParamsForServerSegment,
74-
createPrerenderParamsForClientSegment,
75-
serverHooks,
76-
preloadStyle,
77-
preloadFont,
78-
preconnect,
79-
Postpone,
80-
MetadataBoundary,
81-
ViewportBoundary,
82-
OutletBoundary,
83-
taintObjectReference,
84-
ClientPageRoot,
85-
ClientSegmentRoot,
86-
HTTPAccessFallbackBoundary,
8770
patchFetch,
88-
createMetadataComponents,
8971
// Development only
9072
SegmentViewNode,
9173
}

0 commit comments

Comments
 (0)