diff --git a/docs/advanced-features/codemods.md b/docs/advanced-features/codemods.md
index 02b39bdadf69..dfe8d18657c7 100644
--- a/docs/advanced-features/codemods.md
+++ b/docs/advanced-features/codemods.md
@@ -45,7 +45,7 @@ export default function Page() {
### `next-image-to-legacy-image`
-Safely migrates existing Next.js 10, 11, 12 applications importing `next/image` to the renamed `next/legacy/image` import in Next.js 13.
+This codemod safely migrates existing Next.js 10, 11, 12 applications importing `next/image` to the renamed `next/legacy/image` import in Next.js 13.
For example:
@@ -81,7 +81,7 @@ export default function Home() {
### `next-image-experimental` (experimental)
-Dangerously migrates from `next/legacy/image` to the new `next/image` by adding inline styles and removing unused props.
+This codemod dangerously migrates from `next/legacy/image` to the new `next/image` by adding inline styles and removing unused props. Please note this codemod is experimental and only covers static usage (such as ``) but not dynamic usage (such as ``).
- Removes `layout` prop and adds `style`
- Removes `objectFit` prop and adds `style`
diff --git a/docs/api-reference/next/font.md b/docs/api-reference/next/font.md
index 6d02fc1d8652..ddc6836b7ca3 100644
--- a/docs/api-reference/next/font.md
+++ b/docs/api-reference/next/font.md
@@ -91,7 +91,7 @@ A string value to define the CSS variable name to be used if the style is applie
### Font function arguments
-For usage, review [Local Fonts](/docs/optimizing/fonts#local-fonts).
+For usage, review [Local Fonts](/docs/basic-features/font-optimization.md#local-fonts).
| Key | Example | Data type | Required |
| ------------------------------------------- | ----------------------------------------------------------- | -------------------------------------- | -------- |
diff --git a/docs/basic-features/font-optimization.md b/docs/basic-features/font-optimization.md
index 3d78e78295ad..ac5119f92372 100644
--- a/docs/basic-features/font-optimization.md
+++ b/docs/basic-features/font-optimization.md
@@ -28,8 +28,9 @@ Import the font you would like to use from `@next/font/google` as a function. We
To use the font in all your pages, add it to [`_app.js` file](https://nextjs.org/docs/advanced-features/custom-app) under `/pages` as shown below:
-```js:pages/_app.js
-import { Inter } from '@next/font/google';
+```js
+// pages/_app.js
+import { Inter } from '@next/font/google'
// If loading a variable font, you don't need to specify the font weight
const inter = Inter()
@@ -45,8 +46,9 @@ export default function MyApp({ Component, pageProps }) {
If you can't use a variable font, you will **need to specify a weight**:
-```js:pages/_app.js
-import { Roboto } from '@next/font/google';
+```js
+// pages/_app.js
+import { Roboto } from '@next/font/google'
const roboto = Roboto({
weight: '400',
@@ -65,10 +67,11 @@ export default function MyApp({ Component, pageProps }) {
You can also use the font without a wrapper and `className` by injecting it inside the `` as follows:
-```js:pages/_app.js
-import { Inter } from '@next/font/google';
+```js
+// pages/_app.js
+import { Inter } from '@next/font/google'
-const inter = Inter();
+const inter = Inter()
export default function MyApp({ Component, pageProps }) {
return (
@@ -110,8 +113,9 @@ This can be done in 2 ways:
- On a font per font basis by adding it to the function call
- ```js:pages/_app.js
- const inter = Inter({ subsets: ["latin"] });
+ ```js
+ // pages/_app.js
+ const inter = Inter({ subsets: ['latin'] })
```
- Globally for all your fonts in your `next.config.js`
@@ -135,11 +139,12 @@ View the [Font API Reference](/docs/api-reference/next/font.md#nextfontgoogle) f
Import `@next/font/local` and specify the `src` of your local font file. We recommend using [**variable fonts**](https://fonts.google.com/variablefonts) for the best performance and flexibility.
-```js:pages/_app.js
-import localFont from '@next/font/local';
+```js
+// pages/_app.js
+import localFont from '@next/font/local'
// Font files can be colocated inside of `pages`
-const myFont = localFont({ src: './my-font.woff2' });
+const myFont = localFont({ src: './my-font.woff2' })
export default function MyApp({ Component, pageProps }) {
return (
diff --git a/docs/routing/introduction.md b/docs/routing/introduction.md
index 662c395937ff..c19a59486c9b 100644
--- a/docs/routing/introduction.md
+++ b/docs/routing/introduction.md
@@ -68,7 +68,7 @@ The example above uses multiple links. Each one maps a path (`href`) to a known
- `/about` → `pages/about.js`
- `/blog/hello-world` → `pages/blog/[slug].js`
-Any `` in the viewport (initially or through scroll) will be prefetched by default (including the corresponding data) for pages using [Static Generation](/docs/basic-features/data-fetching/get-static-props.md). The corresponding data for [server-rendered](/docs/basic-features/data-fetching/get-server-side-props.md) routes is fetched _only when_ the is clicked.
+Any `` in the viewport (initially or through scroll) will be prefetched by default (including the corresponding data) for pages using [Static Generation](/docs/basic-features/data-fetching/get-static-props.md). The corresponding data for [server-rendered](/docs/basic-features/data-fetching/get-server-side-props.md) routes is fetched _only when_ the `` is clicked.
### Linking to dynamic paths
diff --git a/docs/testing.md b/docs/testing.md
index 7dca84b8879a..7414761d37c3 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -293,7 +293,7 @@ module.exports = createJestConfig(customJestConfig)
Under the hood, `next/jest` is automatically configuring Jest for you, including:
- Setting up `transform` using [SWC](https://nextjs.org/docs/advanced-features/compiler)
-- Auto mocking stylesheets (`.css`, `.module.css`, and their scss variants) and image imports
+- Auto mocking stylesheets (`.css`, `.module.css`, and their scss variants), image imports and [`@next/font`](https://nextjs.org/docs/basic-features/font-optimization)
- Loading `.env` (and all variants) into `process.env`
- Ignoring `node_modules` from test resolving and transforms
- Ignoring `.next` from test resolving
diff --git a/docs/upgrading.md b/docs/upgrading.md
index bd7539b659a0..86f1cd626c6f 100644
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -34,16 +34,16 @@ You can continue using `pages` with new features that work in both directories,
### `` Component
-Next.js 12 introduced new improvements to the Image Component with a temporary import: `next/future/image`. These improvements included less client-side JavaScript, easier ways to extend and style images, better accessibility, and native browser lazy loading.
+Next.js 12 introduced many improvements to the Image Component with a temporary import: `next/future/image`. These improvements included less client-side JavaScript, easier ways to extend and style images, better accessibility, and native browser lazy loading.
-In version 13, this new behavior is now the default for `next/image`.
+Starting in Next.js 13, this new behavior is now the default for `next/image`.
There are two codemods to help you migrate to the new Image Component:
-- [**`next-image-to-legacy-image` codemod**](/docs/advanced-features/codemods.md#rename-instances-of-nextimage): Safely and automatically renames `next/image` imports to `next/legacy/image`. Existing components will maintain the same behavior.
-- [**`next-image-experimental` codemod**](/docs/advanced-features/codemods.md#migrate-next-image-experimental-experimental): Dangerously adds inline styles and removes unused props using the experimental. This will change the behavior of existing components to match the new defaults. To use this codemod, you need to run the `next-image-to-legacy-image` codemod first.
+- [next-image-to-legacy-image](/docs/advanced-features/codemods.md#rename-instances-of-nextimage): This codemod will safely and automatically rename `next/image` imports to `next/legacy/image` to maintain the same behavior as Next.js 12. We recommend running this codemod to quickly update to Next.js 13 automatically.
+- [next-image-experimental](/docs/advanced-features/codemods.md#next-image-experimental-experimental): After running the previous codemod, you can optionally run this experimental codemod to upgrade `next/legacy/image` to the new `next/image`, which will remove unused props and add inline styles. Please note this codemod is experimental and only covers static usage (such as ``) but not dynamic usage (such as ``).
-Alternatively, you can manually update props by following the [`next/future/image` migration guide](/docs/api-reference/next/image.md#migration). This will change the behavior of existing components to match the new defaults.
+Alternatively, you can manually update by following the [migration guide](/docs/advanced-features/codemods.md#next-image-experimental-experimental) and also see the [legacy comparison](/docs/api-reference/next/legacy/image.md#comparison).
### `` Component
diff --git a/errors/next-image-upgrade-to-13.md b/errors/next-image-upgrade-to-13.md
index eeb42566da13..3553cc3e3a40 100644
--- a/errors/next-image-upgrade-to-13.md
+++ b/errors/next-image-upgrade-to-13.md
@@ -31,7 +31,7 @@ After running this codemod, you can optionally upgrade `next/legacy/image` to th
npx @next/codemod next-image-experimental .
```
-Please note this second codemod is experimental and only covers static usage, not dynamic usage (such ``).
+Please note this second codemod is experimental and only covers static usage (such as ``) but not dynamic usage (such as ``).
### Useful Links
diff --git a/examples/with-turbopack/app/hooks/[categorySlug]/[subCategorySlug]/page.tsx b/examples/with-turbopack/app/hooks/[categorySlug]/[subCategorySlug]/page.tsx
index 17332209bc76..59b42fd7fec9 100644
--- a/examples/with-turbopack/app/hooks/[categorySlug]/[subCategorySlug]/page.tsx
+++ b/examples/with-turbopack/app/hooks/[categorySlug]/[subCategorySlug]/page.tsx
@@ -4,7 +4,7 @@ import { SkeletonCard } from '@/ui/SkeletonCard';
export default function Page({ params }: PageProps) {
const category = use(
- fetchSubCategory(params.categorySlug, params.subCategory),
+ fetchSubCategory(params.categorySlug, params.subCategorySlug),
);
if (!category) return null;
return (
diff --git a/jest.config.js b/jest.config.js
index a99f0afcea12..177949779f05 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -14,6 +14,9 @@ const customJestConfig = {
globals: {
AbortSignal: global.AbortSignal,
},
+ moduleNameMapper: {
+ '@next/font/(.*)': '@next/font/$1',
+ },
}
// createJestConfig is exported in this way to ensure that next/jest can load the Next.js config which is async
diff --git a/packages/font/src/google/loader.ts b/packages/font/src/google/loader.ts
index b835c439ade0..a4692077d364 100644
--- a/packages/font/src/google/loader.ts
+++ b/packages/font/src/google/loader.ts
@@ -49,27 +49,21 @@ const downloadGoogleFonts: FontLoader = async ({
)
}
- let fontFaceDeclarations = ''
- for (const weight of weights) {
- for (const style of styles) {
- const fontAxes = getFontAxes(
- fontFamily,
- weight,
- style,
- selectedVariableAxes
- )
- const url = getUrl(fontFamily, fontAxes, display)
+ const fontAxes = getFontAxes(
+ fontFamily,
+ weights,
+ styles,
+ selectedVariableAxes
+ )
+ const url = getUrl(fontFamily, fontAxes, display)
- let cachedCssRequest = cssCache.get(url)
- const fontFaceDeclaration =
- cachedCssRequest ?? (await fetchCSSFromGoogleFonts(url, fontFamily))
- if (!cachedCssRequest) {
- cssCache.set(url, fontFaceDeclaration)
- } else {
- cssCache.delete(url)
- }
- fontFaceDeclarations += `${fontFaceDeclaration}\n`
- }
+ let cachedCssRequest = cssCache.get(url)
+ const fontFaceDeclarations =
+ cachedCssRequest ?? (await fetchCSSFromGoogleFonts(url, fontFamily))
+ if (!cachedCssRequest) {
+ cssCache.set(url, fontFaceDeclarations)
+ } else {
+ cssCache.delete(url)
}
// Find font files to download
diff --git a/packages/font/src/google/utils.ts b/packages/font/src/google/utils.ts
index 5060ebcc29fa..16baec887f90 100644
--- a/packages/font/src/google/utils.ts
+++ b/packages/font/src/google/utils.ts
@@ -126,25 +126,50 @@ export function validateData(functionName: string, data: any): FontOptions {
export function getUrl(
fontFamily: string,
- axes: [string, string][],
+ axes: {
+ wght: string[]
+ ital: string[]
+ variableAxes?: [string, string][]
+ },
display: string
) {
+ // Variants are all combinations of weight and style, each variant will result in a separate font file
+ const variants: Array<[string, string][]> = []
+ for (const wgth of axes.wght) {
+ if (axes.ital.length === 0) {
+ variants.push([['wght', wgth], ...(axes.variableAxes ?? [])])
+ } else {
+ for (const ital of axes.ital) {
+ variants.push([
+ ['ital', ital],
+ ['wght', wgth],
+ ...(axes.variableAxes ?? []),
+ ])
+ }
+ }
+ }
+
// Google api requires the axes to be sorted, starting with lowercase words
- axes.sort(([a], [b]) => {
- const aIsLowercase = a.charCodeAt(0) > 96
- const bIsLowercase = b.charCodeAt(0) > 96
- if (aIsLowercase && !bIsLowercase) return -1
- if (bIsLowercase && !aIsLowercase) return 1
+ if (axes.variableAxes) {
+ variants.forEach((variant) => {
+ variant.sort(([a], [b]) => {
+ const aIsLowercase = a.charCodeAt(0) > 96
+ const bIsLowercase = b.charCodeAt(0) > 96
+ if (aIsLowercase && !bIsLowercase) return -1
+ if (bIsLowercase && !aIsLowercase) return 1
- return a > b ? 1 : -1
- })
+ return a > b ? 1 : -1
+ })
+ })
+ }
return `https://fonts.googleapis.com/css2?family=${fontFamily.replace(
/ /g,
'+'
- )}:${axes.map(([key]) => key).join(',')}@${axes
- .map(([, val]) => val)
- .join(',')}&display=${display}`
+ )}:${variants[0].map(([key]) => key).join(',')}@${variants
+ .map((variant) => variant.map(([, val]) => val).join(','))
+ .sort()
+ .join(';')}&display=${display}`
}
export async function fetchCSSFromGoogleFonts(url: string, fontFamily: string) {
@@ -192,17 +217,23 @@ export async function fetchFontFile(url: string) {
export function getFontAxes(
fontFamily: string,
- weight: string,
- style: string,
+ weights: string[],
+ styles: string[],
selectedVariableAxes?: string[]
-): [string, string][] {
+): {
+ wght: string[]
+ ital: string[]
+ variableAxes?: [string, string][]
+} {
const allAxes: Array<{ tag: string; min: number; max: number }> = (
fontData as any
)[fontFamily].axes
- const italicAxis: [string, string][] =
- style === 'italic' ? [['ital', '1']] : []
+ const hasItalic = styles.includes('italic')
+ const hasNormal = styles.includes('normal')
+ const ital = hasItalic ? [...(hasNormal ? ['0'] : []), '1'] : []
- if (weight === 'variable') {
+ // Weights will always contain one element if it's a variable font
+ if (weights[0] === 'variable') {
if (selectedVariableAxes) {
const defineAbleAxes: string[] = allAxes
.map(({ tag }) => tag)
@@ -228,14 +259,25 @@ export function getFontAxes(
})
}
- const variableAxes: [string, string][] = allAxes
- .filter(
- ({ tag }) => tag === 'wght' || selectedVariableAxes?.includes(tag)
- )
- .map(({ tag, min, max }) => [tag, `${min}..${max}`])
+ let weightAxis: string
+ const variableAxes: [string, string][] = []
+ for (const { tag, min, max } of allAxes) {
+ if (tag === 'wght') {
+ weightAxis = `${min}..${max}`
+ } else if (selectedVariableAxes?.includes(tag)) {
+ variableAxes.push([tag, `${min}..${max}`])
+ }
+ }
- return [...italicAxis, ...variableAxes]
+ return {
+ wght: [weightAxis!],
+ ital,
+ variableAxes,
+ }
} else {
- return [...italicAxis, ['wght', weight]]
+ return {
+ ital,
+ wght: weights,
+ }
}
}
diff --git a/packages/next/build/jest/__mocks__/nextFontMock.js b/packages/next/build/jest/__mocks__/nextFontMock.js
new file mode 100644
index 000000000000..f076797502d8
--- /dev/null
+++ b/packages/next/build/jest/__mocks__/nextFontMock.js
@@ -0,0 +1,12 @@
+module.exports = new Proxy(
+ {},
+ {
+ get: function getter() {
+ return () => ({
+ className: 'className',
+ variable: 'variable',
+ style: { fontFamily: 'fontFamily' },
+ })
+ },
+ }
+)
diff --git a/packages/next/build/jest/jest.ts b/packages/next/build/jest/jest.ts
index ef17dc10a189..8b1e704bc1b0 100644
--- a/packages/next/build/jest/jest.ts
+++ b/packages/next/build/jest/jest.ts
@@ -115,6 +115,9 @@ export default function nextJest(options: { dir?: string } = {}) {
// Keep .svg to it's own rule to make overriding easy
'^.+\\.(svg)$': require.resolve(`./__mocks__/fileMock.js`),
+ // Handle @next/font
+ '@next/font/(.*)': require.resolve('./__mocks__/nextFontMock.js'),
+
// custom config comes last to ensure the above rules are matched,
// fixes the case where @pages/(.*) -> src/pages/$! doesn't break
// CSS/image mocks
diff --git a/packages/next/build/swc/options.js b/packages/next/build/swc/options.js
index 6dfb154cd0e1..673d4a0dd279 100644
--- a/packages/next/build/swc/options.js
+++ b/packages/next/build/swc/options.js
@@ -33,7 +33,6 @@ function getBaseSWCOptions({
jsConfig,
swcCacheDir,
isServerLayer,
- relativeFilePathFromRoot,
hasServerComponents,
}) {
const parserConfig = getParserOptions({ filename, jsConfig })
@@ -131,15 +130,6 @@ function getBaseSWCOptions({
isServer: !!isServerLayer,
}
: false,
- fontLoaders:
- nextConfig?.experimental?.fontLoaders && relativeFilePathFromRoot
- ? {
- fontLoaders: nextConfig.experimental.fontLoaders.map(
- ({ loader }) => loader
- ),
- relativeFilePathFromRoot,
- }
- : null,
}
}
@@ -255,6 +245,15 @@ export function getLoaderSWCOptions({
hasServerComponents,
})
+ if (nextConfig?.experimental?.fontLoaders && relativeFilePathFromRoot) {
+ baseOptions.fontLoaders = {
+ fontLoaders: nextConfig.experimental.fontLoaders.map(
+ ({ loader }) => loader
+ ),
+ relativeFilePathFromRoot,
+ }
+ }
+
const isNextDist = nextDistPath.test(filename)
if (isServer) {
diff --git a/packages/next/build/webpack/plugins/flight-client-entry-plugin.ts b/packages/next/build/webpack/plugins/flight-client-entry-plugin.ts
index bb781e778b3b..c048c8b90817 100644
--- a/packages/next/build/webpack/plugins/flight-client-entry-plugin.ts
+++ b/packages/next/build/webpack/plugins/flight-client-entry-plugin.ts
@@ -189,7 +189,7 @@ export class FlightClientEntryPlugin {
dependency: layoutOrPageDependency,
})
- const isAbsoluteRequest = layoutOrPageRequest[0] === '/'
+ const isAbsoluteRequest = path.isAbsolute(layoutOrPageRequest)
// Next.js internals are put into a separate entry.
if (!isAbsoluteRequest) {
diff --git a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
index 99859a5bc437..00aefb985d64 100644
--- a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
+++ b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
@@ -201,7 +201,7 @@ export class FlightManifestPlugin {
},
}
} else {
- // It is possible that there are mtuliepl modules with the same resouce,
+ // It is possible that there are multiple modules with the same resource,
// e.g. extracted by mini-css-extract-plugin. In that case we need to
// merge the chunks.
manifest[resource].default.chunks = [
diff --git a/test/e2e/next-font/app/pages/with-google-fonts.js b/test/e2e/next-font/app/pages/with-google-fonts.js
index cd6428a4ec3a..39ede912aa31 100644
--- a/test/e2e/next-font/app/pages/with-google-fonts.js
+++ b/test/e2e/next-font/app/pages/with-google-fonts.js
@@ -1,7 +1,16 @@
-import { Fraunces, Indie_Flower } from '@next/font/google'
+import { Fraunces, Indie_Flower, Roboto } from '@next/font/google'
-const indieFlower = Indie_Flower({ weight: '400' })
-const fraunces = Fraunces({ weight: '400' })
+const indieFlower = Indie_Flower({ weight: '400', preload: false })
+const fraunces = Fraunces({ weight: '400', preload: false })
+
+const robotoMultiple = Roboto({
+ weight: ['900', '100'],
+ style: ['normal', 'italic'],
+})
+const frauncesMultiple = Fraunces({
+ style: ['italic', 'normal'],
+ axes: ['SOFT', 'WONK', 'opsz'],
+})
export default function WithFonts() {
return (
@@ -12,6 +21,12 @@ export default function WithFonts() {