less config inlining

Author: mischnic

crates/next-api/src/pages.rs

@@ -897,7 +897,6 @@ impl PageEndpoint {
                     this.original_name.clone(),
                     *this.pages_structure,
                     runtime,
-                    this.pages_project.project().next_config(),
                 )
                 .await?;
 
@@ -918,7 +917,6 @@ impl PageEndpoint {
                     this.original_name.clone(),
                     *this.pages_structure,
                     runtime,
-                    this.pages_project.project().next_config(),
                 )
                 .await?;
                 InternalSsrChunkModule {

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?;

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;
@@ -169,7 +167,6 @@ pub async fn create_page_ssr_entry_module(
                 definition_pathname.clone(),
                 reference_type,
                 pages_structure,
-                next_config,
                 source_query.clone(),
             );
         } else {
@@ -213,7 +210,6 @@ async fn wrap_edge_page(
     pathname: RcStr,
     reference_type: ReferenceType,
     pages_structure: Vc<PagesStructure>,
-    next_config: Vc<NextConfig>,
     source_query: RcStr,
 ) -> Result<Vc<Box<dyn Module>>> {
     const INNER: &str = "INNER_PAGE_ENTRY";
@@ -223,8 +219,6 @@ async fn wrap_edge_page(
     const INNER_ERROR: &str = "INNER_ERROR";
     const INNER_ERROR_500: &str = "INNER_500";
 
-    let next_config_val = &*next_config.await?;
-
     let source = load_next_js_template(
         "edge-ssr.js",
         project_root.clone(),
@@ -236,9 +230,6 @@ async fn wrap_edge_page(
             ("VAR_MODULE_GLOBAL_ERROR", INNER_ERROR),
         ],
         &[
-            // 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(page.clone(), pathname.clone()))?,

packages/next/src/build/entries.ts

@@ -682,9 +682,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,

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 { NextConfigComplete } 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: NextConfigComplete
 // 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,

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 { NextConfigComplete } 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: NextConfigComplete
 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,
@@ -107,6 +101,7 @@ async function requestHandler(
     query,
     params,
     buildId,
+    nextConfig,
     isNextDataRequest,
     buildManifest,
     prerenderManifest,

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')