Merge branch 'canary' into update/fonts-data-1713148075535

ijjk · web-flow · commit c8287abd3180 · 2024-04-15T07:58:23.000-07:00
diff --git a/.github/actions/next-integration-stat/package.json b/.github/actions/next-integration-stat/package.json
@@ -22,7 +22,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }
diff --git a/.github/actions/next-stats-action/package.json b/.github/actions/next-stats-action/package.json
@@ -19,7 +19,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }
diff --git a/.github/actions/upload-turboyet-data/package.json b/.github/actions/upload-turboyet-data/package.json
@@ -13,7 +13,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -275,6 +275,9 @@ jobs:
           cache-provider: 'turbo'
           shared-key: build-${{ matrix.settings.target }}-${{ hashFiles('.cargo/config.toml') }}
 
+      - name: Clear native build
+        run: rm -rf packages/next-swc/native
+
       # we only need custom caching for docker builds
       # as they are on an older Node.js version and have
       # issues with turbo caching
diff --git a/docs/02-app/01-building-your-application/07-configuring/05-mdx.mdx b/docs/02-app/01-building-your-application/07-configuring/05-mdx.mdx
@@ -539,6 +539,8 @@ export default function MDXPage({ children }) {
 }
 ```
 
+</PagesOnly >
+
 ## Frontmatter
 
 Frontmatter is a YAML like key/value pairing that can be used to store data about a page. `@next/mdx` does **not** support frontmatter by default, though there are many solutions for adding frontmatter to your MDX content, such as:
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.2.1-canary.5"
+  "version": "14.2.1-canary.6"
 }
diff --git a/package.json b/package.json
@@ -256,7 +256,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "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": "14.2.1-canary.5",
+    "@next/eslint-plugin-next": "14.2.1-canary.6",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",
diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"
diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",
@@ -11,7 +11,7 @@
     "build-native-no-plugin-woa-release": "napi build --platform -p next-swc-napi --cargo-cwd ../../ --cargo-name next_swc_napi --release --cargo-flags=--no-default-features --features image-webp,tracing/release_max_level_info --js false native",
     "build-native-wasi": "npx --package=@napi-rs/cli@3.0.0-alpha.45 napi build --platform --target wasm32-wasip1-threads -p next-swc-napi --cwd ../../ --output-dir packages/next-swc/native",
     "build-wasm": "wasm-pack build crates/wasm --scope=next",
-    "cache-build-native": "echo $(ls native)",
+    "cache-build-native": "[ -d native ] && echo $(ls native)",
     "rust-check-fmt": "cd ../..; cargo fmt -- --check",
     "rust-check-clippy": "cargo clippy --workspace --all-targets -- -D warnings -A deprecated",
     "rust-check-napi-rustls": "cargo check -p next-swc-napi",
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -92,7 +92,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "14.2.1-canary.5",
+    "@next/env": "14.2.1-canary.6",
     "@swc/helpers": "0.5.5",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001579",
@@ -149,10 +149,10 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/polyfill-module": "14.2.1-canary.5",
-    "@next/polyfill-nomodule": "14.2.1-canary.5",
-    "@next/react-refresh-utils": "14.2.1-canary.5",
-    "@next/swc": "14.2.1-canary.5",
+    "@next/polyfill-module": "14.2.1-canary.6",
+    "@next/polyfill-nomodule": "14.2.1-canary.6",
+    "@next/react-refresh-utils": "14.2.1-canary.6",
+    "@next/swc": "14.2.1-canary.6",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@taskr/clear": "1.1.0",
diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "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
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "14.2.1-canary.5",
+  "version": "14.2.1-canary.6",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "14.2.1-canary.5",
+    "next": "14.2.1-canary.6",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/pull-turbo-cache.js b/scripts/pull-turbo-cache.js
@@ -42,6 +42,7 @@ const { spawn } = require('child_process')
 
   // pull cache if it was available
   if (task.cache.local || task.cache.remote) {
+    console.log('Cache Status', task.taskId, task.hash, task.cache)
     await new Promise((resolve, reject) => {
       const child = spawn(
         '/bin/bash',
diff --git a/test/.stats-app/package.json b/test/.stats-app/package.json
@@ -9,7 +9,7 @@
   },
   "engines": {
     "node": ">=18.17.0",
-    "pnpm": "8.15.4"
+    "pnpm": "8.15.7"
   },
-  "packageManager": "pnpm@8.15.4"
+  "packageManager": "pnpm@8.15.7"
 }

Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,8 @@ export default function MDXPage({ children }) {`
`539`	`539`	`}`
`540`	`540`	```
`541`	`541`
	`542`	`+</PagesOnly >`
	`543`	`+`
`542`	`544`	`## Frontmatter`
`543`	`545`
`544`	`546`	Frontmatter is a YAML like key/value pairing that can be used to store data about a page. `@next/mdx` does not support frontmatter by default, though there are many solutions for adding frontmatter to your MDX content, such as:
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`"registry": "https://registry.npmjs.org/"`
`17`	`17`	`}`
`18`	`18`	`},`
`19`		`- "version": "14.2.1-canary.5"`
	`19`	`+ "version": "14.2.1-canary.6"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-next-app",`
`3`		`- "version": "14.2.1-canary.5",`
	`3`	`+ "version": "14.2.1-canary.6",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/eslint-plugin-next",`
`3`		`- "version": "14.2.1-canary.5",`
	`3`	`+ "version": "14.2.1-canary.6",`
`4`	`4`	`"description": "ESLint plugin for Next.js.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"license": "MIT",`