[edge] serialize custom config to middleware-manifest

packages/next/build/analysis/get-page-static-info.ts

@@ -31,6 +31,7 @@ export interface PageStaticInfo {
   ssg?: boolean
   ssr?: boolean
   rsc?: RSCModuleType
+  userConfig: Record<string, unknown> | undefined
   middleware?: Partial<MiddlewareConfig>
 }
 
@@ -239,6 +240,23 @@ function warnAboutUnsupportedValue(
   warnedUnsupportedValueMap.set(pageFilePath, true)
 }
 
+function getUserConfig(
+  config: any,
+  middlewareConfig: Partial<MiddlewareConfig>
+) {
+  if (!config) return
+
+  const userConfig = config && { ...config }
+  if (userConfig) {
+    delete userConfig.runtime
+    if (middlewareConfig.matchers) {
+      delete userConfig.matcher
+    }
+  }
+
+  return userConfig
+}
+
 /**
  * For a given pageFilePath and nextConfig, if the config supports it, this
  * function will read the file and return the runtime that should be used.
@@ -256,7 +274,7 @@ export async function getPageStaticInfo(params: {
 
   const fileContent = (await tryToReadFile(pageFilePath, !isDev)) || ''
   if (
-    /runtime|getStaticProps|getServerSideProps|matcher|unstable_allowDynamic/.test(
+    /runtime|getStaticProps|getServerSideProps|matcher|unstable_allowDynamic|export (let|var|const) config/.test(
       fileContent
     )
   ) {
@@ -315,6 +333,7 @@ export async function getPageStaticInfo(params: {
       ssr,
       ssg,
       rsc,
+      userConfig: getUserConfig(config, middlewareConfig),
       ...(middlewareConfig && { middleware: middlewareConfig }),
       ...(runtime && { runtime }),
     }
@@ -325,5 +344,6 @@ export async function getPageStaticInfo(params: {
     ssg: false,
     rsc: RSC_MODULE_TYPES.server,
     runtime: nextConfig.experimental?.runtime,
+    userConfig: undefined,
   }
 }

packages/next/build/entries.ts

@@ -166,6 +166,8 @@ export function getEdgeServerEntry(opts: {
   middleware?: Partial<MiddlewareConfig>
   pagesType?: 'app' | 'pages' | 'root'
   appDirLoader?: string
+  // TODO(schniz): mark as optional
+  userConfig: Record<string, unknown> | undefined
 }) {
   if (isMiddlewareFile(opts.page)) {
     const loaderParams: MiddlewareLoaderOptions = {
@@ -175,6 +177,7 @@ export function getEdgeServerEntry(opts: {
       matchers: opts.middleware?.matchers
         ? encodeMatchers(opts.middleware.matchers)
         : '',
+      ...(opts.userConfig && { userConfig: JSON.stringify(opts.userConfig) }),
     }
 
     return `next-middleware-loader?${stringify(loaderParams)}!`
@@ -185,6 +188,7 @@ export function getEdgeServerEntry(opts: {
       absolutePagePath: opts.absolutePagePath,
       page: opts.page,
       rootDir: opts.rootDir,
+      ...(opts.userConfig && { userConfig: JSON.stringify(opts.userConfig) }),
     }
 
     return `next-edge-function-loader?${stringify(loaderParams)}!`
@@ -205,6 +209,7 @@ export function getEdgeServerEntry(opts: {
     appDirLoader: Buffer.from(opts.appDirLoader || '').toString('base64'),
     sriEnabled: !opts.isDev && !!opts.config.experimental.sri?.algorithm,
     hasFontLoaders: !!opts.config.experimental.fontLoaders,
+    ...(opts.userConfig && { userConfig: JSON.stringify(opts.userConfig) }),
   }
 
   return {
@@ -493,6 +498,7 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
             middleware: staticInfo?.middleware,
             pagesType,
             appDirLoader,
+            userConfig: staticInfo?.userConfig,
           })
         },
       })

packages/next/build/webpack/loaders/get-module-build-info.ts

@@ -14,6 +14,7 @@ export function getModuleBuildInfo(webpackModule: webpack.Module) {
     nextEdgeApiFunction?: EdgeMiddlewareMeta
     nextEdgeSSR?: EdgeSSRMeta
     nextUsedEnvVars?: Set<string>
+    nextUserConfig?: Record<string, unknown> | undefined
     nextWasmMiddlewareBinding?: AssetBinding
     nextAssetMiddlewareBinding?: AssetBinding
     usingIndirectEval?: boolean | Set<string>

packages/next/build/webpack/loaders/next-edge-function-loader.ts

@@ -5,13 +5,19 @@ export type EdgeFunctionLoaderOptions = {
   absolutePagePath: string
   page: string
   rootDir: string
+  userConfig?: string
 }
 
 export default function middlewareLoader(this: any) {
-  const { absolutePagePath, page, rootDir }: EdgeFunctionLoaderOptions =
-    this.getOptions()
+  const {
+    absolutePagePath,
+    page,
+    rootDir,
+    userConfig,
+  }: EdgeFunctionLoaderOptions = this.getOptions()
   const stringifiedPagePath = stringifyRequest(this, absolutePagePath)
   const buildInfo = getModuleBuildInfo(this._module)
+  buildInfo.nextUserConfig = userConfig ? JSON.parse(userConfig) : undefined
   buildInfo.nextEdgeApiFunction = {
     page: page || '/',
   }

packages/next/build/webpack/loaders/next-edge-ssr-loader/index.ts

@@ -16,6 +16,7 @@ export type EdgeSSRLoaderQuery = {
   pagesType?: 'app' | 'pages' | 'root'
   sriEnabled: boolean
   hasFontLoaders: boolean
+  userConfig?: string
 }
 
 export default async function edgeSSRLoader(this: any) {
@@ -34,6 +35,7 @@ export default async function edgeSSRLoader(this: any) {
     pagesType,
     sriEnabled,
     hasFontLoaders,
+    userConfig,
   } = this.getOptions()
 
   const appDirLoader = Buffer.from(
@@ -48,6 +50,7 @@ export default async function edgeSSRLoader(this: any) {
     page: page,
     isAppDir,
   }
+  buildInfo.nextUserConfig = userConfig ? JSON.parse(userConfig) : undefined
   buildInfo.route = {
     page,
     absolutePagePath,

packages/next/build/webpack/loaders/next-middleware-loader.ts

@@ -8,6 +8,7 @@ export type MiddlewareLoaderOptions = {
   page: string
   rootDir: string
   matchers?: string
+  userConfig?: string
 }
 
 // matchers can have special characters that break the loader params
@@ -28,10 +29,12 @@ export default function middlewareLoader(this: any) {
     page,
     rootDir,
     matchers: encodedMatchers,
+    userConfig,
   }: MiddlewareLoaderOptions = this.getOptions()
   const matchers = encodedMatchers ? decodeMatchers(encodedMatchers) : undefined
   const stringifiedPagePath = stringifyRequest(this, absolutePagePath)
   const buildInfo = getModuleBuildInfo(this._module)
+  buildInfo.nextUserConfig = userConfig ? JSON.parse(userConfig) : undefined
   buildInfo.nextEdgeMiddleware = {
     matchers,
     page:

packages/next/build/webpack/plugins/middleware-plugin.ts

@@ -36,6 +36,8 @@ export interface EdgeFunctionDefinition {
   matchers: MiddlewareMatcher[]
   wasm?: AssetBinding[]
   assets?: AssetBinding[]
+  // TODO(schniz): mark as optional
+  userConfig: Record<string, unknown> | undefined
 }
 
 export interface MiddlewareManifest {
@@ -49,6 +51,8 @@ interface EntryMetadata {
   edgeMiddleware?: EdgeMiddlewareMeta
   edgeApiFunction?: EdgeMiddlewareMeta
   edgeSSR?: EdgeSSRMeta
+  // TODO(schniz): mark as optional
+  userConfig: Record<string, unknown> | undefined
   env: Set<string>
   wasmBindings: Map<string, string>
   assetBindings: Map<string, string>
@@ -170,6 +174,7 @@ function getCreateAssets(params: {
         name: entrypoint.name,
         page: page,
         matchers,
+        userConfig: metadata.userConfig,
         wasm: Array.from(metadata.wasmBindings, ([name, filePath]) => ({
           name,
           filePath,
@@ -675,6 +680,7 @@ function getExtractMetadata(params: {
         env: new Set<string>(),
         wasmBindings: new Map(),
         assetBindings: new Map(),
+        userConfig: undefined,
       }
 
       for (const module of modules) {
@@ -759,6 +765,10 @@ function getExtractMetadata(params: {
           }
         }
 
+        if (buildInfo?.nextUserConfig) {
+          entryMetadata.userConfig = buildInfo.nextUserConfig
+        }
+
         /**
          * If the module is a WASM module we read the binding information and
          * append it to the entry wasm bindings.

packages/next/server/dev/hot-reloader.ts

@@ -46,6 +46,7 @@ import { getProperError } from '../../lib/is-error'
 import ws from 'next/dist/compiled/ws'
 import { promises as fs } from 'fs'
 import { getPageStaticInfo } from '../../build/analysis/get-page-static-info'
+import type { PageStaticInfo } from '../../build/analysis/get-page-static-info'
 import { UnwrapPromise } from '../../lib/coalesced-function'
 
 function diff(a: Set<any>, b: Set<any>) {
@@ -596,7 +597,7 @@ export default class HotReloader {
             }
 
             const isAppPath = !!this.appDir && bundlePath.startsWith('app/')
-            const staticInfo = isEntry
+            const staticInfo: Partial<PageStaticInfo> = isEntry
               ? await getPageStaticInfo({
                   pageFilePath: entryData.absolutePagePath,
                   nextConfig: this.config,
@@ -644,6 +645,7 @@ export default class HotReloader {
                     pages: this.pagesMapping,
                     isServerComponent,
                     appDirLoader,
+                    userConfig: undefined,
                     pagesType: isAppPath ? 'app' : undefined,
                   }),
                   appDir: this.config.experimental.appDir,

test/e2e/middleware-general/app/middleware.js

@@ -2,6 +2,8 @@
 import { NextRequest, NextResponse, URLPattern } from 'next/server'
 import magicValue from 'shared-package'
 
+export const config = { customConfig: true }
+
 const PATTERNS = [
   [
     new URLPattern({ pathname: '/:locale/:id' }),

test/e2e/middleware-general/app/pages/api/edge-search-params.js

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server'
 
-export const config = { runtime: 'experimental-edge' }
+export const config = { runtime: 'experimental-edge', custom: 'config' }
 
 /**
  * @param {import('next/server').NextRequest}

test/e2e/middleware-general/test/index.test.ts

@@ -125,10 +125,24 @@ describe('Middleware Runtime', () => {
             matchers: [{ regexp: '^/.*$' }],
             wasm: [],
             assets: [],
+            userConfig: {
+              customConfig: true,
+            },
           },
         })
       })
 
+      it('should have the custom config in the manifest', async () => {
+        const manifest = await fs.readJSON(
+          join(next.testDir, '.next/server/middleware-manifest.json')
+        )
+
+        expect(manifest.functions['/api/edge-search-params']).toHaveProperty(
+          'userConfig',
+          { custom: 'config' }
+        )
+      })
+
       it('should have correct files in manifest', async () => {
         const manifest = await fs.readJSON(
           join(next.testDir, '.next/server/middleware-manifest.json')