Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update font loader output path #40868

Merged
merged 5 commits into from Sep 26, 2022
Merged

Update font loader output path #40868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4acf3b
Change font output path
Sep 24, 2022
87c21c2
Update tests
Sep 24, 2022
003a42f
Add font types to next package
Sep 24, 2022
5d06f08
Fix test
Sep 24, 2022
d6a846c
Merge branch 'canary' into font-output-path
Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/build/webpack/loaders/next-font-loader/index.ts
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ export default async function nextFontLoader(this: any) {
const interpolatedName = loaderUtils.interpolateName(
this,
// Font files ending with .p.(woff|woff2|eot|ttf|otf) are preloaded
`static/fonts/[hash]${preload ? '.p' : ''}.${ext}`,
`static/media/[hash]${preload ? '.p' : ''}.${ext}`,
opts
)
const outputPath = `${assetPrefix}/_next/${interpolatedName}`
Expand Down
3 changes: 2 additions & 1 deletion packages/next/package.json
View file
Open in desktop
Expand Up @@ -47,7 +47,8 @@
"types/index.d.ts",
"types/global.d.ts",
"types/compiled.d.ts",
"image-types/global.d.ts"
"image-types/global.d.ts",
"font"
],
"bin": {
"next": "./dist/bin/next"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/next-font/basepath.test.ts
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ describe('@next/font/google basepath', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/dashboard/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/dashboard/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand Down
82 changes: 41 additions & 41 deletions test/e2e/next-font/index.test.ts
View file
Open in desktop
Expand Up @@ -42,39 +42,39 @@ describe('@next/font/google', () => {

// _app.js
expect(JSON.parse($('#app-open-sans').text())).toEqual({
className: '__className_bbc724',
variable: '__variable_bbc724',
className: '__className_f32d04',
variable: '__variable_f32d04',
style: {
fontFamily: "'__Open_Sans_bbc724', '__open-sans-fallback_bbc724'",
fontFamily: "'__Open_Sans_f32d04', '__open-sans-fallback_f32d04'",
fontStyle: 'normal',
},
})

// with-fonts.js
expect(JSON.parse($('#with-fonts-open-sans').text())).toEqual({
className: '__className_bbc724',
variable: '__variable_bbc724',
className: '__className_f32d04',
variable: '__variable_f32d04',
style: {
fontFamily: "'__Open_Sans_bbc724', '__open-sans-fallback_bbc724'",
fontFamily: "'__Open_Sans_f32d04', '__open-sans-fallback_f32d04'",
fontStyle: 'normal',
},
})

// CompWithFonts.js
expect(JSON.parse($('#comp-with-fonts-inter').text())).toEqual({
className: '__className_17e98a',
variable: '__variable_17e98a',
className: '__className_55e413',
variable: '__variable_55e413',
style: {
fontFamily: "'__Inter_17e98a', '__inter-fallback_17e98a'",
fontFamily: "'__Inter_55e413', '__inter-fallback_55e413'",
fontStyle: 'normal',
fontWeight: 900,
},
})
expect(JSON.parse($('#comp-with-fonts-roboto').text())).toEqual({
className: '__className_72084b',
variable: '__variable_72084b',
className: '__className_29a3c6',
variable: '__variable_29a3c6',
style: {
fontFamily: "'__Roboto_72084b', '__roboto-fallback_72084b'",
fontFamily: "'__Roboto_29a3c6', '__roboto-fallback_29a3c6'",
fontStyle: 'italic',
fontWeight: 100,
},
Expand All @@ -87,29 +87,29 @@ describe('@next/font/google', () => {

// _app.js
expect(JSON.parse($('#app-open-sans').text())).toEqual({
className: expect.any(String),
variable: expect.any(String),
className: '__className_f32d04',
variable: '__variable_f32d04',
style: {
fontFamily: "'__Open_Sans_bbc724', '__open-sans-fallback_bbc724'",
fontFamily: "'__Open_Sans_f32d04', '__open-sans-fallback_f32d04'",
fontStyle: 'normal',
},
})

// with-local-fonts.js
expect(JSON.parse($('#first-local-font').text())).toEqual({
className: expect.any(String),
variable: expect.any(String),
className: '__className_410624',
variable: '__variable_410624',
style: {
fontFamily: "'__my-font_2cddd5'",
fontFamily: "'__my-font_410624'",
fontStyle: 'italic',
fontWeight: 100,
},
})
expect(JSON.parse($('#second-local-font').text())).toEqual({
className: expect.any(String),
variable: expect.any(String),
className: '__className_3ff726',
variable: '__variable_3ff726',
style: {
fontFamily: "'__my-other-font_0a2813'",
fontFamily: "'__my-other-font_3ff726'",
},
})
})
Expand All @@ -124,7 +124,7 @@ describe('@next/font/google', () => {
await browser.eval(
'getComputedStyle(document.querySelector("#app-open-sans")).fontFamily'
)
).toBe('__Open_Sans_bbc724, __open-sans-fallback_bbc724')
).toBe('__Open_Sans_f32d04, __open-sans-fallback_f32d04')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#app-open-sans")).fontWeight'
Expand All @@ -141,7 +141,7 @@ describe('@next/font/google', () => {
await browser.eval(
'getComputedStyle(document.querySelector("#with-fonts-open-sans")).fontFamily'
)
).toBe('__Open_Sans_bbc724, __open-sans-fallback_bbc724')
).toBe('__Open_Sans_f32d04, __open-sans-fallback_f32d04')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#with-fonts-open-sans")).fontWeight'
Expand All @@ -168,7 +168,7 @@ describe('@next/font/google', () => {
await browser.eval(
'getComputedStyle(document.querySelector("#comp-with-fonts-inter")).fontFamily'
)
).toBe('__Inter_17e98a, __inter-fallback_17e98a')
).toBe('__Inter_55e413, __inter-fallback_55e413')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#comp-with-fonts-inter")).fontWeight'
Expand All @@ -184,7 +184,7 @@ describe('@next/font/google', () => {
await browser.eval(
'getComputedStyle(document.querySelector("#comp-with-fonts-roboto")).fontFamily'
)
).toBe('__Roboto_72084b, __roboto-fallback_72084b')
).toBe('__Roboto_29a3c6, __roboto-fallback_29a3c6')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#comp-with-fonts-roboto")).fontWeight'
Expand All @@ -205,48 +205,48 @@ describe('@next/font/google', () => {
await browser.eval(
'getComputedStyle(document.querySelector("#variables-fira-code")).fontFamily'
)
).toBe('__Fira_Code_a1dc08, __fira-code-fallback_a1dc08')
).toBe('__Fira_Code_8d0076, __fira-code-fallback_8d0076')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#without-variables-fira-code")).fontFamily'
)
).not.toBe('__Fira_Code_a1dc08, __fira-code-fallback_a1dc08')
).not.toBe('__Fira_Code_8d0076, __fira-code-fallback_8d0076')

// Albert Sant Variable Italic
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#variables-albert-sans-italic")).fontFamily'
)
).toBe('__Albert_Sans_2b85d2')
).toBe('__Albert_Sans_3a491b')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#without-variables-albert-sans-italic")).fontFamily'
)
).not.toBe('__Albert_Sans_2b85d2')
).not.toBe('__Albert_Sans_3a491b')

