Skip to content

Commit 30711c5

Browse files
ijjkijjk
authored
Merge branch 'canary' into fix/absolute-asset-prefix-with-path
2 parents 0ef1037 + f5198b4 commit 30711c5

File tree

147 files changed

+1486
-1235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1486
-1235
lines changed

‎.github/workflows/build_and_deploy.yml

+15-1
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ jobs:
297297
# we use checkout here instead of the build cache since
298298
# it can fail to restore in different OS'
299299
- uses: actions/checkout@v4
300+
with:
301+
# crates/napi/build.rs uses git-describe to find the most recent git tag. It's okay if
302+
# this fails, but fetch with enough depth that we're likely to find a recent tag.
303+
fetch-depth: 100
300304

301305
- name: Setup node
302306
uses: actions/setup-node@v4
@@ -347,7 +351,17 @@ jobs:
347351

348352
- name: Build in docker
349353
if: ${{ matrix.settings.docker && steps.build-exists.outputs.BUILD_EXISTS == 'no' }}
350-
run: docker run -v "/var/run/docker.sock":"/var/run/docker.sock" -e RUST_BACKTRACE -e NAPI_CLI_VERSION -e CARGO_TERM_COLOR -e CARGO_INCREMENTAL -e CARGO_PROFILE_RELEASE_LTO -e CARGO_REGISTRIES_CRATES_IO_PROTOCOL -e TURBO_API -e TURBO_TEAM -e TURBO_TOKEN -e TURBO_VERSION -e TURBO_CACHE="remote:rw" -v ${{ env.HOME }}/.cargo/git:/root/.cargo/git -v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build --entrypoint=bash ${{ matrix.settings.docker }} -c "${{ matrix.settings.build }}"
354+
run: |
355+
docker run -v "/var/run/docker.sock":"/var/run/docker.sock" \
356+
-e CI -e RUST_BACKTRACE -e NAPI_CLI_VERSION -e CARGO_TERM_COLOR -e CARGO_INCREMENTAL \
357+
-e CARGO_PROFILE_RELEASE_LTO -e CARGO_REGISTRIES_CRATES_IO_PROTOCOL -e TURBO_API \
358+
-e TURBO_TEAM -e TURBO_TOKEN -e TURBO_VERSION -e TURBO_CACHE="remote:rw" \
359+
-v ${{ env.HOME }}/.cargo/git:/root/.cargo/git \
360+
-v ${{ env.HOME }}/.cargo/registry:/root/.cargo/registry \
361+
-v ${{ github.workspace }}:/build \
362+
-w /build \
363+
--entrypoint=bash ${{ matrix.settings.docker }} \
364+
-c "${{ matrix.settings.build }}"
351365
352366
- name: cache build
353367
if: ${{ matrix.settings.docker && steps.build-exists.outputs.BUILD_EXISTS == 'no' }}

‎Cargo.lock

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

‎Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,11 @@ turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
296296
turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }
297297

