less config inlining

mischnic · mischnic · commit 341874822cc5 · 2025-12-05T12:19:32.000+01:00
diff --git a/crates/next-api/src/pages.rs b/crates/next-api/src/pages.rs
@@ -904,7 +904,6 @@ impl PageEndpoint {
                     this.original_name.clone(),
                     *this.pages_structure,
                     runtime,
-                    this.pages_project.project().next_config(),
                 )
                 .await?;
 
diff --git a/crates/next-core/src/next_app/app_page_entry.rs b/crates/next-core/src/next_app/app_page_entry.rs
@@ -122,7 +122,6 @@ pub async fn get_app_page_entry(
             project_root.clone(),
             rsc_entry,
             page,
-            next_config,
         );
     };
 
@@ -141,21 +140,14 @@ async fn wrap_edge_page(
     project_root: FileSystemPath,
     entry: ResolvedVc<Box<dyn Module>>,
     page: AppPage,
-    next_config: Vc<NextConfig>,
 ) -> Result<Vc<Box<dyn Module>>> {
     const INNER: &str = "INNER_PAGE_ENTRY";
 
-    let next_config_val = &*next_config.await?;
-
     let source = load_next_js_template(
         "edge-ssr-app.js",
         project_root.clone(),
         [("VAR_USERLAND", INNER), ("VAR_PAGE", &page.to_string())],
-        [
-            // TODO do we really need to pass the entire next config here?
-            // This is bad for invalidation as any config change will invalidate this
-            ("nextConfig", &*serde_json::to_string(next_config_val)?),
-        ],
+        [],
         [("incrementalCacheHandler", None)],
     )
     .await?;
diff --git a/crates/next-core/src/next_app/app_route_entry.rs b/crates/next-core/src/next_app/app_route_entry.rs
@@ -113,7 +113,6 @@ pub async fn get_app_route_entry(
             project_root,
             rsc_entry,
             page,
-            next_config,
         );
     }
 
