fixup

Author: mischnic

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -41,7 +41,7 @@ import {
   urlToUrlWithoutFlightMarker,
 } from '../../route-params'
 import type { NormalizedSearch } from '../segment-cache/cache-key'
-import { deploymentId } from '../../../shared/lib/deployment-id'
+import { getDeploymentId } from '../../../shared/lib/deployment-id'
 
 const createFromReadableStream =
   createFromReadableStreamBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromReadableStream']
@@ -330,6 +330,7 @@ export async function createFetch<T>(
     headers['Next-Test-Fetch-Priority'] = fetchPriority
   }
 
+  const deploymentId = getDeploymentId()
   if (deploymentId) {
     headers['x-deployment-id'] = deploymentId
   }

packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts

@@ -56,7 +56,7 @@ import {
   omitUnusedArgs,
 } from '../../../../shared/lib/server-reference-info'
 import { revalidateEntireCache } from '../../segment-cache/cache'
-import { deploymentId } from '../../../../shared/lib/deployment-id'
+import { getDeploymentId } from '../../../../shared/lib/deployment-id'
 
 const createFromFetch =
   createFromFetchBrowser as (typeof import('react-server-dom-webpack/client.browser'))['createFromFetch']
@@ -111,6 +111,7 @@ async function fetchServerAction(
     ),
   }
 
+  const deploymentId = getDeploymentId()
   if (deploymentId) {
     headers['x-deployment-id'] = deploymentId
   }

packages/next/src/client/webpack.ts

@@ -2,13 +2,13 @@ declare const __webpack_require__: any
 declare let __webpack_public_path__: string
 
 import {
-  deploymentId,
+  getDeploymentId,
   getDeploymentIdQueryOrEmptyString,
 } from '../shared/lib/deployment-id'
 
 // If we have a deployment ID, we need to append it to the webpack chunk names
 // I am keeping the process check explicit so this can be statically optimized
-if (deploymentId) {
+if (getDeploymentId()) {
   const suffix = getDeploymentIdQueryOrEmptyString()
   const getChunkScriptFilename = __webpack_require__.u
   __webpack_require__.u = (...args: any[]) =>

packages/next/src/server/route-modules/pages/pages-handler.ts

@@ -42,7 +42,7 @@ import type {
   GetStaticPaths,
   GetStaticProps,
 } from '../../../types'
-import { deploymentId } from '../../../shared/lib/deployment-id'
+import { getDeploymentId } from '../../../shared/lib/deployment-id'
 
 export const getHandler = ({
   srcPage: originalSrcPage,
@@ -258,7 +258,7 @@ export const getHandler = ({
                     buildId,
                     customServer:
                       Boolean(routerServerContext?.isCustomServer) || undefined,
-                    deploymentId: deploymentId,
+                    deploymentId: getDeploymentId(),
                   },
                   renderOpts: {
                     params,

packages/next/src/shared/lib/deployment-id.ts

@@ -1,6 +1,11 @@
-export let deploymentId: string | undefined = process.env.NEXT_DEPLOYMENT_ID
+// This could also be a variable instead of a function, but some unit tests want to change the ID at
+// runtime. Even though that would never happen in a real deployment.
+export function getDeploymentId(): string | undefined {
+  return process.env.NEXT_DEPLOYMENT_ID
+}
 
 export function getDeploymentIdQueryOrEmptyString(): string {
+  let deploymentId = getDeploymentId()
   if (deploymentId) {
     return `?dpl=${deploymentId}`
   }

packages/next/src/shared/lib/image-loader.ts

@@ -1,6 +1,6 @@
 import type { ImageLoaderPropsWithConfig } from './image-config'
 import { findClosestQuality } from './find-closest-quality'
-import { deploymentId } from './deployment-id'
+import { getDeploymentId } from './deployment-id'
 
 function defaultLoader({
   config,
@@ -95,6 +95,7 @@ function defaultLoader({
 
   const q = findClosestQuality(quality, config)
 
+  let deploymentId = getDeploymentId()
   return `${config.path}?url=${encodeURIComponent(src)}&w=${width}&q=${q}${
     src.startsWith('/_next/static/media/') && deploymentId
       ? `&dpl=${deploymentId}`

packages/next/src/shared/lib/router/router.ts

@@ -43,7 +43,7 @@ import { interpolateAs } from './utils/interpolate-as'
 import { disableSmoothScrollDuringRouteTransition } from './utils/disable-smooth-scroll'
 import type { Params } from '../../../server/request/params'
 import { MATCHED_PATH_HEADER } from '../../../lib/constants'
-import { deploymentId } from '../deployment-id'
+import { getDeploymentId } from '../deployment-id'
 
 let resolveRewrites: typeof import('./utils/resolve-rewrites').default
 if (process.env.__NEXT_HAS_REWRITES) {
@@ -498,6 +498,7 @@ function fetchNextData({
   unstable_skipClientCache,
 }: FetchNextDataParams): Promise<FetchDataOutput> {
   const { href: cacheKey } = new URL(dataHref, window.location.href)
+  const deploymentId = getDeploymentId()
   const getData = (params?: { method?: 'HEAD' | 'GET' }) =>
     fetchRetry(dataHref, isServerRender ? 3 : 1, {
       headers: Object.assign(