Merge branch 'canary' into shu/cb1e

kodiakhq[bot] · web-flow · commit 03d651e1579b · 2023-09-05T22:13:51.000Z
diff --git a/.github/actions/next-stats-action/src/run/collect-stats.js b/.github/actions/next-stats-action/src/run/collect-stats.js
@@ -53,7 +53,7 @@ module.exports = async function collectStats(
     })
 
     child.stdout.on('data', (data) => {
-      if (data.toString().includes('started server') && !serverReadyResolved) {
+      if (data.toString().includes('- Local:') && !serverReadyResolved) {
         serverReadyResolved = true
         serverReadyResolve()
       }
diff --git a/docs/02-app/01-building-your-application/07-configuring/02-eslint.mdx b/docs/02-app/01-building-your-application/07-configuring/02-eslint.mdx
@@ -55,7 +55,7 @@ One of the following three options can be selected:
 
 - **Cancel**: Does not include any ESLint configuration. Only select this option if you plan on setting up your own custom ESLint configuration.
 
-If either of the two configuration options are selected, Next.js will automatically install `eslint` and `eslint-config-next` as development dependencies in your application and create an `.eslintrc.json` file in the root of your project that includes your selected configuration.
+If either of the two configuration options are selected, Next.js will automatically install `eslint` and `eslint-config-next` as dependencies in your application and create an `.eslintrc.json` file in the root of your project that includes your selected configuration.
 
 You can now run `next lint` every time you want to run ESLint to catch errors. Once ESLint has been set up, it will also automatically run during every build (`next build`). Errors will fail the build, while warnings will not.
 
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.20-canary.16"
+  "version": "13.4.20-canary.17"
 }
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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+    "@next/eslint-plugin-next": "13.4.20-canary.17",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "description": "ESLint plugin for NextJS.",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -89,7 +89,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.4.20-canary.16",
+    "@next/env": "13.4.20-canary.17",
     "@swc/helpers": "0.5.1",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -144,11 +144,11 @@
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/cli": "2.16.2",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.4.20-canary.16",
-    "@next/polyfill-nomodule": "13.4.20-canary.16",
-    "@next/react-dev-overlay": "13.4.20-canary.16",
-    "@next/react-refresh-utils": "13.4.20-canary.16",
-    "@next/swc": "13.4.20-canary.16",
+    "@next/polyfill-module": "13.4.20-canary.17",
+    "@next/polyfill-nomodule": "13.4.20-canary.17",
+    "@next/react-dev-overlay": "13.4.20-canary.17",
+    "@next/react-refresh-utils": "13.4.20-canary.17",
+    "@next/swc": "13.4.20-canary.17",
     "@opentelemetry/api": "1.4.1",
     "@playwright/test": "^1.35.1",
     "@segment/ajv-human-errors": "2.1.2",
diff --git a/packages/next/src/server/config.ts b/packages/next/src/server/config.ts
@@ -679,7 +679,6 @@ function assignDefaults(
       '@fortawesome/fontawesome-svg-core',
       '@fortawesome/free-solid-svg-icons',
       '@headlessui-float/react',
-      'react-hot-toast',
       '@heroicons/react/20/solid',
       '@heroicons/react/24/solid',
       '@heroicons/react/24/outline',
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",
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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "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": "13.4.20-canary.16",
+  "version": "13.4.20-canary.17",
   "private": true,
   "repository": {
     "url": "vercel/next.js",
@@ -23,7 +23,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "13.4.20-canary.16",
+    "next": "13.4.20-canary.17",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ module.exports = async function collectStats(`
`53`	`53`	`})`
`54`	`54`
`55`	`55`	`child.stdout.on('data', (data) => {`
`56`		`- if (data.toString().includes('started server') && !serverReadyResolved) {`
	`56`	`+ if (data.toString().includes('- Local:') && !serverReadyResolved) {`
`57`	`57`	`serverReadyResolved = true`
`58`	`58`	`serverReadyResolve()`
`59`	`59`	`}`
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": "13.4.20-canary.16"`
	`19`	`+ "version": "13.4.20-canary.17"`
`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": "13.4.20-canary.16",`
	`3`	`+ "version": "13.4.20-canary.17",`
`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": "13.4.20-canary.16",`
	`3`	`+ "version": "13.4.20-canary.17",`
`4`	`4`	`"description": "ESLint plugin for NextJS.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/font",`
`3`		`- "version": "13.4.20-canary.16",`
	`3`	`+ "version": "13.4.20-canary.17",`
`4`	`4`	`"repository": {`
`5`	`5`	`"url": "vercel/next.js",`
`6`	`6`	`"directory": "packages/font"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/bundle-analyzer",`
`3`		`- "version": "13.4.20-canary.16",`
	`3`	`+ "version": "13.4.20-canary.17",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"types": "index.d.ts",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/codemod",`
`3`		`- "version": "13.4.20-canary.16",`
	`3`	`+ "version": "13.4.20-canary.17",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/env",`
`3`		`- "version": "13.4.20-canary.16",`
	`3`	`+ "version": "13.4.20-canary.17",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`