From 015cbdb2d7b7e951c8dcf424ee2ab24a0645170b Mon Sep 17 00:00:00 2001 From: Josh Story Date: Fri, 20 Sep 2024 13:40:14 -0700 Subject: [PATCH] relocate dynamic APIs These files are about to change. This commit just moves them to make diff and history tracking easier to follow --- packages/next/headers.d.ts | 2 +- packages/next/headers.js | 2 +- packages/next/src/api/headers.ts | 2 +- packages/next/src/build/utils.ts | 4 ++-- .../next/src/client/components/client-page.tsx | 4 ++-- packages/next/src/client/components/navigation.ts | 2 +- .../router-reducer/compute-changed-path.ts | 2 +- .../static-generation-async-storage.external.ts | 2 +- packages/next/src/export/routes/app-page.ts | 2 +- packages/next/src/export/routes/app-route.ts | 2 +- packages/next/src/export/worker.ts | 4 ++-- packages/next/src/lib/metadata/metadata.tsx | 2 +- packages/next/src/lib/metadata/resolve-metadata.ts | 2 +- packages/next/src/server/app-render/app-render.tsx | 2 +- .../server/app-render/create-component-tree.tsx | 2 +- packages/next/src/server/app-render/entry-base.ts | 14 +++++--------- .../next/src/server/app-render/postponed-state.ts | 4 ++-- .../async-storage/with-static-generation-store.ts | 2 +- packages/next/src/server/base-server.ts | 4 ++-- packages/next/src/server/dev/next-dev-server.ts | 2 +- packages/next/src/server/next-server.ts | 2 +- .../components => server/request}/draft-mode.ts | 6 +++--- .../request}/fallback-params.ts | 6 +++--- .../components => server/request}/headers.ts | 14 +++++++------- .../components => server/request}/params.ts | 0 .../components => server/request}/search-params.ts | 6 +++--- .../src/server/route-matchers/route-matcher.ts | 2 +- .../next/src/server/route-matches/route-match.ts | 2 +- .../src/server/route-modules/app-page/module.ts | 2 +- packages/next/src/server/web-server.ts | 2 +- .../lib/hooks-client-context.shared-runtime.ts | 2 +- packages/next/src/shared/lib/router/adapters.tsx | 2 +- packages/next/src/shared/lib/router/router.ts | 2 +- .../lib/router/utils/middleware-route-matcher.ts | 2 +- .../shared/lib/router/utils/prepare-destination.ts | 2 +- .../src/shared/lib/router/utils/route-matcher.ts | 2 +- .../app-dir/actions/app/redirect-target/page.js | 2 +- 37 files changed, 57 insertions(+), 61 deletions(-) rename packages/next/src/{client/components => server/request}/draft-mode.ts (79%) rename packages/next/src/{client/components => server/request}/fallback-params.ts (91%) rename packages/next/src/{client/components => server/request}/headers.ts (82%) rename packages/next/src/{client/components => server/request}/params.ts (100%) rename packages/next/src/{client/components => server/request}/search-params.ts (90%) diff --git a/packages/next/headers.d.ts b/packages/next/headers.d.ts index b0db0bacc7bb9..f48ca4e26c287 100644 --- a/packages/next/headers.d.ts +++ b/packages/next/headers.d.ts @@ -1 +1 @@ -export * from './dist/client/components/headers' +export * from './dist/server/request/headers' diff --git a/packages/next/headers.js b/packages/next/headers.js index 64d05b351ab48..3fc596b76c475 100644 --- a/packages/next/headers.js +++ b/packages/next/headers.js @@ -1 +1 @@ -module.exports = require('./dist/client/components/headers') +module.exports = require('./dist/server/request/headers') diff --git a/packages/next/src/api/headers.ts b/packages/next/src/api/headers.ts index 3f2279ff7dc5c..80f57fa8f5f8d 100644 --- a/packages/next/src/api/headers.ts +++ b/packages/next/src/api/headers.ts @@ -1 +1 @@ -export * from '../client/components/headers' +export * from '../server/request/headers' diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts index 6ffcb63adcfb5..46f1ffb2707d1 100644 --- a/packages/next/src/build/utils.ts +++ b/packages/next/src/build/utils.ts @@ -89,13 +89,13 @@ import type { PageExtensions } from './page-extensions-type' import { formatDynamicImportPath } from '../lib/format-dynamic-import-path' import { isInterceptionRouteAppPath } from '../server/lib/interception-routes' import { checkIsRoutePPREnabled } from '../server/lib/experimental/ppr' -import type { Params } from '../client/components/params' +import type { Params } from '../server/request/params' import { FallbackMode } from '../lib/fallback' import { fallbackModeToStaticPathsResult, parseStaticPathsResult, } from '../lib/fallback' -import { getParamKeys } from '../client/components/fallback-params' +import { getParamKeys } from '../server/request/fallback-params' import type { OutgoingHttpHeaders } from 'http' export type ROUTER_TYPE = 'pages' | 'app' diff --git a/packages/next/src/client/components/client-page.tsx b/packages/next/src/client/components/client-page.tsx index 92f72b83bcd51..bafacc9eb9e90 100644 --- a/packages/next/src/client/components/client-page.tsx +++ b/packages/next/src/client/components/client-page.tsx @@ -9,9 +9,9 @@ export function ClientPageRoot({ }) { if (typeof window === 'undefined') { const { createDynamicallyTrackedParams } = - require('./fallback-params') as typeof import('./fallback-params') + require('../../server/request/fallback-params') as typeof import('../../server/request/fallback-params') const { createDynamicallyTrackedSearchParams } = - require('./search-params') as typeof import('./search-params') + require('../../server/request/search-params') as typeof import('../../server/request/search-params') // We expect to be passed searchParams but even if we aren't we can construct one from // an empty object. We only do this if we are in a static generation as a performance diff --git a/packages/next/src/client/components/navigation.ts b/packages/next/src/client/components/navigation.ts index aae8e77ae8dba..b7ed000325179 100644 --- a/packages/next/src/client/components/navigation.ts +++ b/packages/next/src/client/components/navigation.ts @@ -1,5 +1,5 @@ import type { FlightRouterState } from '../../server/app-render/types' -import type { Params } from './params' +import type { Params } from '../../server/request/params' import { useContext, useMemo } from 'react' import { diff --git a/packages/next/src/client/components/router-reducer/compute-changed-path.ts b/packages/next/src/client/components/router-reducer/compute-changed-path.ts index bba25ddf76875..4df41cd574206 100644 --- a/packages/next/src/client/components/router-reducer/compute-changed-path.ts +++ b/packages/next/src/client/components/router-reducer/compute-changed-path.ts @@ -3,7 +3,7 @@ import type { Segment, } from '../../../server/app-render/types' import { INTERCEPTION_ROUTE_MARKERS } from '../../../server/lib/interception-routes' -import type { Params } from '../params' +import type { Params } from '../../../server/request/params' import { isGroupSegment, DEFAULT_SEGMENT_KEY, diff --git a/packages/next/src/client/components/static-generation-async-storage.external.ts b/packages/next/src/client/components/static-generation-async-storage.external.ts index 1393424638721..f14af9874144b 100644 --- a/packages/next/src/client/components/static-generation-async-storage.external.ts +++ b/packages/next/src/client/components/static-generation-async-storage.external.ts @@ -3,7 +3,7 @@ import type { IncrementalCache } from '../../server/lib/incremental-cache' import type { DynamicServerError } from './hooks-server-context' import type { FetchMetrics } from '../../server/base-http' import type { Revalidate } from '../../server/lib/revalidate' -import type { FallbackRouteParams } from './fallback-params' +import type { FallbackRouteParams } from '../../server/request/fallback-params' // Share the instance module in the next-shared layer import { staticGenerationAsyncStorage } from './static-generation-async-storage-instance' with { 'turbopack-transition': 'next-shared' } diff --git a/packages/next/src/export/routes/app-page.ts b/packages/next/src/export/routes/app-page.ts index bfff04fced651..8f4aef67412ec 100644 --- a/packages/next/src/export/routes/app-page.ts +++ b/packages/next/src/export/routes/app-page.ts @@ -22,7 +22,7 @@ import { NodeNextRequest, NodeNextResponse } from '../../server/base-http/node' import { NEXT_IS_PRERENDER_HEADER } from '../../client/components/app-router-headers' import type { FetchMetrics } from '../../server/base-http' import type { StaticGenerationStore } from '../../client/components/static-generation-async-storage.external' -import type { FallbackRouteParams } from '../../client/components/fallback-params' +import type { FallbackRouteParams } from '../../server/request/fallback-params' export const enum ExportedAppPageFiles { HTML = 'HTML', diff --git a/packages/next/src/export/routes/app-route.ts b/packages/next/src/export/routes/app-route.ts index c72d1004e9cb6..938c98661da1b 100644 --- a/packages/next/src/export/routes/app-route.ts +++ b/packages/next/src/export/routes/app-route.ts @@ -27,7 +27,7 @@ import { isStaticGenEnabled } from '../../server/route-modules/app-route/helpers import type { ExperimentalConfig } from '../../server/config-shared' import { isMetadataRouteFile } from '../../lib/metadata/is-metadata-route' import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths' -import type { Params } from '../../client/components/params' +import type { Params } from '../../server/request/params' export const enum ExportedAppRouteFiles { BODY = 'BODY', diff --git a/packages/next/src/export/worker.ts b/packages/next/src/export/worker.ts index 4b40c0d303814..da601af742e75 100644 --- a/packages/next/src/export/worker.ts +++ b/packages/next/src/export/worker.ts @@ -40,11 +40,11 @@ import { turborepoTraceAccess, TurborepoAccessTraceResult, } from '../build/turborepo-access-trace' -import type { Params } from '../client/components/params' +import type { Params } from '../server/request/params' import { getFallbackRouteParams, type FallbackRouteParams, -} from '../client/components/fallback-params' +} from '../server/request/fallback-params' import { needsExperimentalReact } from '../lib/needs-experimental-react' const envConfig = require('../shared/lib/runtime-config.external') diff --git a/packages/next/src/lib/metadata/metadata.tsx b/packages/next/src/lib/metadata/metadata.tsx index ef993591c3447..ba79f472dad0f 100644 --- a/packages/next/src/lib/metadata/metadata.tsx +++ b/packages/next/src/lib/metadata/metadata.tsx @@ -30,7 +30,7 @@ import type { } from './types/metadata-interface' import { isNotFoundError } from '../../client/components/not-found' import type { MetadataContext } from './types/resolvers' -import type { CreateDynamicallyTrackedParams } from '../../client/components/fallback-params' +import type { CreateDynamicallyTrackedParams } from '../../server/request/fallback-params' import type { StaticGenerationStore } from '../../client/components/static-generation-async-storage.external' import { trackFallbackParamAccessed } from '../../server/app-render/dynamic-rendering' diff --git a/packages/next/src/lib/metadata/resolve-metadata.ts b/packages/next/src/lib/metadata/resolve-metadata.ts index fc5d64bcfb805..614c6ecf40ecc 100644 --- a/packages/next/src/lib/metadata/resolve-metadata.ts +++ b/packages/next/src/lib/metadata/resolve-metadata.ts @@ -49,7 +49,7 @@ import { getTracer } from '../../server/lib/trace/tracer' import { ResolveMetadataSpan } from '../../server/lib/trace/constants' import { PAGE_SEGMENT_KEY } from '../../shared/lib/segment' import * as Log from '../../build/output/log' -import type { CreateDynamicallyTrackedParams } from '../../client/components/fallback-params' +import type { CreateDynamicallyTrackedParams } from '../../server/request/fallback-params' type StaticIcons = Pick diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx index 48aca58478e0d..71252f1cd9f76 100644 --- a/packages/next/src/server/app-render/app-render.tsx +++ b/packages/next/src/server/app-render/app-render.tsx @@ -137,7 +137,7 @@ import { createInitialRouterState } from '../../client/components/router-reducer import { createMutableActionQueue } from '../../shared/lib/router/action-queue' import { getRevalidateReason } from '../instrumentation/utils' import { PAGE_SEGMENT_KEY } from '../../shared/lib/segment' -import type { FallbackRouteParams } from '../../client/components/fallback-params' +import type { FallbackRouteParams } from '../request/fallback-params' import { DynamicServerError } from '../../client/components/hooks-server-context' import { type ReactServerPrerenderResolveToType, diff --git a/packages/next/src/server/app-render/create-component-tree.tsx b/packages/next/src/server/app-render/create-component-tree.tsx index 6f7302a04013a..540d5aa0da150 100644 --- a/packages/next/src/server/app-render/create-component-tree.tsx +++ b/packages/next/src/server/app-render/create-component-tree.tsx @@ -19,7 +19,7 @@ import { getTracer } from '../lib/trace/tracer' import { NextNodeServerSpan } from '../lib/trace/constants' import { StaticGenBailoutError } from '../../client/components/static-generation-bailout' import type { LoadingModuleData } from '../../shared/lib/app-router-context.shared-runtime' -import type { Params } from '../../client/components/params' +import type { Params } from '../request/params' /** * Use the provided loader tree to create the React Component tree. diff --git a/packages/next/src/server/app-render/entry-base.ts b/packages/next/src/server/app-render/entry-base.ts index 8a3d9687d5331..7731f017d3986 100644 --- a/packages/next/src/server/app-render/entry-base.ts +++ b/packages/next/src/server/app-render/entry-base.ts @@ -19,21 +19,17 @@ import { ClientPageRoot } from '../../client/components/client-page' import { createUntrackedSearchParams, createDynamicallyTrackedSearchParams, -} from '../../client/components/search-params' -import { createDynamicallyTrackedParams } from '../../client/components/fallback-params' +} from '../request/search-params' +import { createDynamicallyTrackedParams } from '../request/fallback-params' import * as serverHooks from '../../client/components/hooks-server-context' import { NotFoundBoundary } from '../../client/components/not-found-boundary' import { patchFetch as _patchFetch } from '../lib/patch-fetch' // not being used but needs to be included in the client manifest for /_not-found import '../../client/components/error-boundary' -import { - preloadStyle, - preloadFont, - preconnect, -} from '../../server/app-render/rsc/preloads' -import { Postpone } from '../../server/app-render/rsc/postpone' -import { taintObjectReference } from '../../server/app-render/rsc/taint' +import { preloadStyle, preloadFont, preconnect } from './rsc/preloads' +import { Postpone } from './rsc/postpone' +import { taintObjectReference } from './rsc/taint' // patchFetch makes use of APIs such as `React.unstable_postpone` which are only available // in the experimental channel of React, so export it from here so that it comes from the bundled runtime diff --git a/packages/next/src/server/app-render/postponed-state.ts b/packages/next/src/server/app-render/postponed-state.ts index 9aed26b2b0a22..35db808dd62da 100644 --- a/packages/next/src/server/app-render/postponed-state.ts +++ b/packages/next/src/server/app-render/postponed-state.ts @@ -1,5 +1,5 @@ -import type { FallbackRouteParams } from '../../client/components/fallback-params' -import type { Params } from '../../client/components/params' +import type { FallbackRouteParams } from '../../server/request/fallback-params' +import type { Params } from '../request/params' export enum DynamicState { /** diff --git a/packages/next/src/server/async-storage/with-static-generation-store.ts b/packages/next/src/server/async-storage/with-static-generation-store.ts index 885e4a48accd3..2b289471df8f7 100644 --- a/packages/next/src/server/async-storage/with-static-generation-store.ts +++ b/packages/next/src/server/async-storage/with-static-generation-store.ts @@ -5,7 +5,7 @@ import type { IncrementalCache } from '../lib/incremental-cache' import type { RenderOptsPartial } from '../app-render/types' import type { FetchMetric } from '../base-http' import type { RequestLifecycleOpts } from '../base-server' -import type { FallbackRouteParams } from '../../client/components/fallback-params' +import type { FallbackRouteParams } from '../../server/request/fallback-params' import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths' diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index 41df0192ae9dc..c67f9737a800a 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -1,11 +1,11 @@ import type { __ApiPreviewProps } from './api-utils' import type { LoadComponentsReturnType } from './load-components' import type { MiddlewareRouteMatch } from '../shared/lib/router/utils/middleware-route-matcher' -import type { Params } from '../client/components/params' +import type { Params } from '../server/request/params' import { type FallbackRouteParams, getFallbackRouteParams, -} from '../client/components/fallback-params' +} from './request/fallback-params' import type { NextConfig, NextConfigComplete } from './config-shared' import type { NextParsedUrlQuery, diff --git a/packages/next/src/server/dev/next-dev-server.ts b/packages/next/src/server/dev/next-dev-server.ts index bd59359560084..091e8080b1985 100644 --- a/packages/next/src/server/dev/next-dev-server.ts +++ b/packages/next/src/server/dev/next-dev-server.ts @@ -1,7 +1,7 @@ import type { FindComponentsResult, NodeRequestHandler } from '../next-server' import type { LoadComponentsReturnType } from '../load-components' import type { Options as ServerOptions } from '../next-server' -import type { Params } from '../../client/components/params' +import type { Params } from '../request/params' import type { ParsedUrl } from '../../shared/lib/router/utils/parse-url' import type { ParsedUrlQuery } from 'querystring' import type { UrlWithParsedQuery } from 'url' diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts index 52177e35a8cff..e4db0e68b71d2 100644 --- a/packages/next/src/server/next-server.ts +++ b/packages/next/src/server/next-server.ts @@ -14,7 +14,7 @@ import type { FetchEventResult } from './web/types' import type { PrerenderManifest } from '../build' import type { PagesManifest } from '../build/webpack/plugins/pages-manifest-plugin' import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta' -import type { Params } from '../client/components/params' +import type { Params } from './request/params' import type { MiddlewareRouteMatch } from '../shared/lib/router/utils/middleware-route-matcher' import type { RouteMatch } from './route-matches/route-match' import type { IncomingMessage, ServerResponse } from 'http' diff --git a/packages/next/src/client/components/draft-mode.ts b/packages/next/src/server/request/draft-mode.ts similarity index 79% rename from packages/next/src/client/components/draft-mode.ts rename to packages/next/src/server/request/draft-mode.ts index e1c5cf94fd58e..a2c225ba77123 100644 --- a/packages/next/src/client/components/draft-mode.ts +++ b/packages/next/src/server/request/draft-mode.ts @@ -1,7 +1,7 @@ -import type { DraftModeProvider } from '../../server/async-storage/draft-mode-provider' +import type { DraftModeProvider } from '../async-storage/draft-mode-provider' -import { staticGenerationAsyncStorage } from './static-generation-async-storage.external' -import { trackDynamicDataAccessed } from '../../server/app-render/dynamic-rendering' +import { staticGenerationAsyncStorage } from '../../client/components/static-generation-async-storage.external' +import { trackDynamicDataAccessed } from '../app-render/dynamic-rendering' export class DraftMode { /** diff --git a/packages/next/src/client/components/fallback-params.ts b/packages/next/src/server/request/fallback-params.ts similarity index 91% rename from packages/next/src/client/components/fallback-params.ts rename to packages/next/src/server/request/fallback-params.ts index a31b6df78d438..67b0e5f70f10d 100644 --- a/packages/next/src/client/components/fallback-params.ts +++ b/packages/next/src/server/request/fallback-params.ts @@ -1,9 +1,9 @@ -import { trackFallbackParamAccessed } from '../../server/app-render/dynamic-rendering' -import { ReflectAdapter } from '../../server/web/spec-extension/adapters/reflect' +import { trackFallbackParamAccessed } from '../app-render/dynamic-rendering' +import { ReflectAdapter } from '../web/spec-extension/adapters/reflect' import { getRouteMatcher } from '../../shared/lib/router/utils/route-matcher' import { getRouteRegex } from '../../shared/lib/router/utils/route-regex' import type { Params } from './params' -import { staticGenerationAsyncStorage } from './static-generation-async-storage.external' +import { staticGenerationAsyncStorage } from '../../client/components/static-generation-async-storage.external' export type FallbackRouteParams = ReadonlyMap diff --git a/packages/next/src/client/components/headers.ts b/packages/next/src/server/request/headers.ts similarity index 82% rename from packages/next/src/client/components/headers.ts rename to packages/next/src/server/request/headers.ts index 38432c01bc31d..540b199ce6961 100644 --- a/packages/next/src/client/components/headers.ts +++ b/packages/next/src/server/request/headers.ts @@ -1,14 +1,14 @@ import { type ReadonlyRequestCookies, RequestCookiesAdapter, -} from '../../server/web/spec-extension/adapters/request-cookies' -import { HeadersAdapter } from '../../server/web/spec-extension/adapters/headers' -import { RequestCookies } from '../../server/web/spec-extension/cookies' -import { actionAsyncStorage } from './action-async-storage.external' +} from '../web/spec-extension/adapters/request-cookies' +import { HeadersAdapter } from '../web/spec-extension/adapters/headers' +import { RequestCookies } from '../web/spec-extension/cookies' +import { actionAsyncStorage } from '../../client/components/action-async-storage.external' import { DraftMode } from './draft-mode' -import { trackDynamicDataAccessed } from '../../server/app-render/dynamic-rendering' -import { staticGenerationAsyncStorage } from './static-generation-async-storage.external' -import { getExpectedRequestStore } from './request-async-storage.external' +import { trackDynamicDataAccessed } from '../app-render/dynamic-rendering' +import { staticGenerationAsyncStorage } from '../../client/components/static-generation-async-storage.external' +import { getExpectedRequestStore } from '../../client/components/request-async-storage.external' /** * This function allows you to read the HTTP incoming request headers in diff --git a/packages/next/src/client/components/params.ts b/packages/next/src/server/request/params.ts similarity index 100% rename from packages/next/src/client/components/params.ts rename to packages/next/src/server/request/params.ts diff --git a/packages/next/src/client/components/search-params.ts b/packages/next/src/server/request/search-params.ts similarity index 90% rename from packages/next/src/client/components/search-params.ts rename to packages/next/src/server/request/search-params.ts index deab85d22c5ec..1a8a7fe5e98a6 100644 --- a/packages/next/src/client/components/search-params.ts +++ b/packages/next/src/server/request/search-params.ts @@ -1,8 +1,8 @@ import type { ParsedUrlQuery } from 'querystring' -import { staticGenerationAsyncStorage } from './static-generation-async-storage.external' -import { trackDynamicDataAccessed } from '../../server/app-render/dynamic-rendering' -import { ReflectAdapter } from '../../server/web/spec-extension/adapters/reflect' +import { staticGenerationAsyncStorage } from '../../client/components/static-generation-async-storage.external' +import { trackDynamicDataAccessed } from '../app-render/dynamic-rendering' +import { ReflectAdapter } from '../web/spec-extension/adapters/reflect' /** * Takes a ParsedUrlQuery object and either returns it unmodified or returns an empty object diff --git a/packages/next/src/server/route-matchers/route-matcher.ts b/packages/next/src/server/route-matchers/route-matcher.ts index d02b10f29b152..0dadaad131dfc 100644 --- a/packages/next/src/server/route-matchers/route-matcher.ts +++ b/packages/next/src/server/route-matchers/route-matcher.ts @@ -1,6 +1,6 @@ import type { RouteMatch } from '../route-matches/route-match' import type { RouteDefinition } from '../route-definitions/route-definition' -import type { Params } from '../../client/components/params' +import type { Params } from '../request/params' import { isDynamicRoute } from '../../shared/lib/router/utils' import { diff --git a/packages/next/src/server/route-matches/route-match.ts b/packages/next/src/server/route-matches/route-match.ts index dc5112e37ad5d..bab484ebc7c11 100644 --- a/packages/next/src/server/route-matches/route-match.ts +++ b/packages/next/src/server/route-matches/route-match.ts @@ -1,4 +1,4 @@ -import type { Params } from '../../client/components/params' +import type { Params } from '../request/params' import type { RouteDefinition } from '../route-definitions/route-definition' /** diff --git a/packages/next/src/server/route-modules/app-page/module.ts b/packages/next/src/server/route-modules/app-page/module.ts index f67f1cab709d8..187e2da4c2f9b 100644 --- a/packages/next/src/server/route-modules/app-page/module.ts +++ b/packages/next/src/server/route-modules/app-page/module.ts @@ -13,7 +13,7 @@ import { import * as vendoredContexts from './vendored/contexts/entrypoints' import type { BaseNextRequest, BaseNextResponse } from '../../base-http' import type { ServerComponentsHmrCache } from '../../response-cache' -import type { FallbackRouteParams } from '../../../client/components/fallback-params' +import type { FallbackRouteParams } from '../../request/fallback-params' let vendoredReactRSC let vendoredReactSSR diff --git a/packages/next/src/server/web-server.ts b/packages/next/src/server/web-server.ts index 93c1da49f9519..12d2c12d9ae7d 100644 --- a/packages/next/src/server/web-server.ts +++ b/packages/next/src/server/web-server.ts @@ -1,7 +1,7 @@ import type { WebNextRequest, WebNextResponse } from './base-http/web' import type RenderResult from './render-result' import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta' -import type { Params } from '../client/components/params' +import type { Params } from './request/params' import type { LoadComponentsReturnType } from './load-components' import type { LoadedRenderOpts, diff --git a/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts b/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts index 44b146375f309..9ad6352378a93 100644 --- a/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts +++ b/packages/next/src/shared/lib/hooks-client-context.shared-runtime.ts @@ -1,7 +1,7 @@ 'use client' import { createContext } from 'react' -import type { Params } from '../../client/components/params' +import type { Params } from '../../server/request/params' export const SearchParamsContext = createContext(null) export const PathnameContext = createContext(null) diff --git a/packages/next/src/shared/lib/router/adapters.tsx b/packages/next/src/shared/lib/router/adapters.tsx index 61dff439024cb..cc3e34b3dfd04 100644 --- a/packages/next/src/shared/lib/router/adapters.tsx +++ b/packages/next/src/shared/lib/router/adapters.tsx @@ -1,5 +1,5 @@ import type { AppRouterInstance } from '../app-router-context.shared-runtime' -import type { Params } from '../../../client/components/params' +import type { Params } from '../../../server/request/params' import type { NextRouter } from './router' import React, { useMemo, useRef } from 'react' diff --git a/packages/next/src/shared/lib/router/router.ts b/packages/next/src/shared/lib/router/router.ts index 9fd04fe5e5cd6..91d7de55f36a1 100644 --- a/packages/next/src/shared/lib/router/router.ts +++ b/packages/next/src/shared/lib/router/router.ts @@ -43,7 +43,7 @@ import { isBot } from './utils/is-bot' import { omit } from './utils/omit' import { interpolateAs } from './utils/interpolate-as' import { handleSmoothScroll } from './utils/handle-smooth-scroll' -import type { Params } from '../../../client/components/params' +import type { Params } from '../../../server/request/params' declare global { interface Window { diff --git a/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts b/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts index 21dc83f65ee77..9a605b0808f78 100644 --- a/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts +++ b/packages/next/src/shared/lib/router/utils/middleware-route-matcher.ts @@ -1,6 +1,6 @@ import type { BaseNextRequest } from '../../../../server/base-http' import type { MiddlewareMatcher } from '../../../../build/analysis/get-page-static-info' -import type { Params } from '../../../../client/components/params' +import type { Params } from '../../../../server/request/params' import { matchHas } from './prepare-destination' export interface MiddlewareRouteMatch { diff --git a/packages/next/src/shared/lib/router/utils/prepare-destination.ts b/packages/next/src/shared/lib/router/utils/prepare-destination.ts index 95b1fab3da7cd..112c2a8150971 100644 --- a/packages/next/src/shared/lib/router/utils/prepare-destination.ts +++ b/packages/next/src/shared/lib/router/utils/prepare-destination.ts @@ -13,7 +13,7 @@ import { } from '../../../../server/lib/interception-routes' import { NEXT_RSC_UNION_QUERY } from '../../../../client/components/app-router-headers' import { getCookieParser } from '../../../../server/api-utils/get-cookie-parser' -import type { Params } from '../../../../client/components/params' +import type { Params } from '../../../../server/request/params' /** * Ensure only a-zA-Z are used for param names for proper interpolating diff --git a/packages/next/src/shared/lib/router/utils/route-matcher.ts b/packages/next/src/shared/lib/router/utils/route-matcher.ts index 6c5cf560fbc18..2e8d162c9c3a5 100644 --- a/packages/next/src/shared/lib/router/utils/route-matcher.ts +++ b/packages/next/src/shared/lib/router/utils/route-matcher.ts @@ -1,6 +1,6 @@ import type { RouteRegex } from './route-regex' import { DecodeError } from '../../utils' -import type { Params } from '../../../../client/components/params' +import type { Params } from '../../../../server/request/params' export interface RouteMatchFn { (pathname: string | null | undefined): false | Params diff --git a/test/e2e/app-dir/actions/app/redirect-target/page.js b/test/e2e/app-dir/actions/app/redirect-target/page.js index 8dbe845d05f26..2c1fda7ef6518 100644 --- a/test/e2e/app-dir/actions/app/redirect-target/page.js +++ b/test/e2e/app-dir/actions/app/redirect-target/page.js @@ -1,4 +1,4 @@ -import { cookies } from 'next/dist/client/components/headers' +import { cookies } from 'next/dist/server/request/headers' export default function Page() { const redirectCookie = cookies().get('redirect')