refactor: deprecate future directory (#66432)

This removes the previous `server/future` directory and moves everything into the `server` or `server/lib` directories. This is aimed to start to flatten the server application structure.
vercel · Aug 16, 2024 · 09ca5d1 · 09ca5d1
1 parent 8088a2e
commit 09ca5d1
Show file tree

Hide file tree

Showing 207 changed files with 296 additions and 297 deletions.
diff --git a/packages/next-swc/crates/next-core/src/next_import_map.rs b/packages/next-swc/crates/next-core/src/next_import_map.rs
@@ -683,24 +683,24 @@ async fn rsc_aliases(
         match ty {
             ServerContextType::AppSSR { .. } => {
                 alias.extend(indexmap! {
-                    "react/jsx-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-jsx-runtime"),
-                    "react/jsx-dev-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-jsx-dev-runtime"),
-                    "react" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react"),
-                    "react-dom" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-dom"),
-                    "react-server-dom-webpack/client.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
-                    "react-server-dom-turbopack/client.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
+                    "react/jsx-runtime" => format!("next/dist/server/route-modules/app-page/vendored/ssr/react-jsx-runtime"),
+                    "react/jsx-dev-runtime" => format!("next/dist/server/route-modules/app-page/vendored/ssr/react-jsx-dev-runtime"),
+                    "react" => format!("next/dist/server/route-modules/app-page/vendored/ssr/react"),
+                    "react-dom" => format!("next/dist/server/route-modules/app-page/vendored/ssr/react-dom"),
+                    "react-server-dom-webpack/client.edge" => format!("next/dist/server/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
+                    "react-server-dom-turbopack/client.edge" => format!("next/dist/server/route-modules/app-page/vendored/ssr/react-server-dom-turbopack-client-edge"),
                 })
             }
             ServerContextType::AppRSC { .. } | ServerContextType::AppRoute { .. } => {
                 alias.extend(indexmap! {
-                    "react/jsx-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-jsx-runtime"),
-                    "react/jsx-dev-runtime" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-jsx-dev-runtime"),
-                    "react" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react"),
-                    "react-dom" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-dom"),
-                    "react-server-dom-webpack/server.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
-                    "react-server-dom-webpack/server.node" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
-                    "react-server-dom-turbopack/server.edge" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
-                    "react-server-dom-turbopack/server.node" => format!("next/dist/server/future/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
+                    "react/jsx-runtime" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-jsx-runtime"),
+                    "react/jsx-dev-runtime" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-jsx-dev-runtime"),
+                    "react" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react"),
+                    "react-dom" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-dom"),
+                    "react-server-dom-webpack/server.edge" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
+                    "react-server-dom-webpack/server.node" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
+                    "react-server-dom-turbopack/server.edge" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-edge"),
+                    "react-server-dom-turbopack/server.node" => format!("next/dist/server/route-modules/app-page/vendored/rsc/react-server-dom-turbopack-server-node"),
                     "next/navigation" => format!("next/dist/api/navigation.react-server"),
 
                     // Needed to make `react-dom/server` work.

diff --git a/packages/next-swc/crates/next-core/src/next_shared/resolve.rs b/packages/next-swc/crates/next-core/src/next_shared/resolve.rs
@@ -359,7 +359,7 @@ impl AfterResolvePlugin for NextNodeSharedRuntimeResolvePlugin {
         let stem = stem.replace(".shared-runtime", "");
 
         let resource_request = format!(
-            "next/dist/server/future/route-modules/{}/vendored/contexts/{}.js",
+            "next/dist/server/route-modules/{}/vendored/contexts/{}.js",
             match self.context {
                 ServerContextType::Pages { .. } => "pages",
                 ServerContextType::AppRoute { .. } => "app-route",

diff --git a/packages/next/src/build/collect-build-traces.ts b/packages/next/src/build/collect-build-traces.ts
@@ -606,7 +606,7 @@ export async function collectBuildTraces({
 
       for (const type of moduleTypes) {
         const modulePath = require.resolve(
-          `next/dist/server/future/route-modules/${type}/module.compiled`
+          `next/dist/server/route-modules/${type}/module.compiled`
         )
         const relativeModulePath = path.relative(root, modulePath)
 

diff --git a/packages/next/src/build/create-compiler-aliases.ts b/packages/next/src/build/create-compiler-aliases.ts
@@ -272,20 +272,20 @@ export function createRSCAliases(
   if (!isEdgeServer) {
     if (layer === WEBPACK_LAYERS.serverSideRendering) {
       alias = Object.assign(alias, {
-        'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
-        'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-dev-runtime`,
-        react$: `next/dist/server/future/route-modules/app-page/vendored/${layer}/react`,
-        'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-dom`,
-        'react-server-dom-webpack/client.edge$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-client-edge`,
+        'react/jsx-runtime$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
+        'react/jsx-dev-runtime$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-jsx-dev-runtime`,
+        react$: `next/dist/server/route-modules/app-page/vendored/${layer}/react`,
+        'react-dom$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-dom`,
+        'react-server-dom-webpack/client.edge$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-client-edge`,
       })
     } else if (layer === WEBPACK_LAYERS.reactServerComponents) {
       alias = Object.assign(alias, {
-        'react/jsx-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
-        'react/jsx-dev-runtime$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-jsx-dev-runtime`,
-        react$: `next/dist/server/future/route-modules/app-page/vendored/${layer}/react`,
-        'react-dom$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-dom`,
-        'react-server-dom-webpack/server.edge$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-edge`,
-        'react-server-dom-webpack/server.node$': `next/dist/server/future/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-node`,
+        'react/jsx-runtime$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-jsx-runtime`,
+        'react/jsx-dev-runtime$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-jsx-dev-runtime`,
+        react$: `next/dist/server/route-modules/app-page/vendored/${layer}/react`,
+        'react-dom$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-dom`,
+        'react-server-dom-webpack/server.edge$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-edge`,
+        'react-server-dom-webpack/server.node$': `next/dist/server/route-modules/app-page/vendored/${layer}/react-server-dom-webpack-server-node`,
       })
     }
   }

diff --git a/packages/next/src/build/entries.ts b/packages/next/src/build/entries.ts
@@ -62,7 +62,7 @@ import {
   isNonRoutePagesPage,
 } from '../lib/is-internal-component'
 import { isStaticMetadataRouteFile } from '../lib/metadata/is-metadata-route'
-import { RouteKind } from '../server/future/route-kind'
+import { RouteKind } from '../server/route-kind'
 import { encodeToBase64 } from './webpack/loaders/utils'
 import { normalizeCatchAllRoutes } from './normalize-catchall-routes'
 import type { PageExtensions } from './page-extensions-type'

diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -169,7 +169,7 @@ import type { NextEnabledDirectories } from '../server/base-server'
 import { hasCustomExportOutput } from '../export/utils'
 import { interopDefault } from '../lib/interop-default'
 import { formatDynamicImportPath } from '../lib/format-dynamic-import-path'
-import { isInterceptionRouteAppPath } from '../server/future/helpers/interception-routes'
+import { isInterceptionRouteAppPath } from '../server/lib/interception-routes'
 import {
   getTurbopackJsConfig,
   handleEntrypoints,

diff --git a/packages/next/src/build/normalize-catchall-routes.ts b/packages/next/src/build/normalize-catchall-routes.ts
@@ -1,5 +1,5 @@
-import { isInterceptionRouteAppPath } from '../server/future/helpers/interception-routes'
-import { AppPathnameNormalizer } from '../server/future/normalizers/built/app/app-pathname-normalizer'
+import { isInterceptionRouteAppPath } from '../server/lib/interception-routes'
+import { AppPathnameNormalizer } from '../server/normalizers/built/app/app-pathname-normalizer'
 
 /**
  * This function will transform the appPaths in order to support catch-all routes and parallel routes.

diff --git a/packages/next/src/build/templates/app-page.ts b/packages/next/src/build/templates/app-page.ts
@@ -1,6 +1,6 @@
 import type { LoaderTree } from '../../server/lib/app-dir-module'
-import { AppPageRouteModule } from '../../server/future/route-modules/app-page/module.compiled' with { 'turbopack-transition': 'next-ssr' }
-import { RouteKind } from '../../server/future/route-kind'
+import { AppPageRouteModule } from '../../server/route-modules/app-page/module.compiled' with { 'turbopack-transition': 'next-ssr' }
+import { RouteKind } from '../../server/route-kind'
 
 // These are injected by the loader afterwards.
 

diff --git a/packages/next/src/build/templates/app-route.ts b/packages/next/src/build/templates/app-route.ts
@@ -1,8 +1,8 @@
 import {
   AppRouteRouteModule,
   type AppRouteRouteModuleOptions,
-} from '../../server/future/route-modules/app-route/module.compiled'
-import { RouteKind } from '../../server/future/route-kind'
+} from '../../server/route-modules/app-route/module.compiled'
+import { RouteKind } from '../../server/route-kind'
 import { patchFetch as _patchFetch } from '../../server/lib/patch-fetch'
 
 import * as userland from 'VAR_USERLAND'

diff --git a/packages/next/src/build/templates/edge-ssr.ts b/packages/next/src/build/templates/edge-ssr.ts
@@ -17,7 +17,7 @@ declare const incrementalCacheHandler: any
 // const renderToHTML = undefined
 
 import { renderToHTML } from '../../server/render'
-import RouteModule from '../../server/future/route-modules/pages/module'
+import RouteModule from '../../server/route-modules/pages/module'
 
 import type { RequestData } from '../../server/web/types'
 import type { BuildManifest } from '../../server/get-page-files'

diff --git a/packages/next/src/build/templates/pages-api.ts b/packages/next/src/build/templates/pages-api.ts
@@ -1,5 +1,5 @@
-import { PagesAPIRouteModule } from '../../server/future/route-modules/pages-api/module.compiled'
-import { RouteKind } from '../../server/future/route-kind'
+import { PagesAPIRouteModule } from '../../server/route-modules/pages-api/module.compiled'
+import { RouteKind } from '../../server/route-kind'
 
 import { hoist } from './helpers'
 

diff --git a/packages/next/src/build/templates/pages.ts b/packages/next/src/build/templates/pages.ts
@@ -1,5 +1,5 @@
-import { PagesRouteModule } from '../../server/future/route-modules/pages/module.compiled'
-import { RouteKind } from '../../server/future/route-kind'
+import { PagesRouteModule } from '../../server/route-modules/pages/module.compiled'
+import { RouteKind } from '../../server/route-kind'
 import { hoist } from './helpers'
 
 // Import the app and document modules.

diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts
@@ -19,8 +19,8 @@ import type {
   MiddlewareManifest,
 } from './webpack/plugins/middleware-plugin'
 import type { WebpackLayerName } from '../lib/constants'
-import type { AppPageModule } from '../server/future/route-modules/app-page/module'
-import type { RouteModule } from '../server/future/route-modules/route-module'
+import type { AppPageModule } from '../server/route-modules/app-page/module'
+import type { RouteModule } from '../server/route-modules/route-module'
 import type { LoaderTree } from '../server/lib/app-dir-module'
 import type { NextComponentType } from '../shared/lib/utils'
 
@@ -81,12 +81,12 @@ import { nodeFs } from '../server/lib/node-fs-methods'
 import * as ciEnvironment from '../telemetry/ci-info'
 import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
 import { denormalizeAppPagePath } from '../shared/lib/page-path/denormalize-app-path'
-import { RouteKind } from '../server/future/route-kind'
-import { isAppRouteRouteModule } from '../server/future/route-modules/checks'
+import { RouteKind } from '../server/route-kind'
+import { isAppRouteRouteModule } from '../server/route-modules/checks'
 import { interopDefault } from '../lib/interop-default'
 import type { PageExtensions } from './page-extensions-type'
 import { formatDynamicImportPath } from '../lib/format-dynamic-import-path'
-import { isInterceptionRouteAppPath } from '../server/future/helpers/interception-routes'
+import { isInterceptionRouteAppPath } from '../server/lib/interception-routes'
 
 export type ROUTER_TYPE = 'pages' | 'app'
 

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -1300,7 +1300,7 @@ export default async function getBaseWebpackConfig(
                 // Ensure that the app page module is in the client layers, this
                 // enables React to work correctly for RSC.
                 layer: WEBPACK_LAYERS.serverSideRendering,
-                test: /next[\\/]dist[\\/](esm[\\/])?server[\\/]future[\\/]route-modules[\\/]app-page[\\/]module/,
+                test: /next[\\/]dist[\\/](esm[\\/])?server[\\/]route-modules[\\/]app-page[\\/]module/,
               },
               {
                 issuerLayer: isWebpackAppLayer,
@@ -1718,7 +1718,7 @@ export default async function getBaseWebpackConfig(
                 runtime = 'pages'
             }
 
-            resource.request = `next/dist/server/future/route-modules/${runtime}/vendored/contexts/${moduleName}`
+            resource.request = `next/dist/server/route-modules/${runtime}/vendored/contexts/${moduleName}`
           }
         ),
       dev && new MemoryWithGcCachePlugin({ maxGenerations: 5 }),

diff --git a/packages/next/src/build/webpack/loaders/next-app-loader.ts b/packages/next/src/build/webpack/loaders/next-app-loader.ts
@@ -21,8 +21,8 @@ import { promises as fs } from 'fs'
 import { isAppRouteRoute } from '../../../lib/is-app-route-route'
 import { isMetadataRoute } from '../../../lib/metadata/is-metadata-route'
 import type { NextConfig } from '../../../server/config-shared'
-import { AppPathnameNormalizer } from '../../../server/future/normalizers/built/app/app-pathname-normalizer'
-import { AppBundlePathNormalizer } from '../../../server/future/normalizers/built/app/app-bundle-path-normalizer'
+import { AppPathnameNormalizer } from '../../../server/normalizers/built/app/app-pathname-normalizer'
+import { AppBundlePathNormalizer } from '../../../server/normalizers/built/app/app-bundle-path-normalizer'
 import type { MiddlewareConfig } from '../../analysis/get-page-static-info'
 import { getFilenameAndExtension } from './next-metadata-route-loader'
 import { isAppBuiltinNotFoundPage } from '../../utils'

diff --git a/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-ssr-loader/index.ts
@@ -1,11 +1,11 @@
 import type webpack from 'webpack'
 import type { SizeLimit } from '../../../../types'
-import type { PagesRouteModuleOptions } from '../../../../server/future/route-modules/pages/module'
+import type { PagesRouteModuleOptions } from '../../../../server/route-modules/pages/module'
 import type { MiddlewareConfig } from '../../../analysis/get-page-static-info'
 
 import { getModuleBuildInfo } from '../get-module-build-info'
 import { WEBPACK_RESOURCE_QUERIES } from '../../../../lib/constants'
-import { RouteKind } from '../../../../server/future/route-kind'
+import { RouteKind } from '../../../../server/route-kind'
 import { normalizePagePath } from '../../../../shared/lib/page-path/normalize-page-path'
 import { loadEntrypoint } from '../../../load-entrypoint'
 import type { PAGE_TYPES } from '../../../../lib/page-types'

diff --git a/packages/next/src/build/webpack/loaders/next-route-loader/index.ts b/packages/next/src/build/webpack/loaders/next-route-loader/index.ts
@@ -6,7 +6,7 @@ import {
   type ModuleBuildInfo,
   getModuleBuildInfo,
 } from '../get-module-build-info'
-import { RouteKind } from '../../../../server/future/route-kind'
+import { RouteKind } from '../../../../server/route-kind'
 import { normalizePagePath } from '../../../../shared/lib/page-path/normalize-page-path'
 import { decodeFromBase64, encodeToBase64 } from '../utils'
 import { isInstrumentationHookFile } from '../../../utils'

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
@@ -2,7 +2,7 @@ import type {
   FlightRouterState,
   Segment,
 } from '../../../server/app-render/types'
-import { INTERCEPTION_ROUTE_MARKERS } from '../../../server/future/helpers/interception-routes'
+import { INTERCEPTION_ROUTE_MARKERS } from '../../../server/lib/interception-routes'
 import {
   isGroupSegment,
   DEFAULT_SEGMENT_KEY,

diff --git a/...t/src/client/components/router-reducer/reducers/has-interception-route-in-current-tree.ts b/...t/src/client/components/router-reducer/reducers/has-interception-route-in-current-tree.ts
@@ -1,5 +1,5 @@
 import type { FlightRouterState } from '../../../../server/app-render/types'
-import { isInterceptionRouteAppPath } from '../../../../server/future/helpers/interception-routes'
+import { isInterceptionRouteAppPath } from '../../../../server/lib/interception-routes'
 
 export function hasInterceptionRouteInCurrentTree([
   segment,

diff --git a/packages/next/src/export/routes/app-page.ts b/packages/next/src/export/routes/app-page.ts
@@ -16,7 +16,7 @@ import {
   RSC_SUFFIX,
 } from '../../lib/constants'
 import { hasNextSupport } from '../../telemetry/ci-info'
-import { lazyRenderAppPage } from '../../server/future/route-modules/app-page/module.render'
+import { lazyRenderAppPage } from '../../server/route-modules/app-page/module.render'
 import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
 
 export const enum ExportedAppPageFiles {

diff --git a/packages/next/src/export/routes/app-route.ts b/packages/next/src/export/routes/app-route.ts
@@ -1,6 +1,6 @@
 import type { ExportRouteResult, FileWriter } from '../types'
-import type AppRouteRouteModule from '../../server/future/route-modules/app-route/module'
-import type { AppRouteRouteHandlerContext } from '../../server/future/route-modules/app-route/module'
+import type AppRouteRouteModule from '../../server/route-modules/app-route/module'
+import type { AppRouteRouteHandlerContext } from '../../server/route-modules/app-route/module'
 import type { IncrementalCache } from '../../server/lib/incremental-cache'
 
 import { join } from 'path'
@@ -10,7 +10,7 @@ import {
   NEXT_META_SUFFIX,
 } from '../../lib/constants'
 import { NodeNextRequest } from '../../server/base-http/node'
-import { RouteModuleLoader } from '../../server/future/helpers/module-loader/route-module-loader'
+import { RouteModuleLoader } from '../../server/lib/module-loader/route-module-loader'
 import {
   NextRequestAdapter,
   signalFromNodeResponse,

diff --git a/packages/next/src/export/routes/pages.ts b/packages/next/src/export/routes/pages.ts
@@ -18,7 +18,7 @@ import {
 import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
 import AmpHtmlValidator from 'next/dist/compiled/amphtml-validator'
 import { FileType, fileExists } from '../../lib/file-exists'
-import { lazyRenderPagesPage } from '../../server/future/route-modules/pages/module.render'
+import { lazyRenderPagesPage } from '../../server/route-modules/pages/module.render'
 
 export const enum ExportedPagesFiles {
   HTML = 'HTML',

diff --git a/packages/next/src/lib/create-client-router-filter.ts b/packages/next/src/lib/create-client-router-filter.ts
@@ -7,7 +7,7 @@ import { tryToParsePath } from './try-to-parse-path'
 import {
   extractInterceptionRouteInformation,
   isInterceptionRouteAppPath,
-} from '../server/future/helpers/interception-routes'
+} from '../server/lib/interception-routes'
 
 export function createClientRouterFilter(
   paths: string[],

diff --git a/packages/next/src/lib/generate-interception-routes-rewrites.ts b/packages/next/src/lib/generate-interception-routes-rewrites.ts
@@ -4,7 +4,7 @@ import {
   INTERCEPTION_ROUTE_MARKERS,
   extractInterceptionRouteInformation,
   isInterceptionRouteAppPath,
-} from '../server/future/helpers/interception-routes'
+} from '../server/lib/interception-routes'
 import type { Rewrite } from './load-custom-routes'
 
 // a function that converts normalised paths (e.g. /foo/[bar]/[baz]) to the format expected by pathToRegexp (e.g. /foo/:bar/:baz)

diff --git a/packages/next/src/server/app-render/action-handler.ts b/packages/next/src/server/app-render/action-handler.ts
@@ -8,7 +8,7 @@ import type { WebNextRequest } from '../base-http/web'
 import type { SizeLimit } from '../../types'
 import type { RequestStore } from '../../client/components/request-async-storage.external'
 import type { AppRenderContext, GenerateFlight } from './app-render'
-import type { AppPageModule } from '../../server/future/route-modules/app-page/module'
+import type { AppPageModule } from '../../server/route-modules/app-page/module'
 
 import {
   RSC_HEADER,