Unverified Commit bc72f41a authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

[backport] revert: add ?dpl to fonts in `/_next/static/media` (#83062) (#83066)

Backports:
- #83062
parent c8faf680
...@@ -124,7 +124,6 @@ describe('next/font/google loader', () => { ...@@ -124,7 +124,6 @@ describe('next/font/google loader', () => {
mockFetchResource.mockResolvedValue(Buffer.from('OK')) mockFetchResource.mockResolvedValue(Buffer.from('OK'))
const { css } = await nextFontGoogleFontLoader({ const { css } = await nextFontGoogleFontLoader({
functionName, functionName,
deploymentId: undefined,
data: [ data: [
{ {
adjustFontFallback: false, adjustFontFallback: false,
......
...@@ -5,7 +5,6 @@ describe('next/font/local loader', () => { ...@@ -5,7 +5,6 @@ describe('next/font/local loader', () => {
test('Default CSS', async () => { test('Default CSS', async () => {
const { css } = await nextFontLocalFontLoader({ const { css } = await nextFontLocalFontLoader({
functionName: '', functionName: '',
deploymentId: undefined,
data: [{ src: './my-font.woff2' }], data: [{ src: './my-font.woff2' }],
emitFontFile: () => '/_next/static/media/my-font.woff2', emitFontFile: () => '/_next/static/media/my-font.woff2',
resolve: jest.fn(), resolve: jest.fn(),
...@@ -29,37 +28,9 @@ describe('next/font/local loader', () => { ...@@ -29,37 +28,9 @@ describe('next/font/local loader', () => {
`) `)
}) })
test('with dpl query string', async () => {
const { css } = await nextFontLocalFontLoader({
functionName: '',
deploymentId: 'dpl_123',
data: [{ src: './my-font.woff2' }],
emitFontFile: () => '/_next/static/media/my-font.woff2',
resolve: jest.fn(),
isDev: false,
isServer: true,
variableName: 'myFont',
loaderContext: {
fs: {
readFile: (_: string, cb: any) => cb(null, 'fontdata'),
},
} as any,
})
expect(css).toMatchInlineSnapshot(`
"@font-face {
font-family: myFont;
src: url(/_next/static/media/my-font.woff2?dpl=dpl_123) format('woff2');
font-display: swap;
}
"
`)
})
test('Weight and style', async () => { test('Weight and style', async () => {
const { css } = await nextFontLocalFontLoader({ const { css } = await nextFontLocalFontLoader({
functionName: '', functionName: '',
deploymentId: undefined,
data: [{ src: './my-font.woff2', weight: '100 900', style: 'italic' }], data: [{ src: './my-font.woff2', weight: '100 900', style: 'italic' }],
emitFontFile: () => '/_next/static/media/my-font.woff2', emitFontFile: () => '/_next/static/media/my-font.woff2',
resolve: jest.fn(), resolve: jest.fn(),
...@@ -88,7 +59,6 @@ describe('next/font/local loader', () => { ...@@ -88,7 +59,6 @@ describe('next/font/local loader', () => {
test('Other properties', async () => { test('Other properties', async () => {
const { css } = await nextFontLocalFontLoader({ const { css } = await nextFontLocalFontLoader({
functionName: '', functionName: '',
deploymentId: undefined,
data: [ data: [
{ {
src: './my-font.woff2', src: './my-font.woff2',
...@@ -125,7 +95,6 @@ describe('next/font/local loader', () => { ...@@ -125,7 +95,6 @@ describe('next/font/local loader', () => {
test('Multiple weights default style', async () => { test('Multiple weights default style', async () => {
const { css } = await nextFontLocalFontLoader({ const { css } = await nextFontLocalFontLoader({
functionName: '', functionName: '',
deploymentId: undefined,
data: [ data: [
{ {
style: 'italic', style: 'italic',
...@@ -202,7 +171,6 @@ describe('next/font/local loader', () => { ...@@ -202,7 +171,6 @@ describe('next/font/local loader', () => {
test('Multiple styles default weight', async () => { test('Multiple styles default weight', async () => {
const { css } = await nextFontLocalFontLoader({ const { css } = await nextFontLocalFontLoader({
functionName: '', functionName: '',
deploymentId: undefined,
data: [ data: [
{ {
weight: '400', weight: '400',
...@@ -265,7 +233,6 @@ describe('next/font/local loader', () => { ...@@ -265,7 +233,6 @@ describe('next/font/local loader', () => {
test('Custom font-family in declarations', async () => { test('Custom font-family in declarations', async () => {
const { css } = await nextFontLocalFontLoader({ const { css } = await nextFontLocalFontLoader({
functionName: '', functionName: '',
deploymentId: undefined,
data: [ data: [
{ {
src: './my-font.woff2', src: './my-font.woff2',
......
...@@ -19,7 +19,6 @@ const nextFontLocalFontLoader: FontLoader = async ({ ...@@ -19,7 +19,6 @@ const nextFontLocalFontLoader: FontLoader = async ({
data, data,
emitFontFile, emitFontFile,
resolve, resolve,
deploymentId,
loaderContext, loaderContext,
}) => { }) => {
const { const {
...@@ -46,10 +45,6 @@ const nextFontLocalFontLoader: FontLoader = async ({ ...@@ -46,10 +45,6 @@ const nextFontLocalFontLoader: FontLoader = async ({
preload, preload,
typeof adjustFontFallback === 'undefined' || !!adjustFontFallback typeof adjustFontFallback === 'undefined' || !!adjustFontFallback
) )
// Should match behavior in get-asset-query-string.ts
const qs = deploymentId
? `${fontUrl.includes('?') ? '&' : '?'}dpl=${deploymentId}`
: ''
// Try to load font metadata from the font file using fontkit. // Try to load font metadata from the font file using fontkit.
// The data is used to calculate the fallback font override values. // The data is used to calculate the fallback font override values.
...@@ -71,7 +66,7 @@ const nextFontLocalFontLoader: FontLoader = async ({ ...@@ -71,7 +66,7 @@ const nextFontLocalFontLoader: FontLoader = async ({
? declarations.map(({ prop, value }) => [prop, value]) ? declarations.map(({ prop, value }) => [prop, value])
: []), : []),
...(hasCustomFontFamily ? [] : [['font-family', variableName]]), ...(hasCustomFontFamily ? [] : [['font-family', variableName]]),
['src', `url(${fontUrl + qs}) format('${format}')`], ['src', `url(${fontUrl}) format('${format}')`],
['font-display', display], ['font-display', display],
...(weight ?? defaultWeight ...(weight ?? defaultWeight
? [['font-weight', weight ?? defaultWeight]] ? [['font-weight', weight ?? defaultWeight]]
......
...@@ -19,7 +19,6 @@ export type FontLoader = (options: { ...@@ -19,7 +19,6 @@ export type FontLoader = (options: {
resolve: (src: string) => string resolve: (src: string) => string
isDev: boolean isDev: boolean
isServer: boolean isServer: boolean
deploymentId: string | undefined
loaderContext: any loaderContext: any
}) => Promise<{ }) => Promise<{
css: string css: string
......
...@@ -2451,7 +2451,6 @@ export default async function getBaseWebpackConfig( ...@@ -2451,7 +2451,6 @@ export default async function getBaseWebpackConfig(
isEdgeRuntime: isEdgeServer, isEdgeRuntime: isEdgeServer,
targetWeb: isClient || isEdgeServer, targetWeb: isClient || isEdgeServer,
assetPrefix: config.assetPrefix || '', assetPrefix: config.assetPrefix || '',
deploymentId: config.deploymentId,
sassOptions: config.sassOptions, sassOptions: config.sassOptions,
productionBrowserSourceMaps: config.productionBrowserSourceMaps, productionBrowserSourceMaps: config.productionBrowserSourceMaps,
future: config.future, future: config.future,
......
...@@ -62,7 +62,6 @@ export function getNextFontLoader( ...@@ -62,7 +62,6 @@ export function getNextFontLoader(
isDev: ctx.isDevelopment, isDev: ctx.isDevelopment,
isServer: ctx.isServer, isServer: ctx.isServer,
assetPrefix: ctx.assetPrefix, assetPrefix: ctx.assetPrefix,
deploymentId: ctx.deploymentId,
fontLoaderPath, fontLoaderPath,
postcss, postcss,
}, },
......
...@@ -19,7 +19,6 @@ export async function buildConfiguration( ...@@ -19,7 +19,6 @@ export async function buildConfiguration(
isEdgeRuntime, isEdgeRuntime,
targetWeb, targetWeb,
assetPrefix, assetPrefix,
deploymentId,
sassOptions, sassOptions,
productionBrowserSourceMaps, productionBrowserSourceMaps,
future, future,
...@@ -37,7 +36,6 @@ export async function buildConfiguration( ...@@ -37,7 +36,6 @@ export async function buildConfiguration(
isEdgeRuntime: boolean isEdgeRuntime: boolean
targetWeb: boolean targetWeb: boolean
assetPrefix: string assetPrefix: string
deploymentId: string | undefined
sassOptions: any sassOptions: any
productionBrowserSourceMaps: boolean productionBrowserSourceMaps: boolean
transpilePackages: NextConfigComplete['transpilePackages'] transpilePackages: NextConfigComplete['transpilePackages']
...@@ -63,7 +61,6 @@ export async function buildConfiguration( ...@@ -63,7 +61,6 @@ export async function buildConfiguration(
? assetPrefix.slice(0, -1) ? assetPrefix.slice(0, -1)
: assetPrefix : assetPrefix
: '', : '',
deploymentId,
sassOptions, sassOptions,
productionBrowserSourceMaps, productionBrowserSourceMaps,
transpilePackages, transpilePackages,
......
...@@ -19,7 +19,6 @@ export type ConfigurationContext = { ...@@ -19,7 +19,6 @@ export type ConfigurationContext = {
targetWeb: boolean targetWeb: boolean
assetPrefix: string assetPrefix: string
deploymentId: string | undefined
sassOptions: any sassOptions: any
productionBrowserSourceMaps: boolean productionBrowserSourceMaps: boolean
......
...@@ -45,7 +45,6 @@ export default async function nextFontLoader(this: any) { ...@@ -45,7 +45,6 @@ export default async function nextFontLoader(this: any) {
assetPrefix, assetPrefix,
fontLoaderPath, fontLoaderPath,
postcss: getPostcss, postcss: getPostcss,
deploymentId,
} = this.getOptions() } = this.getOptions()
if (assetPrefix && !/^\/|https?:\/\//.test(assetPrefix)) { if (assetPrefix && !/^\/|https?:\/\//.test(assetPrefix)) {
...@@ -67,7 +66,7 @@ export default async function nextFontLoader(this: any) { ...@@ -67,7 +66,7 @@ export default async function nextFontLoader(this: any) {
* NextFontManifestPlugin uses this to see if fallback fonts are being used. * NextFontManifestPlugin uses this to see if fallback fonts are being used.
* This is used to collect stats on fallback fonts usage by the Google Aurora team. * This is used to collect stats on fallback fonts usage by the Google Aurora team.
*/ */
const emitFontFile: Parameters<FontLoader>[0]['emitFontFile'] = ( const emitFontFile = (
content: Buffer, content: Buffer,
ext: string, ext: string,
preload: boolean, preload: boolean,
...@@ -110,7 +109,6 @@ export default async function nextFontLoader(this: any) { ...@@ -110,7 +109,6 @@ export default async function nextFontLoader(this: any) {
), ),
isDev, isDev,
isServer, isServer,
deploymentId,
loaderContext: this, loaderContext: this,
}) })
) )
......
...@@ -363,8 +363,7 @@ function getAmpPath(ampPath: string, asPath: string): string { ...@@ -363,8 +363,7 @@ function getAmpPath(ampPath: string, asPath: string): string {
function getNextFontLinkTags( function getNextFontLinkTags(
nextFontManifest: DeepReadonly<NextFontManifest> | undefined, nextFontManifest: DeepReadonly<NextFontManifest> | undefined,
dangerousAsPath: string, dangerousAsPath: string,
assetPrefix: string = '', assetPrefix: string = ''
assetQueryString: string = ''
) { ) {
if (!nextFontManifest) { if (!nextFontManifest) {
return { return {
...@@ -404,7 +403,7 @@ function getNextFontLinkTags( ...@@ -404,7 +403,7 @@ function getNextFontLinkTags(
<link <link
key={fontFile} key={fontFile}
rel="preload" rel="preload"
href={`${assetPrefix}/_next/${encodeURIPath(fontFile)}${assetQueryString}`} href={`${assetPrefix}/_next/${encodeURIPath(fontFile)}`}
as="font" as="font"
type={`font/${ext}`} type={`font/${ext}`}
crossOrigin="anonymous" crossOrigin="anonymous"
...@@ -756,8 +755,7 @@ export class Head extends React.Component<HeadProps> { ...@@ -756,8 +755,7 @@ export class Head extends React.Component<HeadProps> {
const nextFontLinkTags = getNextFontLinkTags( const nextFontLinkTags = getNextFontLinkTags(
nextFontManifest, nextFontManifest,
dangerousAsPath, dangerousAsPath,
assetPrefix, assetPrefix
this.context.assetQueryString
) )
const tracingMetadata = getTracedMetadata( const tracingMetadata = getTracedMetadata(
......
...@@ -46,7 +46,7 @@ export function getLayerAssets({ ...@@ -46,7 +46,7 @@ export function getLayerAssets({
const fontFilename = preloadedFontFiles[i] const fontFilename = preloadedFontFiles[i]
const ext = /\.(woff|woff2|eot|ttf|otf)$/.exec(fontFilename)![1] const ext = /\.(woff|woff2|eot|ttf|otf)$/.exec(fontFilename)![1]
const type = `font/${ext}` const type = `font/${ext}`
const href = `${ctx.assetPrefix}/_next/${encodeURIPath(fontFilename)}${getAssetQueryString(ctx, false)}` const href = `${ctx.assetPrefix}/_next/${encodeURIPath(fontFilename)}`
preloadCallbacks.push(() => { preloadCallbacks.push(() => {
ctx.componentMod.preloadFont( ctx.componentMod.preloadFont(
......
...@@ -45,7 +45,11 @@ describe('deployment-id-handling disabled', () => { ...@@ -45,7 +45,11 @@ describe('deployment-id-handling disabled', () => {
for (const link of links) { for (const link of links) {
if (link.attribs.href) { if (link.attribs.href) {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId) if (link.attribs.as === 'font') {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
} else {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
}
} }
} }
......
...@@ -39,7 +39,11 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'CUSTOM_DEPLOYMENT_ID'])( ...@@ -39,7 +39,11 @@ describe.each(['NEXT_DEPLOYMENT_ID', 'CUSTOM_DEPLOYMENT_ID'])(
for (const link of links) { for (const link of links) {
if (link.attribs.href && link.attribs.rel !== 'expect') { if (link.attribs.href && link.attribs.rel !== 'expect') {
expect(link.attribs.href).toContain('dpl=' + deploymentId) if (link.attribs.as === 'font') {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
} else {
expect(link.attribs.href).toContain('dpl=' + deploymentId)
}
} }
} }
...@@ -169,7 +173,11 @@ describe('deployment-id-handling disabled', () => { ...@@ -169,7 +173,11 @@ describe('deployment-id-handling disabled', () => {
for (const link of links) { for (const link of links) {
if (link.attribs.href) { if (link.attribs.href) {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId) if (link.attribs.as === 'font') {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
} else {
expect(link.attribs.href).not.toContain('dpl=' + deploymentId)
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment