From fd2724ace0d6a64e5e8d25b0762f4f341b5ffab9 Mon Sep 17 00:00:00 2001 From: Michael Novotny Date: Thu, 12 Oct 2023 18:18:22 -0500 Subject: [PATCH 1/2] Changes codeblock filename delimiter (#56712) Based on feedback from #56603, the `/` can be interpreted as file paths instead of filename separators / delimiters. We'll change them to use pipes `|` instead. --- .../01-fetching-caching-and-revalidating.mdx | 6 +-- .../06-optimizing/04-metadata.mdx | 4 +- .../01-metadata/app-icons.mdx | 8 +-- .../01-metadata/opengraph-image.mdx | 12 ++--- .../route-segment-config.mdx | 32 +++++------ .../04-functions/generate-metadata.mdx | 54 +++++++++---------- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/docs/02-app/01-building-your-application/02-data-fetching/01-fetching-caching-and-revalidating.mdx b/docs/02-app/01-building-your-application/02-data-fetching/01-fetching-caching-and-revalidating.mdx index f73228c63590a..3c28cd1ac0ad9 100644 --- a/docs/02-app/01-building-your-application/02-data-fetching/01-fetching-caching-and-revalidating.mdx +++ b/docs/02-app/01-building-your-application/02-data-fetching/01-fetching-caching-and-revalidating.mdx @@ -107,7 +107,7 @@ fetch('https://...', { next: { revalidate: 3600 } }) Alternatively, to revalidate all `fetch` requests in a route segment, you can use the [Segment Config Options](/docs/app/api-reference/file-conventions/route-segment-config). -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const revalidate = 3600 // revalidate at most every hour ``` @@ -250,7 +250,7 @@ If an error is thrown while attempting to revalidate data, the last successfully To opt out of caching for individual `fetch` requests, you can set the `cache` option in `fetch` to `'no-store'`. This will fetch data dynamically, on every request. -```js filename="layout.js / page.js" +```js filename="layout.js | page.js" fetch('https://...', { cache: 'no-store' }) ``` @@ -262,7 +262,7 @@ If you have multiple `fetch` requests in a route segment (e.g. a Layout or Page) For example, using `const dynamic = 'force-dynamic'` will cause all data to be fetched at request time, and the segment to be rendered dynamically. -```js filename="layout.js / page.js" +```js filename="layout.js | page.js" // Add export const dynamic = 'force-dynamic' ``` diff --git a/docs/02-app/01-building-your-application/06-optimizing/04-metadata.mdx b/docs/02-app/01-building-your-application/06-optimizing/04-metadata.mdx index 77996a627a27f..deb9f0e9233bd 100644 --- a/docs/02-app/01-building-your-application/06-optimizing/04-metadata.mdx +++ b/docs/02-app/01-building-your-application/06-optimizing/04-metadata.mdx @@ -21,7 +21,7 @@ With both these options, Next.js will automatically generate the relevant ` ``` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { openGraph: { title: 'Next.js', @@ -571,7 +571,7 @@ export const metadata: Metadata = { > **Good to know**: We recommend using the [file-based Metadata API](/docs/app/api-reference/file-conventions/metadata/app-icons#image-files-ico-jpg-png) for icons where possible. Rather than having to sync the config export with actual files, the file-based API will automatically generate the correct metadata for you. -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { icons: { icon: '/icon.png', @@ -595,7 +595,7 @@ export const metadata = { /> ``` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { icons: { icon: [{ url: '/icon.png' }, new URL('/icon.png', 'https://example.com')], @@ -639,7 +639,7 @@ Learn more about [theme-color](https://developer.mozilla.org/docs/Web/HTML/Eleme **Simple theme color** -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { themeColor: 'black', } @@ -651,7 +651,7 @@ export const metadata = { **With media attribute** -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { themeColor: [ { media: '(prefers-color-scheme: light)', color: 'cyan' }, @@ -669,7 +669,7 @@ export const metadata = { A web application manifest, as defined in the [Web Application Manifest specification](https://developer.mozilla.org/docs/Web/Manifest). -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { manifest: 'https://nextjs.org/manifest.json', } @@ -683,7 +683,7 @@ export const metadata = { Learn more about the [Twitter Card markup reference](https://developer.twitter.com/en/docs/twitter-for-websites/cards/overview/markup). -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { twitter: { card: 'summary_large_image', @@ -707,7 +707,7 @@ export const metadata = { ``` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { twitter: { card: 'app', @@ -759,7 +759,7 @@ export const metadata = { > **Good to know**: The `viewport` meta tag is automatically set with the following default values. Usually, manual configuration is unnecessary as the default is sufficient. However, the information is provided for completeness. -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { viewport: { width: 'device-width', @@ -778,7 +778,7 @@ export const metadata = { ### `verification` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { verification: { google: 'google', @@ -801,7 +801,7 @@ export const metadata = { ### `appleWebApp` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { itunes: { appId: 'myAppStoreID', @@ -845,7 +845,7 @@ export const metadata = { ### `alternates` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { alternates: { canonical: 'https://nextjs.org', @@ -881,7 +881,7 @@ export const metadata = { ### `appLinks` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { appLinks: { ios: { @@ -913,7 +913,7 @@ export const metadata = { Describes a collection of records, documents, or other materials of historical interest ([source](https://www.w3.org/TR/2011/WD-html5-20110113/links.html#rel-archives)). -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { archives: ['https://nextjs.org/13'], } @@ -925,7 +925,7 @@ export const metadata = { ### `assets` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { assets: ['https://nextjs.org/assets'], } @@ -937,7 +937,7 @@ export const metadata = { ### `bookmarks` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { bookmarks: ['https://nextjs.org/13'], } @@ -949,7 +949,7 @@ export const metadata = { ### `category` -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { category: 'technology', } @@ -963,7 +963,7 @@ export const metadata = { All metadata options should be covered using the built-in support. However, there may be custom metadata tags specific to your site, or brand new metadata tags just released. You can use the `other` option to render any custom metadata tag. -```jsx filename="layout.js / page.js" +```jsx filename="layout.js | page.js" export const metadata = { other: { custom: 'meta', From e0cd06531bcd004fe73c1ab8836c28584c5c8286 Mon Sep 17 00:00:00 2001 From: vercel-release-bot Date: Thu, 12 Oct 2023 23:23:04 +0000 Subject: [PATCH 2/2] v13.5.5-canary.11 --- lerna.json | 2 +- packages/create-next-app/package.json | 2 +- packages/eslint-config-next/package.json | 4 ++-- packages/eslint-plugin-next/package.json | 2 +- packages/font/package.json | 2 +- packages/next-bundle-analyzer/package.json | 2 +- packages/next-codemod/package.json | 2 +- packages/next-env/package.json | 2 +- packages/next-mdx/package.json | 2 +- packages/next-plugin-storybook/package.json | 2 +- packages/next-polyfill-module/package.json | 2 +- packages/next-polyfill-nomodule/package.json | 2 +- packages/next-swc/package.json | 2 +- packages/next/package.json | 14 +++++++------- packages/react-dev-overlay/package.json | 2 +- packages/react-refresh-utils/package.json | 2 +- packages/third-parties/package.json | 4 ++-- pnpm-lock.yaml | 16 ++++++++-------- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lerna.json b/lerna.json index a4dc7769b068e..e71150afa9fe6 100644 --- a/lerna.json +++ b/lerna.json @@ -16,5 +16,5 @@ "registry": "https://registry.npmjs.org/" } }, - "version": "13.5.5-canary.10" + "version": "13.5.5-canary.11" } diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json index 5f5cb358e41ec..6bd6103250d4f 100644 --- a/packages/create-next-app/package.json +++ b/packages/create-next-app/package.json @@ -1,6 +1,6 @@ { "name": "create-next-app", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "keywords": [ "react", "next", diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json index 2d99c4d1cad3b..b41d5193f8c9b 100644 --- a/packages/eslint-config-next/package.json +++ b/packages/eslint-config-next/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-next", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "ESLint configuration used by Next.js.", "main": "index.js", "license": "MIT", @@ -10,7 +10,7 @@ }, "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config", "dependencies": { - "@next/eslint-plugin-next": "13.5.5-canary.10", + "@next/eslint-plugin-next": "13.5.5-canary.11", "@rushstack/eslint-patch": "^1.3.3", "@typescript-eslint/parser": "^5.4.2 || ^6.0.0", "eslint-import-resolver-node": "^0.3.6", diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json index 10e7b0ee53bcf..01fdcd3a0d053 100644 --- a/packages/eslint-plugin-next/package.json +++ b/packages/eslint-plugin-next/package.json @@ -1,6 +1,6 @@ { "name": "@next/eslint-plugin-next", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "ESLint plugin for Next.js.", "main": "dist/index.js", "license": "MIT", diff --git a/packages/font/package.json b/packages/font/package.json index 7cf1e049ca04b..daf05dee73c4b 100644 --- a/packages/font/package.json +++ b/packages/font/package.json @@ -1,6 +1,6 @@ { "name": "@next/font", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "repository": { "url": "vercel/next.js", "directory": "packages/font" diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json index 4324526a3ea41..f14ada397ee83 100644 --- a/packages/next-bundle-analyzer/package.json +++ b/packages/next-bundle-analyzer/package.json @@ -1,6 +1,6 @@ { "name": "@next/bundle-analyzer", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "main": "index.js", "types": "index.d.ts", "license": "MIT", diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json index 3630d974b2e05..fe2c588218724 100644 --- a/packages/next-codemod/package.json +++ b/packages/next-codemod/package.json @@ -1,6 +1,6 @@ { "name": "@next/codemod", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "license": "MIT", "repository": { "type": "git", diff --git a/packages/next-env/package.json b/packages/next-env/package.json index 2f9f3d2c29137..07a35d1589b87 100644 --- a/packages/next-env/package.json +++ b/packages/next-env/package.json @@ -1,6 +1,6 @@ { "name": "@next/env", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "keywords": [ "react", "next", diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json index e0422e8127e16..3b47892f0ca4a 100644 --- a/packages/next-mdx/package.json +++ b/packages/next-mdx/package.json @@ -1,6 +1,6 @@ { "name": "@next/mdx", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "main": "index.js", "license": "MIT", "repository": { diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json index f9e5bae7e7957..6bdb0347f0221 100644 --- a/packages/next-plugin-storybook/package.json +++ b/packages/next-plugin-storybook/package.json @@ -1,6 +1,6 @@ { "name": "@next/plugin-storybook", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "repository": { "url": "vercel/next.js", "directory": "packages/next-plugin-storybook" diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json index 7f95bfa69f9bc..7ba60af11194b 100644 --- a/packages/next-polyfill-module/package.json +++ b/packages/next-polyfill-module/package.json @@ -1,6 +1,6 @@ { "name": "@next/polyfill-module", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)", "main": "dist/polyfill-module.js", "license": "MIT", diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json index c4cc8ad446d5a..b08b4d8394be3 100644 --- a/packages/next-polyfill-nomodule/package.json +++ b/packages/next-polyfill-nomodule/package.json @@ -1,6 +1,6 @@ { "name": "@next/polyfill-nomodule", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "A polyfill for non-dead, nomodule browsers.", "main": "dist/polyfill-nomodule.js", "license": "MIT", diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json index bd994e41c220a..2c28720169298 100644 --- a/packages/next-swc/package.json +++ b/packages/next-swc/package.json @@ -1,6 +1,6 @@ { "name": "@next/swc", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "private": true, "scripts": { "clean": "node ../../scripts/rm.mjs native", diff --git a/packages/next/package.json b/packages/next/package.json index 72b8c595f3ef3..658ac474cecab 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -1,6 +1,6 @@ { "name": "next", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "The React Framework", "main": "./dist/server/next.js", "license": "MIT", @@ -90,7 +90,7 @@ ] }, "dependencies": { - "@next/env": "13.5.5-canary.10", + "@next/env": "13.5.5-canary.11", "@swc/helpers": "0.5.2", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", @@ -144,11 +144,11 @@ "@mswjs/interceptors": "0.23.0", "@napi-rs/cli": "2.16.2", "@napi-rs/triples": "1.1.0", - "@next/polyfill-module": "13.5.5-canary.10", - "@next/polyfill-nomodule": "13.5.5-canary.10", - "@next/react-dev-overlay": "13.5.5-canary.10", - "@next/react-refresh-utils": "13.5.5-canary.10", - "@next/swc": "13.5.5-canary.10", + "@next/polyfill-module": "13.5.5-canary.11", + "@next/polyfill-nomodule": "13.5.5-canary.11", + "@next/react-dev-overlay": "13.5.5-canary.11", + "@next/react-refresh-utils": "13.5.5-canary.11", + "@next/swc": "13.5.5-canary.11", "@opentelemetry/api": "1.4.1", "@playwright/test": "^1.35.1", "@taskr/clear": "1.1.0", diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json index 5b1ff91233d84..5fae8eaacde57 100644 --- a/packages/react-dev-overlay/package.json +++ b/packages/react-dev-overlay/package.json @@ -1,6 +1,6 @@ { "name": "@next/react-dev-overlay", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "A development-only overlay for developing React applications.", "repository": { "url": "vercel/next.js", diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json index 8d1852f934060..e335ed564599f 100644 --- a/packages/react-refresh-utils/package.json +++ b/packages/react-refresh-utils/package.json @@ -1,6 +1,6 @@ { "name": "@next/react-refresh-utils", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "description": "An experimental package providing utilities for React Refresh.", "repository": { "url": "vercel/next.js", diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json index 74470f077fc2a..38b4a9b0964f5 100644 --- a/packages/third-parties/package.json +++ b/packages/third-parties/package.json @@ -1,6 +1,6 @@ { "name": "@next/third-parties", - "version": "13.5.5-canary.10", + "version": "13.5.5-canary.11", "private": true, "repository": { "url": "vercel/next.js", @@ -23,7 +23,7 @@ "third-party-capital": "1.0.20" }, "devDependencies": { - "next": "13.5.5-canary.10", + "next": "13.5.5-canary.11", "outdent": "0.8.0", "prettier": "2.5.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b0d3918c6af2..2bd236397921c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -735,7 +735,7 @@ importers: packages/eslint-config-next: dependencies: '@next/eslint-plugin-next': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../eslint-plugin-next '@rushstack/eslint-patch': specifier: ^1.3.3 @@ -796,7 +796,7 @@ importers: packages/next: dependencies: '@next/env': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../next-env '@swc/helpers': specifier: 0.5.2 @@ -920,19 +920,19 @@ importers: specifier: 1.1.0 version: 1.1.0 '@next/polyfill-module': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../next-polyfill-module '@next/polyfill-nomodule': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../next-polyfill-nomodule '@next/react-dev-overlay': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../react-dev-overlay '@next/react-refresh-utils': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../react-refresh-utils '@next/swc': - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../next-swc '@opentelemetry/api': specifier: 1.4.1 @@ -1586,7 +1586,7 @@ importers: version: 1.0.20 devDependencies: next: - specifier: 13.5.5-canary.10 + specifier: 13.5.5-canary.11 version: link:../next outdent: specifier: 0.8.0