Load config.deploymentId

Author: mischnic

packages/next/errors.json

@@ -967,5 +967,6 @@
   "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",
   "968": "Invariant: getNextConfigEdge must only be called in edge runtime",
-  "969": "Invariant: nextConfig couldn't be loaded"
+  "969": "Invariant: nextConfig couldn't be loaded",
+  "970": "process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled"
 }

packages/next/src/server/base-server.ts

@@ -447,6 +447,24 @@ export default abstract class Server<
     // TODO: should conf be normalized to prevent missing
     // values from causing issues as this can be user provided
     this.nextConfig = conf as NextConfigRuntime
+
+    if (this.nextConfig.experimental.runtimeServerDeploymentId) {
+      if (!process.env.NEXT_DEPLOYMENT_ID) {
+        throw new Error(
+          'process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled'
+        )
+      }
+      this.nextConfig = {
+        ...this.nextConfig,
+        deploymentId: process.env.NEXT_DEPLOYMENT_ID,
+      }
+    } else {
+      process.env.NEXT_DEPLOYMENT_ID = this.nextConfig.experimental
+        .useSkewCookie
+        ? ''
+        : this.nextConfig.deploymentId || ''
+    }
+
     this.hostname = hostname
     if (this.hostname) {
       // we format the hostname so that it can be fetched
@@ -502,13 +520,6 @@ export default abstract class Server<
 
     this.nextFontManifest = this.getNextFontManifest()
 
-    if (this.nextConfig.experimental.runtimeServerDeploymentId !== true) {
-      process.env.NEXT_DEPLOYMENT_ID = this.nextConfig.experimental
-        .useSkewCookie
-        ? ''
-        : this.nextConfig.deploymentId || ''
-    }
-
     this.renderOpts = {
       dir: this.dir,
       supportsDynamicResponse: true,

packages/next/src/server/route-modules/route-module.ts

@@ -190,14 +190,15 @@ export abstract class RouteModule<
     dynamicCssManifest: any
     interceptionRoutePatterns: RegExp[]
   } {
+    let result
     if (process.env.NEXT_RUNTIME === 'edge') {
       const { getEdgePreviewProps } =
         require('../web/get-edge-preview-props') as typeof import('../web/get-edge-preview-props')
 
       const maybeJSONParse = (str?: string) =>
         str ? JSON.parse(str) : undefined
 
-      return {
+      result = {
         buildId: process.env.__NEXT_BUILD_ID || '',
         buildManifest: self.__BUILD_MANIFEST as any,
         fallbackBuildManifest: {} as any,
@@ -209,7 +210,7 @@ export abstract class RouteModule<
           notFoundRoutes: [],
           version: 4,
           preview: getEdgePreviewProps(),
-        },
+        } as const,
         routesManifest: {
           version: 4,
           caseSensitive: Boolean(process.env.__NEXT_CASE_SENSITIVE_ROUTES),
@@ -357,7 +358,7 @@ export abstract class RouteModule<
         }),
       ]
 
-      return {
+      result = {
         buildId,
         buildManifest,
         fallbackBuildManifest,
@@ -376,6 +377,20 @@ export abstract class RouteModule<
           .map((rewrite) => new RegExp(rewrite.regex)),
       }
     }
+
+    if (
+      result.serverFilesManifest?.config.experimental?.runtimeServerDeploymentId
+    ) {
+      if (!process.env.NEXT_DEPLOYMENT_ID) {
+        throw new Error(
+          'process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled'
+        )
+      }
+      result.serverFilesManifest.config.deploymentId =
+        process.env.NEXT_DEPLOYMENT_ID
+    }
+
+    return result
   }
 
   public async loadCustomCacheHandlers(
@@ -524,6 +539,15 @@ export abstract class RouteModule<
       throw new Error("Invariant: nextConfig couldn't be loaded")
     }
 
+    if (nextConfig.experimental?.runtimeServerDeploymentId) {
+      if (!process.env.NEXT_DEPLOYMENT_ID) {
+        throw new Error(
+          'process.env.NEXT_DEPLOYMENT_ID is missing but runtimeServerDeploymentId is enabled'
+        )
+      }
+      nextConfig.deploymentId = process.env.NEXT_DEPLOYMENT_ID
+    }
+
     return nextConfig
   }