@@ -132,17 +131,14 @@ async fn wrap_edge_route(
     project_root: FileSystemPath,
     entry: ResolvedVc<Box<dyn Module>>,
     page: AppPage,
-    next_config: Vc<NextConfig>,
 ) -> Result<Vc<Box<dyn Module>>> {
     let inner = rcstr!("INNER_ROUTE_ENTRY");
 
-    let next_config = &*next_config.await?;
-
     let source = load_next_js_template(
         "edge-app-route.js",
         project_root.clone(),
         [("VAR_USERLAND", &*inner), ("VAR_PAGE", &page.to_string())],
-        [("nextConfig", &*serde_json::to_string(next_config)?)],
+        [],
         [],
     )
     .await?;
diff --git a/crates/next-core/src/next_pages/page_entry.rs b/crates/next-core/src/next_pages/page_entry.rs
@@ -16,7 +16,6 @@ use turbopack_core::{
 };
 
 use crate::{
-    next_config::NextConfig,
     next_edge::entry::wrap_edge_entry,
     pages_structure::{PagesStructure, PagesStructureItem},
     util::{NextRuntime, file_content_rope, load_next_js_template, pages_function_name},
@@ -39,7 +38,6 @@ pub async fn create_page_ssr_entry_module(
     next_original_name: RcStr,
     pages_structure: Vc<PagesStructure>,
     runtime: NextRuntime,
-    next_config: Vc<NextConfig>,
 ) -> Result<Vc<PageSsrEntryModule>> {
     let definition_page = next_original_name;
     let definition_pathname = pathname;
@@ -99,11 +97,7 @@ pub async fn create_page_ssr_entry_module(
     let pages_structure_ref = pages_structure.await?;
 
     let (injections, imports) = if is_page && runtime == NextRuntime::Edge {
-        let next_config_val = &*next_config.await?;
         let injections = vec![
-            // TODO do we really need to pass the entire next config here?
-            // This is bad for invalidation as any config change will invalidate this
-            ("nextConfig", serde_json::to_string(next_config_val)?),
             (
                 "pageRouteModuleOptions",
                 serde_json::to_string(&get_route_module_options(
diff --git a/packages/next/errors.json b/packages/next/errors.json
@@ -965,5 +965,6 @@
   "964": "An unexpected error occurred while starting to capture immediates",
   "965": "Expected setImmediate to reject invalid arguments",
   "966": "Expected process.nextTick to reject invalid arguments",
-  "967": "The key \"%s\" under \"env\" in %sconfig is not allowed. https://nextjs.org/docs/messages/env-key-not-allowed"
+  "967": "The key \"%s\" under \"env\" in %sconfig is not allowed. https://nextjs.org/docs/messages/env-key-not-allowed",
+  "968": "Invariant: getNextConfigEdge most only be called in edge runtime"
 }
diff --git a/packages/next/src/build/entries.ts b/packages/next/src/build/entries.ts
@@ -621,7 +621,6 @@ export function getEdgeServerEntry(opts: {
       absolutePagePath: opts.absolutePagePath,
       page: opts.page,
       appDirLoader: Buffer.from(opts.appDirLoader || '').toString('base64'),
-      nextConfig: Buffer.from(JSON.stringify(opts.config)).toString('base64'),
       preferredRegion: opts.preferredRegion,
       middlewareConfig: Buffer.from(
         JSON.stringify(opts.middlewareConfig || {})
@@ -682,9 +681,6 @@ export function getEdgeServerEntry(opts: {
     dev: opts.isDev,
     isServerComponent: opts.isServerComponent,
     page: opts.page,
-    stringifiedConfig: Buffer.from(JSON.stringify(opts.config)).toString(
-      'base64'
-    ),
     pagesType: opts.pagesType,
     appDirLoader: Buffer.from(opts.appDirLoader || '').toString('base64'),
     sriEnabled: !opts.isDev && !!opts.config.experimental.sri?.algorithm,
diff --git a/packages/next/src/build/templates/edge-app-route.ts b/packages/next/src/build/templates/edge-app-route.ts
@@ -1,14 +1,11 @@
 import { setManifestsSingleton } from '../../server/app-render/manifests-singleton'
-import type { NextConfigRuntime } from '../../server/config-shared'
 import type { EdgeHandler } from '../../server/web/adapter'
 import { EdgeRouteModuleWrapper } from '../../server/web/edge-route-module-wrapper'
 
 // Import the userland code.
 import * as module from 'VAR_USERLAND'
 
 // injected by the loader afterwards.
-declare const nextConfig: NextConfigRuntime
-// INJECT:nextConfig
 
 const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined)
 
@@ -26,7 +23,6 @@ if (rscManifest && rscServerManifest) {
 export const ComponentMod = module
 
 const handler: EdgeHandler = EdgeRouteModuleWrapper.wrap(module.routeModule, {
-  nextConfig,
   page: 'VAR_PAGE',
 })
 export default handler
diff --git a/packages/next/src/build/templates/edge-ssr-app.ts b/packages/next/src/build/templates/edge-ssr-app.ts
@@ -8,7 +8,6 @@ import { IncrementalCache } from '../../server/lib/incremental-cache'
 
 import * as pageMod from 'VAR_USERLAND'
 
-import type { NextConfigRuntime } from '../../server/config-shared'
 import { setManifestsSingleton } from '../../server/app-render/manifests-singleton'
 import { initializeCacheHandlers } from '../../server/use-cache/handlers'
 import { BaseServerSpan } from '../../server/lib/trace/constants'
@@ -29,9 +28,7 @@ import { checkIsOnDemandRevalidate } from '../../server/api-utils'
 import { CloseController } from '../../server/web/web-on-close'
 
 declare const incrementalCacheHandler: any
-declare const nextConfig: NextConfigRuntime
 // OPTIONAL_IMPORT:incrementalCacheHandler
-// INJECT:nextConfig
 
 const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined)
 
@@ -74,6 +71,7 @@ async function requestHandler(
     query,
     params,
     buildId,
+    nextConfig,
     buildManifest,
     prerenderManifest,
     reactLoadableManifest,
diff --git a/packages/next/src/build/templates/edge-ssr.ts b/packages/next/src/build/templates/edge-ssr.ts
@@ -22,7 +22,6 @@ import RouteModule, {
 } from '../../server/route-modules/pages/module'
 import { WebNextRequest, WebNextResponse } from '../../server/base-http/web'
 
-import type { NextConfigRuntime } from '../../server/config-shared'
 import type { NextFetchEvent } from '../../server/web/spec-extension/fetch-event'
 import type RenderResult from '../../server/render-result'
 import type { RenderResultMetadata } from '../../server/render-result'
@@ -31,17 +30,12 @@ import { BaseServerSpan } from '../../server/lib/trace/constants'
 import { HTML_CONTENT_TYPE_HEADER } from '../../lib/constants'
 
 // injected by the loader afterwards.
-declare const nextConfig: NextConfigRuntime
 declare const pageRouteModuleOptions: any
 declare const errorRouteModuleOptions: any
 declare const user500RouteModuleOptions: any
-  // INJECT:nextConfig
-  // INJECT:pageRouteModuleOptions
-  // INJECT:errorRouteModuleOptions
-  // INJECT:user500RouteModuleOptions
-
-  // expose this for the route-module
-;(globalThis as any).nextConfig = nextConfig
+// INJECT:pageRouteModuleOptions
+// INJECT:errorRouteModuleOptions
+// INJECT:user500RouteModuleOptions
 
 const pageMod = {
   ...userlandPage,
@@ -113,6 +107,7 @@ async function requestHandler(
     query,
     params,
     buildId,
+    nextConfig,
     isNextDataRequest,
     buildManifest,
     prerenderManifest,
diff --git a/packages/next/src/build/webpack/loaders/next-edge-app-route-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-app-route-loader/index.ts
@@ -11,7 +11,6 @@ export type EdgeAppRouteLoaderQuery = {
   page: string
   appDirLoader: string
   preferredRegion: string | string[] | undefined
-  nextConfig: string
   middlewareConfig: string
   cacheHandlers: string
 }
@@ -24,7 +23,6 @@ const EdgeAppRouteLoader: webpack.LoaderDefinitionFunction<EdgeAppRouteLoaderQue
       preferredRegion,
       appDirLoader: appDirLoaderBase64 = '',
       middlewareConfig: middlewareConfigBase64 = '',
-      nextConfig: nextConfigBase64,
       cacheHandlers: cacheHandlersStringified,
     } = this.getOptions()
 
@@ -64,20 +62,13 @@ const EdgeAppRouteLoader: webpack.LoaderDefinitionFunction<EdgeAppRouteLoaderQue
       stringifiedPagePath.length - 1
     )}?${WEBPACK_RESOURCE_QUERIES.edgeSSREntry}`
 
-    const stringifiedConfig = Buffer.from(
-      nextConfigBase64 || '',
-      'base64'
-    ).toString()
-
     return await loadEntrypoint(
       'edge-app-route',
       {
         VAR_USERLAND: modulePath,
         VAR_PAGE: page,
       },
-      {
-        nextConfig: stringifiedConfig,
-      }
+      {}
     )
   }
 
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
@@ -19,7 +19,6 @@ export type EdgeSSRLoaderQuery = {
   dev: boolean
   isServerComponent: boolean
   page: string
-  stringifiedConfig: string
   appDirLoader?: string
   pagesType: PAGE_TYPES
   sriEnabled: boolean
@@ -73,7 +72,6 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
       absolute500Path,
       absoluteErrorPath,
       isServerComponent,
-      stringifiedConfig: stringifiedConfigBase64,
       appDirLoader: appDirLoaderBase64,
       pagesType,
       cacheHandler,
@@ -94,10 +92,6 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
       Buffer.from(middlewareConfigBase64, 'base64').toString()
     )
 
-    const stringifiedConfig = Buffer.from(
-      stringifiedConfigBase64 || '',
-      'base64'
-    ).toString()
     const appDirLoader = Buffer.from(
       appDirLoaderBase64 || '',
       'base64'
@@ -160,9 +154,7 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
           VAR_USERLAND: pageModPath,
           VAR_PAGE: page,
         },
-        {
-          nextConfig: stringifiedConfig,
-        },
+        {},
         {
           incrementalCacheHandler: cacheHandler ?? null,
         }
@@ -178,7 +170,6 @@ const edgeSSRLoader: webpack.LoaderDefinitionFunction<EdgeSSRLoaderQuery> =
           VAR_MODULE_GLOBAL_ERROR: errorPath,
         },
         {
-          nextConfig: stringifiedConfig,
           pageRouteModuleOptions: JSON.stringify(getRouteModuleOptions(page)),
           errorRouteModuleOptions: JSON.stringify(
             getRouteModuleOptions('/_error')
diff --git a/packages/next/src/server/route-modules/route-module.ts b/packages/next/src/server/route-modules/route-module.ts
@@ -42,7 +42,11 @@ import type { ReactLoadableManifest } from '../load-components'
 import type { NextFontManifest } from '../../build/webpack/plugins/next-font-manifest-plugin'
 import { normalizeDataPath } from '../../shared/lib/page-path/normalize-data-path'
 import { pathHasPrefix } from '../../shared/lib/router/utils/path-has-prefix'
-import { addRequestMeta, getRequestMeta } from '../request-meta'
+import {
+  addRequestMeta,
+  getRequestMeta,
+  type NextIncomingMessage,
+} from '../request-meta'
 import { normalizePagePath } from '../../shared/lib/page-path/normalize-page-path'
 import { isStaticMetadataRoute } from '../../lib/metadata/is-metadata-route'
 import { IncrementalCache } from '../lib/incremental-cache'
@@ -501,6 +505,26 @@ export abstract class RouteModule<
     )
   }
 
+  /** A more lightweight version of `prepare()` for only retrieving the config on edge */
+  public getNextConfigEdge(req: NextIncomingMessage): NextConfigRuntime {
+    if (process.env.NEXT_RUNTIME !== 'edge') {
+      throw new Error(
+        'Invariant: getNextConfigEdge most only be called in edge runtime'
+      )
+    }
+
+    let serverFilesManifest =
+      (self.__SERVER_FILES_MANIFEST as any as RequiredServerFilesManifest) || {}
+    const relativeProjectDir =
+      getRequestMeta(req, 'relativeProjectDir') || this.relativeProjectDir
+    const routerServerContext =
+      routerServerGlobal[RouterServerContextSymbol]?.[relativeProjectDir]
+    const nextConfig =
+      routerServerContext?.nextConfig || serverFilesManifest.config
+
+    return nextConfig
+  }
+
   public async prepare(
     req: IncomingMessage | BaseNextRequest,
     res: ServerResponse | null,
diff --git a/packages/next/src/server/web/edge-route-module-wrapper.ts b/packages/next/src/server/web/edge-route-module-wrapper.ts

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,6 @@ impl PageEndpoint {`
`904`	`904`	`this.original_name.clone(),`
`905`	`905`	`*this.pages_structure,`
`906`	`906`	`runtime,`
`907`		`- this.pages_project.project().next_config(),`
`908`	`907`	`)`
`909`	`908`	`.await?;`
`910`	`909`
Original file line number	Diff line number	Diff line change
`@@ -965,5 +965,6 @@`
`965`	`965`	`"964": "An unexpected error occurred while starting to capture immediates",`
`966`	`966`	`"965": "Expected setImmediate to reject invalid arguments",`
`967`	`967`	`"966": "Expected process.nextTick to reject invalid arguments",`
`968`		`- "967": "The key \"%s\" under \"env\" in %sconfig is not allowed. https://nextjs.org/docs/messages/env-key-not-allowed"`
	`968`	`+ "967": "The key \"%s\" under \"env\" in %sconfig is not allowed. https://nextjs.org/docs/messages/env-key-not-allowed",`
	`969`	`+ "968": "Invariant: getNextConfigEdge most only be called in edge runtime"`
`969`	`970`	`}`