Skip to content

Commit 265d580

Browse files
committed
Merge branch 'canary' of github.com:vercel/next.js into 10-14-test_improve_linting
2 parents 3f624de + d6b932d commit 265d580

File tree

148 files changed

+1473
-593
lines changed

Some content is hidden

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

148 files changed

+1473
-593
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const nextConfig: NextConfig = {
103103
export default nextConfig
104104
```
105105

106-
> **Good to know**: You can import Native ESM modules in `next.config.ts` without any additional configuration. Supports importing extensions like `.cjs`, `.cts`, `.mjs`, and `.mts`.
106+
> **Note**: Module resolution in `next.config.ts` is currently limited to `CommonJS`. This may cause incompatibilities with ESM only packages being loaded in `next.config.ts`.
107107
108108
<AppOnly>
109109

examples/reproduction-template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
},
88
"dependencies": {
99
"next": "canary",
10-
"react": "19.0.0-rc-70fb1363-20241010",
11-
"react-dom": "19.0.0-rc-70fb1363-20241010"
10+
"react": "19.0.0-rc-cd22717c-20241013",
11+
"react-dom": "19.0.0-rc-cd22717c-20241013"
1212
},
1313
"devDependencies": {
1414
"@types/node": "20.12.12",

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
"registry": "https://registry.npmjs.org/"
1717
}
1818
},
19-
"version": "15.0.0-canary.188"
19+
"version": "15.0.0-canary.190"
2020
}

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -209,19 +209,19 @@
209209
"pretty-bytes": "5.3.0",
210210
"pretty-ms": "7.0.0",
211211
"random-seed": "0.3.0",
212-
"react": "19.0.0-rc-70fb1363-20241010",
212+
"react": "19.0.0-rc-cd22717c-20241013",
213213
"react-17": "npm:[email protected]",
214-
"react-builtin": "npm:[email protected]70fb1363-20241010",
215-
"react-dom": "19.0.0-rc-70fb1363-20241010",
214+
"react-builtin": "npm:[email protected]cd22717c-20241013",
215+
"react-dom": "19.0.0-rc-cd22717c-20241013",
216216
"react-dom-17": "npm:[email protected]",
217-
"react-dom-builtin": "npm:[email protected]70fb1363-20241010",
218-
"react-dom-experimental-builtin": "npm:[email protected]70fb1363-20241010",
219-
"react-experimental-builtin": "npm:[email protected]70fb1363-20241010",
220-
"react-is-builtin": "npm:[email protected]70fb1363-20241010",
221-
"react-server-dom-turbopack": "19.0.0-rc-70fb1363-20241010",
222-
"react-server-dom-turbopack-experimental": "npm:[email protected]70fb1363-20241010",
223-
"react-server-dom-webpack": "19.0.0-rc-70fb1363-20241010",
224-
"react-server-dom-webpack-experimental": "npm:[email protected]70fb1363-20241010",
217+
"react-dom-builtin": "npm:[email protected]cd22717c-20241013",
218+
"react-dom-experimental-builtin": "npm:[email protected]cd22717c-20241013",
219+
"react-experimental-builtin": "npm:[email protected]cd22717c-20241013",
220+
"react-is-builtin": "npm:[email protected]cd22717c-20241013",
221+
"react-server-dom-turbopack": "19.0.0-rc-cd22717c-20241013",
222+
"react-server-dom-turbopack-experimental": "npm:[email protected]cd22717c-20241013",
223+
"react-server-dom-webpack": "19.0.0-rc-cd22717c-20241013",
224+
"react-server-dom-webpack-experimental": "npm:[email protected]cd22717c-20241013",
225225
"react-ssr-prepass": "1.0.8",
226226
"react-virtualized": "9.22.3",
227227
"relay-compiler": "13.0.2",
@@ -231,8 +231,8 @@
231231
"resolve-from": "5.0.0",
232232
"sass": "1.54.0",
233233
"satori": "0.10.9",
234-
"scheduler-builtin": "npm:[email protected]70fb1363-20241010",
235-
"scheduler-experimental-builtin": "npm:[email protected]70fb1363-20241010",
234+
"scheduler-builtin": "npm:[email protected]cd22717c-20241013",
235+
"scheduler-experimental-builtin": "npm:[email protected]cd22717c-20241013",
236236
"seedrandom": "3.0.5",
237237
"semver": "7.3.7",
238238
"shell-quote": "1.7.3",
@@ -272,10 +272,10 @@
272272
"@babel/traverse": "7.22.5",
273273
"@types/react": "npm:[email protected]",
274274
"@types/react-dom": "npm:[email protected]",
275-
"react": "19.0.0-rc-70fb1363-20241010",
276-
"react-dom": "19.0.0-rc-70fb1363-20241010",
277-
"react-is": "19.0.0-rc-70fb1363-20241010",
278-
"scheduler": "0.25.0-rc-70fb1363-20241010"
275+
"react": "19.0.0-rc-cd22717c-20241013",
276+
"react-dom": "19.0.0-rc-cd22717c-20241013",
277+
"react-is": "19.0.0-rc-cd22717c-20241013",
278+
"scheduler": "0.25.0-rc-cd22717c-20241013"
279279
},
280280
"patchedDependencies": {
281281

packages/create-next-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-next-app",
3-
"version": "15.0.0-canary.188",
3+
"version": "15.0.0-canary.190",
44
"keywords": [
55
"react",
66
"next",

packages/create-next-app/templates/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { GetTemplateFileArgs, InstallTemplateArgs } from "./types";
1313

1414
// Do not rename or format. sync-react script relies on this line.
1515
// prettier-ignore
16-
const nextjsReactPeerVersion = "19.0.0-rc-70fb1363-20241010";
16+
const nextjsReactPeerVersion = "19.0.0-rc-cd22717c-20241013";
1717

1818
/**
1919
* Get the file path for a given file in a template, e.g. "next.config.js".

packages/eslint-config-next/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-next",
3-
"version": "15.0.0-canary.188",
3+
"version": "15.0.0-canary.190",
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": "15.0.0-canary.188",
13+
"@next/eslint-plugin-next": "15.0.0-canary.190",
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/eslint-plugin-next",
3-
"version": "15.0.0-canary.188",
3+
"version": "15.0.0-canary.190",
44
"description": "ESLint plugin for Next.js.",
55
"main": "dist/index.js",
66
"license": "MIT",

packages/font/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@next/font",
33
"private": true,
4-
"version": "15.0.0-canary.188",
4+
"version": "15.0.0-canary.190",
55
"repository": {
66
"url": "vercel/next.js",
77
"directory": "packages/font"

packages/next-bundle-analyzer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@next/bundle-analyzer",
3-
"version": "15.0.0-canary.188",
3+
"version": "15.0.0-canary.190",
44
"main": "index.js",
55
"types": "index.d.ts",
66
"license": "MIT",

0 commit comments

Comments
 (0)