Skip to content

Commit cfc3d37

Browse files
ijjkijjk
authored
Merge branch 'canary' into strip-traceparent-from-cachekey
2 parents ab67421 + 9c83a34 commit cfc3d37

File tree

25 files changed

+47
-41
lines changed

25 files changed

+47
-41
lines changed

‎.github/actions/next-integration-stat/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"engines": {
2424
"node": ">=18.17.0",
25-
"pnpm": "8.15.4"
25+
"pnpm": "8.15.7"
2626
},
27-
"packageManager": "[email protected].4"
27+
"packageManager": "[email protected].7"
2828
}

‎.github/actions/next-stats-action/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"engines": {
2121
"node": ">=18.17.0",
22-
"pnpm": "8.15.4"
22+
"pnpm": "8.15.7"
2323
},
24-
"packageManager": "[email protected].4"
24+
"packageManager": "[email protected].7"
2525
}

‎.github/actions/upload-turboyet-data/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"engines": {
1515
"node": ">=18.17.0",
16-
"pnpm": "8.15.4"
16+
"pnpm": "8.15.7"
1717
},
18-
"packageManager": "[email protected].4"
18+
"packageManager": "[email protected].7"
1919
}

‎.github/workflows/build_and_deploy.yml

+3
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@ jobs:
275275
cache-provider: 'turbo'
276276
shared-key: build-${{ matrix.settings.target }}-${{ hashFiles('.cargo/config.toml') }}
277277

278+
- name: Clear native build
279+
run: rm -rf packages/next-swc/native
280+
278281
# we only need custom caching for docker builds
279282
# as they are on an older Node.js version and have
280283
# issues with turbo caching

‎docs/02-app/01-building-your-application/07-configuring/05-mdx.mdx