// Inter 900
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#variables-inter-900")).fontFamily'
)
).toBe('__Inter_ea3712, __inter-fallback_ea3712')
).toBe('__Inter_09d70c, __inter-fallback_09d70c')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#without-variables-inter-900")).fontFamily'
)
).not.toBe('__Inter_ea3712, __inter-fallback_ea3712')
).not.toBe('__Inter_09d70c, __inter-fallback_09d70c')

// Roboto 100 Italic
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#variables-roboto-100-italic")).fontFamily'
)
).toBe('__Roboto_72084b, __roboto-fallback_72084b')
).toBe('__Roboto_29a3c6, __roboto-fallback_29a3c6')
expect(
await browser.eval(
'getComputedStyle(document.querySelector("#without-variables-roboto-100-italic")).fontFamily'
)
).not.toBe('__Roboto_72084b')
).not.toBe('__Roboto_29a3c6, __roboto-fallback_29a3c6')
})

test('page using fallback fonts', async () => {
Expand All @@ -258,7 +258,7 @@ describe('@next/font/google', () => {
'getComputedStyle(document.querySelector("#with-fallback-fonts-classname")).fontFamily'
)
).toBe(
'__Open_Sans_bbc724, system-ui, Arial, __open-sans-fallback_bbc724'
'__Open_Sans_f32d04, system-ui, Arial, __open-sans-fallback_f32d04'
)

// .style
Expand All @@ -267,7 +267,7 @@ describe('@next/font/google', () => {
'getComputedStyle(document.querySelector("#with-fallback-fonts-style")).fontFamily'
)
).toBe(
'__Open_Sans_bbc724, system-ui, Arial, __open-sans-fallback_bbc724'
'__Open_Sans_f32d04, system-ui, Arial, __open-sans-fallback_f32d04'
)

// .variable
Expand All @@ -276,7 +276,7 @@ describe('@next/font/google', () => {
'getComputedStyle(document.querySelector("#with-fallback-fonts-variable")).fontFamily'
)
).toBe(
'__Open_Sans_bbc724, system-ui, Arial, __open-sans-fallback_bbc724'
'__Open_Sans_f32d04, system-ui, Arial, __open-sans-fallback_f32d04'
)
})
})
Expand All @@ -294,14 +294,14 @@ describe('@next/font/google', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
expect($('link[as="font"]').get(1).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/4f3dcdf40b3ca86d.p.woff2',
href: '/_next/static/media/4f3dcdf40b3ca86d.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand All @@ -319,7 +319,7 @@ describe('@next/font/google', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand All @@ -338,15 +338,15 @@ describe('@next/font/google', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
// with-local-fonts
expect($('link[as="font"]').get(1).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/7be88d77534e80fd.p.woff2',
href: '/_next/static/media/7be88d77534e80fd.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/next-font/with-font-declarations-file.test.ts
View file
Open in desktop
Expand Up @@ -64,15 +64,15 @@ describe('@next/font/google with-font-declarations-file', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
// From /inter
expect($('link[as="font"]').get(1).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/4a7f86e553ee7e51.p.woff2',
href: '/_next/static/media/4a7f86e553ee7e51.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand All @@ -96,15 +96,15 @@ describe('@next/font/google with-font-declarations-file', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
// From /roboto
expect($('link[as="font"]').get(1).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/9a7e84b4dd095b33.p.woff2',
href: '/_next/static/media/9a7e84b4dd095b33.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand All @@ -128,15 +128,15 @@ describe('@next/font/google with-font-declarations-file', () => {
expect($('link[as="font"]').get(0).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/0812efcfaefec5ea.p.woff2',
href: '/_next/static/media/0812efcfaefec5ea.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
// From /local-font
expect($('link[as="font"]').get(1).attribs).toEqual({
as: 'font',
crossorigin: 'anonymous',
href: '/_next/static/fonts/2a931eed088772c9.p.woff2',
href: '/_next/static/media/2a931eed088772c9.p.woff2',
rel: 'preload',
type: 'font/woff2',
})
Expand Down