less config inlining

Author: mischnic

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

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 || {})

packages/next/src/build/templates/edge-app-route.ts

@@ -1,14 +1,11 @@
 import { setManifestsSingleton } from '../../server/app-render/manifests-singleton'
-import type { NextConfigComplete } 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: NextConfigComplete
-// 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

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,
-      }
+      {}
     )
   }
 

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): NextConfigComplete {
+    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,

packages/next/src/server/web/edge-route-module-wrapper.ts

@@ -1,12 +1,11 @@
-import type { NextRequest } from './spec-extension/request'
 import type {
   AppRouteRouteHandlerContext,
   AppRouteRouteModule,
 } from '../route-modules/app-route/module'
 
 import './globals'
 
-import { adapter, type EdgeHandler } from './adapter'
+import { adapter, type NextRequestHint, type EdgeHandler } from './adapter'
 import { IncrementalCache } from '../lib/incremental-cache'
 import { RouteMatcher } from '../route-matchers/route-matcher'
 import type { NextFetchEvent } from './spec-extension/fetch-event'
@@ -15,10 +14,9 @@ import { getServerUtils } from '../server-utils'
 import { searchParamsToUrlQuery } from '../../shared/lib/router/utils/querystring'
 import { CloseController, trackStreamConsumed } from './web-on-close'
 import { getEdgePreviewProps } from './get-edge-preview-props'
-import type { NextConfigComplete } from '../config-shared'
+import { WebNextRequest } from '../../server/base-http/web'
 
 export interface WrapOptions {
-  nextConfig: NextConfigComplete
   page: string
 }
 
@@ -36,10 +34,7 @@ export class EdgeRouteModuleWrapper {
    *
    * @param routeModule the route module to wrap
    */
-  private constructor(
-    private readonly routeModule: AppRouteRouteModule,
-    private readonly nextConfig: NextConfigComplete
-  ) {
+  private constructor(private readonly routeModule: AppRouteRouteModule) {
     // TODO: (wyattjoh) possibly allow the module to define it's own matcher
     this.matcher = new RouteMatcher(routeModule.definition)
   }
@@ -58,7 +53,7 @@ export class EdgeRouteModuleWrapper {
     options: WrapOptions
   ): EdgeHandler {
     // Create the module wrapper.
-    const wrapper = new EdgeRouteModuleWrapper(routeModule, options.nextConfig)
+    const wrapper = new EdgeRouteModuleWrapper(routeModule)
 
     // Return the wrapping function.
     return (opts) => {
@@ -73,7 +68,7 @@ export class EdgeRouteModuleWrapper {
   }
 
   private async handler(
-    request: NextRequest,
+    request: NextRequestHint,
     evt: NextFetchEvent
   ): Promise<Response> {
     const utils = getServerUtils({
@@ -86,6 +81,10 @@ export class EdgeRouteModuleWrapper {
       caseSensitive: false,
     })
 
+    const nextConfig = this.routeModule.getNextConfigEdge(
+      new WebNextRequest(request)
+    )
+
     const { params } = utils.normalizeDynamicRouteParams(
       searchParamsToUrlQuery(request.nextUrl.searchParams),
       false
@@ -116,7 +115,7 @@ export class EdgeRouteModuleWrapper {
         experimental: {
           authInterrupts: !!process.env.__NEXT_EXPERIMENTAL_AUTH_INTERRUPTS,
         },
-        cacheLifeProfiles: this.nextConfig.cacheLife,
+        cacheLifeProfiles: nextConfig.cacheLife,
       },
       sharedContext: {
         buildId: '', // TODO: Populate this properly.