+2
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,8 @@ export default function MDXPage({ children }) {
539539
}
540540
```
541541

542+
</PagesOnly >
543+
542544
## Frontmatter
543545

544546
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:

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
"registry": "https://registry.npmjs.org/"
1717
}
1818
},
19-
"version": "14.2.1-canary.5"
19+
"version": "14.2.1-canary.6"
2020
}

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
},
257257
"engines": {
258258
"node": ">=18.17.0",
259-
"pnpm": "8.15.4"
259+
"pnpm": "8.15.7"
260260
},
261-
"packageManager": "[email protected].4"
261+
"packageManager": "[email protected].7"
262262
}

‎packages/create-next-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-next-app",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"keywords": [
55
"react",
66
"next",

‎packages/eslint-config-next/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-next",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"description": "ESLint configuration used by Next.js.",
55
"main": "index.js",
66
"license": "MIT",
@@ -10,7 +10,7 @@
1010
},
1111
"homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
1212
"dependencies": {
13-
"@next/eslint-plugin-next": "14.2.1-canary.5",
13+
"@next/eslint-plugin-next": "14.2.1-canary.6",
1414
"@rushstack/eslint-patch": "^1.3.3",
1515
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0",
1616
"eslint-import-resolver-node": "^0.3.6",

‎packages/eslint-plugin-next/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/eslint-plugin-next",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"description": "ESLint plugin for Next.js.",
55
"main": "dist/index.js",
66
"license": "MIT",

‎packages/font/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/font",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/font"

‎packages/next-bundle-analyzer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/bundle-analyzer",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"main": "index.js",
55
"types": "index.d.ts",
66
"license": "MIT",

‎packages/next-codemod/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/codemod",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"license": "MIT",
55
"repository": {
66
"type": "git",

‎packages/next-env/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/env",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"keywords": [
55
"react",
66
"next",

‎packages/next-mdx/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/mdx",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"main": "index.js",
55
"license": "MIT",
66
"repository": {

‎packages/next-plugin-storybook/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/plugin-storybook",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/next-plugin-storybook"

‎packages/next-polyfill-module/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/polyfill-module",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
55
"main": "dist/polyfill-module.js",
66
"license": "MIT",

‎packages/next-polyfill-nomodule/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/polyfill-nomodule",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"description": "A polyfill for non-dead, nomodule browsers.",
55
"main": "dist/polyfill-nomodule.js",
66
"license": "MIT",

‎packages/next-swc/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/swc",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"private": true,
55
"scripts": {
66
"clean": "node ../../scripts/rm.mjs native",
@@ -11,7 +11,7 @@
1111
"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",
1212
"build-native-wasi": "npx --package=@napi-rs/[email protected] napi build --platform --target wasm32-wasip1-threads -p next-swc-napi --cwd ../../ --output-dir packages/next-swc/native",
1313
"build-wasm": "wasm-pack build crates/wasm --scope=next",
14-
"cache-build-native": "echo $(ls native)",
14+
"cache-build-native": "[ -d native ] && echo $(ls native)",
1515
"rust-check-fmt": "cd ../..; cargo fmt -- --check",
1616
"rust-check-clippy": "cargo clippy --workspace --all-targets -- -D warnings -A deprecated",
1717
"rust-check-napi-rustls": "cargo check -p next-swc-napi",

‎packages/next/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "next",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"description": "The React Framework",
55
"main": "./dist/server/next.js",
66
"license": "MIT",
@@ -92,7 +92,7 @@
9292
]
9393
},
9494
"dependencies": {
95-
"@next/env": "14.2.1-canary.5",
95+
"@next/env": "14.2.1-canary.6",
9696
"@swc/helpers": "0.5.5",
9797
"busboy": "1.6.0",
9898
"caniuse-lite": "^1.0.30001579",
@@ -149,10 +149,10 @@
149149
"@jest/types": "29.5.0",
150150
"@mswjs/interceptors": "0.23.0",
151151
"@napi-rs/triples": "1.2.0",
152-
"@next/polyfill-module": "14.2.1-canary.5",
153-
"@next/polyfill-nomodule": "14.2.1-canary.5",
154-
"@next/react-refresh-utils": "14.2.1-canary.5",
155-
"@next/swc": "14.2.1-canary.5",
152+
"@next/polyfill-module": "14.2.1-canary.6",
153+
"@next/polyfill-nomodule": "14.2.1-canary.6",
154+
"@next/react-refresh-utils": "14.2.1-canary.6",
155+
"@next/swc": "14.2.1-canary.6",
156156
"@opentelemetry/api": "1.6.0",
157157
"@playwright/test": "1.41.2",
158158
"@taskr/clear": "1.1.0",

‎packages/react-refresh-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/react-refresh-utils",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"description": "An experimental package providing utilities for React Refresh.",
55
"repository": {
66
"url": "vercel/next.js",

‎packages/third-parties/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/third-parties",
3-
"version": "14.2.1-canary.5",
3+
"version": "14.2.1-canary.6",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/third-parties"
@@ -26,7 +26,7 @@
2626
"third-party-capital": "1.0.20"
2727
},
2828
"devDependencies": {
29-
"next": "14.2.1-canary.5",
29+
"next": "14.2.1-canary.6",
3030
"outdent": "0.8.0",
3131
"prettier": "2.5.1"
3232
},

‎pnpm-lock.yaml

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/pull-turbo-cache.js

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const { spawn } = require('child_process')
4242

4343
// pull cache if it was available
4444
if (task.cache.local || task.cache.remote) {
45+
console.log('Cache Status', task.taskId, task.hash, task.cache)
4546
await new Promise((resolve, reject) => {
4647
const child = spawn(
4748
'/bin/bash',

‎test/.stats-app/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"engines": {
1111
"node": ">=18.17.0",
12-
"pnpm": "8.15.4"
12+
"pnpm": "8.15.7"
1313
},
14-
"packageManager": "[email protected].4"
14+
"packageManager": "[email protected].7"
1515
}

0 commit comments

Comments
 (0)