Backport "fix: add ?dpl to fonts in /_next/static/media (#82384)" (#82421)

devjiwonchoi · styfle · web-flow · commit 91e5b6b84f56 · 2025-08-06T20:29:17.000+02:00
Backports #82384 Co-authored-by: Steven <steven@ceriously.com>
diff --git a/packages/next/src/pages/_document.tsx b/packages/next/src/pages/_document.tsx
@@ -363,7 +363,8 @@ function getAmpPath(ampPath: string, asPath: string): string {
 function getNextFontLinkTags(
   nextFontManifest: DeepReadonly<NextFontManifest> | undefined,
   dangerousAsPath: string,
-  assetPrefix: string = ''
+  assetPrefix: string = '',
+  assetQueryString: string = ''
 ) {
   if (!nextFontManifest) {
     return {
@@ -403,7 +404,7 @@ function getNextFontLinkTags(
             <link
               key={fontFile}
               rel="preload"
-              href={`${assetPrefix}/_next/${encodeURIPath(fontFile)}`}
+              href={`${assetPrefix}/_next/${encodeURIPath(fontFile)}${assetQueryString}`}
               as="font"
               type={`font/${ext}`}
               crossOrigin="anonymous"
@@ -765,7 +766,8 @@ export class Head extends React.Component<HeadProps> {
     const nextFontLinkTags = getNextFontLinkTags(
       nextFontManifest,
       dangerousAsPath,
-      assetPrefix
+      assetPrefix,
+      this.context.assetQueryString
     )
 
     const tracingMetadata = getTracedMetadata(
diff --git a/packages/next/src/server/app-render/get-layer-assets.tsx b/packages/next/src/server/app-render/get-layer-assets.tsx
@@ -46,7 +46,7 @@ export function getLayerAssets({
         const fontFilename = preloadedFontFiles[i]
         const ext = /\.(woff|woff2|eot|ttf|otf)$/.exec(fontFilename)![1]
         const type = `font/${ext}`
-        const href = `${ctx.assetPrefix}/_next/${encodeURIPath(fontFilename)}`
+        const href = `${ctx.assetPrefix}/_next/${encodeURIPath(fontFilename)}${getAssetQueryString(ctx, false)}`
 
         preloadCallbacks.push(() => {
           ctx.componentMod.preloadFont(
diff --git a/test/production/deployment-id-handling/deployment-id-cookie-handling.test.ts b/test/production/deployment-id-handling/deployment-id-cookie-handling.test.ts
@@ -45,11 +45,7 @@ describe('deployment-id-handling disabled', () => {
 
       for (const link of links) {
         if (link.attribs.href) {
-          if (link.attribs.as === 'font') {
-            expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
-          } else {
-            expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
-          }
+          expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
         }
       }
 
diff --git a/test/production/deployment-id-handling/deployment-id-handling.test.ts b/test/production/deployment-id-handling/deployment-id-handling.test.ts
@@ -39,11 +39,7 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'CUSTOM_DEPLOYMENT_ID'])(
 
         for (const link of links) {
           if (link.attribs.href && link.attribs.rel !== 'expect') {
-            if (link.attribs.as === 'font') {
-              expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
-            } else {
-              expect(link.attribs.href).toContain('dpl=' + deploymentId)
-            }
+            expect(link.attribs.href).toContain('dpl=' + deploymentId)
           }
         }
 
@@ -173,11 +169,7 @@ describe('deployment-id-handling disabled', () => {
 
       for (const link of links) {
         if (link.attribs.href) {
-          if (link.attribs.as === 'font') {
-            expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
-          } else {
-            expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
-          }
+          expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,7 @@ describe('deployment-id-handling disabled', () => {`
`45`	`45`
`46`	`46`	`for (const link of links) {`
`47`	`47`	`if (link.attribs.href) {`
`48`		`- if (link.attribs.as === 'font') {`
`49`		`- expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`50`		`- } else {`
`51`		`- expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`52`		`- }`
	`48`	`+ expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`53`	`49`	`}`
`54`	`50`	`}`
`55`	`51`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,7 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'CUSTOM_DEPLOYMENT_ID'])(`
`39`	`39`
`40`	`40`	`for (const link of links) {`
`41`	`41`	`if (link.attribs.href && link.attribs.rel !== 'expect') {`
`42`		`- if (link.attribs.as === 'font') {`
`43`		`- expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`44`		`- } else {`
`45`		`- expect(link.attribs.href).toContain('dpl=' + deploymentId)`
`46`		`- }`
	`42`	`+ expect(link.attribs.href).toContain('dpl=' + deploymentId)`
`47`	`43`	`}`
`48`	`44`	`}`
`49`	`45`
`@@ -173,11 +169,7 @@ describe('deployment-id-handling disabled', () => {`
`173`	`169`
`174`	`170`	`for (const link of links) {`
`175`	`171`	`if (link.attribs.href) {`
`176`		`- if (link.attribs.as === 'font') {`
`177`		`- expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`178`		`- } else {`
`179`		`- expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`180`		`- }`
	`172`	`+ expect(link.attribs.href).not.toContain('dpl=' + deploymentId)`
`181`	`173`	`}`
`182`	`174`	`}`
`183`	`175`