298298
# SWC crates
299-
swc_core = { version = "16.6.2", features = [
299+
swc_core = { version = "16.9.0", features = [
300300
"ecma_loader_lru",
301301
"ecma_loader_parking_lot",
302302
] }
303+
swc_parallel = { version = "1.3.0", default-features = false, features = ["rayon"] }
303304
testing = { version = "8.0.0" }
304305

305306
# Keep consistent with preset_env_base through swc_core

‎crates/napi/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ swc_core = { workspace = true, features = [
9797
"ecma_utils",
9898
"ecma_visit",
9999
] }
100+
swc_parallel = { workspace = true, default-features = false, features = ["rayon"] }
100101

101102
# Dependencies for the native, non-wasm32 build.
102103
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

‎docs/01-app/01-getting-started/05-css.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export default nextConfig
237237
The following libraries are supported in **Client Components** in the `app` directory (alphabetical):
238238

239239
- [`ant-design`](https://ant.design/docs/react/use-with-next#using-app-router)
240-
- [`chakra-ui`](https://chakra-ui.com/getting-started/nextjs-app-guide)
240+
- [`chakra-ui`](https://chakra-ui.com/docs/get-started/frameworks/next-app)
241241
- [`@fluentui/react-components`](https://react.fluentui.dev/?path=/docs/concepts-developer-server-side-rendering-next-js-appdir-setup--page)
242242
- [`kuma-ui`](https://kuma-ui.com)
243243
- [`@mui/material`](https://mui.com/material-ui/guides/next-js-app-router/)

‎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": "15.3.0-canary.13"
19+
"version": "15.3.0-canary.15"
2020
}

‎package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"@next/third-parties": "workspace:*",
110110
"@opentelemetry/api": "1.4.1",
111111
"@picocss/pico": "1.5.10",
112-
"@rspack/core": "npm:@rspack-canary/[email protected]",
112+
"@rspack/core": "1.3.0-beta.0",
113113
"@rspack/plugin-react-refresh": "1.0.1",
114114
"@svgr/webpack": "5.5.0",
115115
"@swc/cli": "0.1.55",
@@ -227,16 +227,16 @@
227227
"pretty-ms": "7.0.0",
228228
"random-seed": "0.3.0",
229229
"react": "19.0.0",
230-
"react-builtin": "npm:[email protected]c69a5fc5-20250318",
230+
"react-builtin": "npm:[email protected]db7dfe05-20250319",
231231
"react-dom": "19.0.0",
232-
"react-dom-builtin": "npm:[email protected]c69a5fc5-20250318",
233-
"react-dom-experimental-builtin": "npm:[email protected]c69a5fc5-20250318",
234-
"react-experimental-builtin": "npm:[email protected]c69a5fc5-20250318",
235-
"react-is-builtin": "npm:[email protected]c69a5fc5-20250318",
236-
"react-server-dom-turbopack": "19.1.0-canary-c69a5fc5-20250318",
237-
"react-server-dom-turbopack-experimental": "npm:[email protected]c69a5fc5-20250318",
238-
"react-server-dom-webpack": "19.1.0-canary-c69a5fc5-20250318",
239-
"react-server-dom-webpack-experimental": "npm:[email protected]c69a5fc5-20250318",
232+
"react-dom-builtin": "npm:[email protected]db7dfe05-20250319",
233+
"react-dom-experimental-builtin": "npm:[email protected]db7dfe05-20250319",
234+
"react-experimental-builtin": "npm:[email protected]db7dfe05-20250319",
235+
"react-is-builtin": "npm:[email protected]db7dfe05-20250319",
236+
"react-server-dom-turbopack": "19.1.0-canary-db7dfe05-20250319",
237+
"react-server-dom-turbopack-experimental": "npm:[email protected]db7dfe05-20250319",
238+
"react-server-dom-webpack": "19.1.0-canary-db7dfe05-20250319",
239+
"react-server-dom-webpack-experimental": "npm:[email protected]db7dfe05-20250319",
240240
"react-ssr-prepass": "1.0.8",
241241
"react-virtualized": "9.22.3",
242242
"relay-compiler": "13.0.2",
@@ -246,8 +246,8 @@
246246
"resolve-from": "5.0.0",
247247
"sass": "1.54.0",
248248
"satori": "0.12.1",
249-
"scheduler-builtin": "npm:[email protected]c69a5fc5-20250318",
250-
"scheduler-experimental-builtin": "npm:[email protected]c69a5fc5-20250318",
249+
"scheduler-builtin": "npm:[email protected]db7dfe05-20250319",
250+
"scheduler-experimental-builtin": "npm:[email protected]db7dfe05-20250319",
251251
"seedrandom": "3.0.5",
252252
"semver": "7.3.7",
253253
"shell-quote": "1.7.3",
@@ -289,10 +289,10 @@
289289
"@types/react": "19.0.8",
290290
"@types/react-dom": "19.0.3",
291291
"jest-snapshot": "30.0.0-alpha.6",
292-
"react": "19.1.0-canary-c69a5fc5-20250318",
293-
"react-dom": "19.1.0-canary-c69a5fc5-20250318",
294-
"react-is": "19.1.0-canary-c69a5fc5-20250318",
295-
"scheduler": "0.26.0-canary-c69a5fc5-20250318"
292+
"react": "19.1.0-canary-db7dfe05-20250319",
293+
"react-dom": "19.1.0-canary-db7dfe05-20250319",
294+
"react-is": "19.1.0-canary-db7dfe05-20250319",
295+
"scheduler": "0.26.0-canary-db7dfe05-20250319"
296296
},
297297
"patchedDependencies": {
298298
"[email protected]": "patches/[email protected]",

‎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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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/api-reference/config/eslint",
1212
"dependencies": {
13-
"@next/eslint-plugin-next": "15.3.0-canary.13",
13+
"@next/eslint-plugin-next": "15.3.0-canary.15",
1414
"@rushstack/eslint-patch": "^1.10.3",
1515
"@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
1616
"@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",

‎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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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,7 +1,7 @@
11
{
22
"name": "@next/font",
33
"private": true,
4-
"version": "15.3.0-canary.13",
4+
"version": "15.3.0-canary.15",
55
"repository": {
66
"url": "vercel/next.js",
77
"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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
44
"main": "index.js",
55
"license": "MIT",
66
"repository": {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@next/plugin-rspack",
3-
"version": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/next-plugin-rspack"
77
},
88
"types": "index.d.ts",
99
"dependencies": {
10-
"@rspack/core": "npm:@rspack-canary/[email protected]",
10+
"@rspack/core": "1.3.0-beta.0",
1111
"@rspack/plugin-react-refresh": "1.0.1",
1212
"react-refresh": "0.12.0"
1313
}

‎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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
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": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
44
"description": "A polyfill for non-dead, nomodule browsers.",
55
"main": "dist/polyfill-nomodule.js",
66
"license": "MIT",

‎packages/next-swc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/swc",
3-
"version": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
44
"private": true,
55
"scripts": {
66
"clean": "node ../../scripts/rm.mjs native",

‎packages/next/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "next",
3-
"version": "15.3.0-canary.13",
3+
"version": "15.3.0-canary.15",
44
"description": "The React Framework",
55
"main": "./dist/server/next.js",
66
"license": "MIT",
@@ -100,7 +100,7 @@
100100
]
101101
},
102102
"dependencies": {
103-
"@next/env": "15.3.0-canary.13",
103+
"@next/env": "15.3.0-canary.15",
104104
"@swc/counter": "0.1.3",
105105
"@swc/helpers": "0.5.15",
106106
"busboy": "1.6.0",
@@ -164,11 +164,11 @@
164164
"@jest/types": "29.5.0",
165165
"@mswjs/interceptors": "0.23.0",
166166
"@napi-rs/triples": "1.2.0",
167-
"@next/font": "15.3.0-canary.13",
168-
"@next/polyfill-module": "15.3.0-canary.13",
169-
"@next/polyfill-nomodule": "15.3.0-canary.13",
170-
"@next/react-refresh-utils": "15.3.0-canary.13",
171-
"@next/swc": "15.3.0-canary.13",
167+
"@next/font": "15.3.0-canary.15",
168+
"@next/polyfill-module": "15.3.0-canary.15",
169+
"@next/polyfill-nomodule": "15.3.0-canary.15",
170+
"@next/react-refresh-utils": "15.3.0-canary.15",
171+
"@next/swc": "15.3.0-canary.15",
172172
"@opentelemetry/api": "1.6.0",
173173
"@playwright/test": "1.41.2",
174174
"@storybook/addon-a11y": "8.6.0",

0 commit comments

Comments
 (0)