Skip to content

Commit 225ce6b

Browse files
wbinnssmithwbinnssmith
authored
Merge branch 'canary' into wbinnssmith/warn-turbopack-build
2 parents 8f2f21f + 777b826 commit 225ce6b

File tree

21 files changed

+1149
-728
lines changed

21 files changed

+1149
-728
lines changed

Diff for: ‎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.41"
19+
"version": "15.3.0-canary.42"
2020
}

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"keywords": [
55
"react",
66
"next",

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
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.41",
13+
"@next/eslint-plugin-next": "15.3.0-canary.42",
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",

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"description": "ESLint plugin for Next.js.",
55
"main": "dist/index.js",
66
"license": "MIT",

Diff for: ‎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.41",
4+
"version": "15.3.0-canary.42",
55
"repository": {
66
"url": "vercel/next.js",
77
"directory": "packages/font"

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"main": "index.js",
55
"types": "index.d.ts",
66
"license": "MIT",

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"license": "MIT",
55
"repository": {
66
"type": "git",

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"keywords": [
55
"react",
66
"next",

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"main": "index.js",
55
"license": "MIT",
66
"repository": {

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"repository": {
55
"url": "vercel/next.js",
66
"directory": "packages/next-plugin-storybook"

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
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",

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

Diff for: ‎packages/next-rspack/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# next-rspack (EXPERIMENTAL)
22

33
> [!WARNING]
4-
> This package is currently experimental and actively developed and supported in Next.js’ `canary` branch. To use this, you must be using a published canary build of Next.js.
4+
> This package is currently experimental. It's not an official Next.js plugin, and is supported by the Rspack team in partnership with Next.js. Help improve Next.js and Rspack by providing feedback at https://github.com/vercel/next.js/discussions/77800
55
66
This plugin allows you to use [Rspack](https://rspack.dev) in place of webpack with Next.js.
77

Diff for: ‎packages/next-rspack/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "next-rspack",
3-
"version": "15.3.0-canary.41",
3+
"version": "15.3.0-canary.42",
44
"repository": {
55
"url": "vercel/next.js",
6-
"directory": "packages/next-plugin-rspack"
6+
"directory": "packages/next-rspack"
77
},
88
"types": "index.d.ts",
99
"dependencies": {

Diff for: ‎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.41",
3+
"version": "15.3.0-canary.42",
44
"private": true,
55
"files": [
66
"native/"

Diff for: ‎packages/next/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "next",
3-
"version": "15.3.0-canary.41",
3+
"version": "15.3.0-canary.42",
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.41",
103+
"@next/env": "15.3.0-canary.42",
104104
"@swc/counter": "0.1.3",
105105
"@swc/helpers": "0.5.15",
106106
"busboy": "1.6.0",
@@ -131,7 +131,7 @@
131131
}
132132
},
133133
"optionalDependencies": {
134-
"sharp": "^0.33.5"
134+
"sharp": "^0.34.1"
135135
},
136136
"devDependencies": {
137137
"@ampproject/toolbox-optimizer": "2.8.3",
@@ -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.41",
168-
"@next/polyfill-module": "15.3.0-canary.41",
169-
"@next/polyfill-nomodule": "15.3.0-canary.41",
170-
"@next/react-refresh-utils": "15.3.0-canary.41",
171-
"@next/swc": "15.3.0-canary.41",
167+
"@next/font": "15.3.0-canary.42",
168+
"@next/polyfill-module": "15.3.0-canary.42",
169+
"@next/polyfill-nomodule": "15.3.0-canary.42",
170+
"@next/react-refresh-utils": "15.3.0-canary.42",
171+
"@next/swc": "15.3.0-canary.42",
172172
"@opentelemetry/api": "1.6.0",
173173
"@playwright/test": "1.41.2",
174174
"@storybook/addon-a11y": "8.6.0",

Diff for: ‎packages/next/src/shared/lib/get-rspack.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { CanaryOnlyError, isStableBuild } from './canary-only'
1+
import { warnOnce } from '../../build/output/log'
22

33
export function getRspackCore() {
4-
gateCanary()
4+
warnRspack()
55
try {
66
// eslint-disable-next-line import/no-extraneous-dependencies
77
return require('@rspack/core')
@@ -17,7 +17,7 @@ export function getRspackCore() {
1717
}
1818

1919
export function getRspackReactRefresh() {
20-
gateCanary()
20+
warnRspack()
2121
try {
2222
// eslint-disable-next-line import/no-extraneous-dependencies
2323
const plugin = require('@rspack/plugin-react-refresh')
@@ -37,10 +37,8 @@ export function getRspackReactRefresh() {
3737
}
3838
}
3939

40-
function gateCanary() {
41-
if (isStableBuild()) {
42-
throw new CanaryOnlyError(
43-
'Rspack support is only available in Next.js canary.'
44-
)
45-
}
40+
function warnRspack() {
41+
warnOnce(
42+
`\`next-rspack\` is currently experimental. It's not an official Next.js plugin, and is supported by the Rspack team in partnership with Next.js. Help improve Next.js and Rspack by providing feedback at https://github.com/vercel/next.js/discussions/77800`
43+
)
4644
}

Diff for: ‎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": "15.3.0-canary.41",
3+
"version": "15.3.0-canary.42",
44
"description": "An experimental package providing utilities for React Refresh.",
55
"repository": {
66
"url": "vercel/next.js",

Diff for: ‎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": "15.3.0-canary.41",
3+
"version": "15.3.0-canary.42",
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": "15.3.0-canary.41",
29+
"next": "15.3.0-canary.42",
3030
"outdent": "0.8.0",
3131
"prettier": "2.5.1",
3232
"typescript": "5.8.2"

0 commit comments

Comments
 (0)