Skip to content

Commit

Permalink
Remove @next/font resolving for font loaders (#65601)
Browse files Browse the repository at this point in the history
Remove font loaders resolving for `@next/font`, users should directly
rely on `next/font`, they're intended to be removed.

Also removed the legacy tests
  • Loading branch information
huozhi committed May 10, 2024
1 parent 85162c8 commit bebda11
Show file tree
Hide file tree
Showing 58 changed files with 1,026 additions and 1,773 deletions.
9 changes: 1 addition & 8 deletions packages/next/src/build/swc/options.ts
Expand Up @@ -382,14 +382,7 @@ export function getLoaderSWCOptions({
esm: !!esm,
})
baseOptions.fontLoaders = {
fontLoaders: [
'next/font/local',
'next/font/google',

// TODO: remove this in the next major version
'@next/font/local',
'@next/font/google',
],
fontLoaders: ['next/font/local', 'next/font/google'],
relativeFilePathFromRoot,
}
baseOptions.cjsRequireOptimizer = {
Expand Down
3 changes: 0 additions & 3 deletions packages/next/src/build/webpack/config/blocks/css/index.ts
Expand Up @@ -211,9 +211,6 @@ export const css = curry(async function css(
const nextFontLoaders: Array<[string | RegExp, string, any?]> = [
[require.resolve('next/font/google/target.css'), googleLoader],
[require.resolve('next/font/local/target.css'), localLoader],
// TODO: remove this in the next major version
[/node_modules[\\/]@next[\\/]font[\\/]google[\\/]target.css/, googleLoader],
[/node_modules[\\/]@next[\\/]font[\\/]local[\\/]target.css/, localLoader],
]

nextFontLoaders.forEach(([fontLoaderTarget, fontLoaderPath]) => {
Expand Down
10 changes: 0 additions & 10 deletions test/e2e/app-dir/next-font/app-old/(preconnect)/layout.js

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

9 changes: 0 additions & 9 deletions test/e2e/app-dir/next-font/app-old/(preload)/Comp.js

This file was deleted.

10 changes: 0 additions & 10 deletions test/e2e/app-dir/next-font/app-old/(preload)/client/Comp.js

This file was deleted.

13 changes: 0 additions & 13 deletions test/e2e/app-dir/next-font/app-old/(preload)/client/layout.js

This file was deleted.

14 changes: 0 additions & 14 deletions test/e2e/app-dir/next-font/app-old/(preload)/client/page.js

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions test/e2e/app-dir/next-font/app-old/(preload)/layout.js

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

16 changes: 0 additions & 16 deletions test/e2e/app-dir/next-font/app-old/(preload)/page.js

This file was deleted.

This file was deleted.

Binary file not shown.
3 changes: 0 additions & 3 deletions test/e2e/app-dir/next-font/app-old/navigation/font.js

This file was deleted.

12 changes: 0 additions & 12 deletions test/e2e/app-dir/next-font/app-old/navigation/layout.js

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions test/e2e/app-dir/next-font/app-old/navigation/page.js

This file was deleted.

0 comments on commit bebda11

Please sign in to comment.