Merge branch 'canary' into visible-oomkill

deh-code · Sep 17, 2024 · 4f4e12c · 4f4e12c
2 parents c789ee9 + 3127e86
commit 4f4e12c
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 40 deletions.
diff --git a/docs/02-app/01-building-your-application/09-authentication/index.mdx b/docs/02-app/01-building-your-application/09-authentication/index.mdx
@@ -276,13 +276,13 @@ export function SignupForm() {
         <label htmlFor="email">Email</label>
         <input id="email" name="email" placeholder="[email protected]" />
       </div>
-      {state?.errors?.name && <p>{state.errors.email}</p>}
+      {state?.errors?.email && <p>{state.errors.email}</p>}
 
       <div>
         <label htmlFor="password">Password</label>
         <input id="password" name="password" type="password" />
       </div>
-      {state.errors?.password && (
+      {state?.errors?.password && (
         <div>
           <p>Password must:</p>
           <ul>

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "15.0.0-canary.156"
+  "version": "15.0.0-canary.157"
 }
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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+    "@next/eslint-plugin-next": "15.0.0-canary.157",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/eslint-plugin": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0",

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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@next/font",
   "private": true,
-  "version": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -95,7 +95,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "15.0.0-canary.156",
+    "@next/env": "15.0.0-canary.157",
     "@swc/counter": "0.1.3",
     "@swc/helpers": "0.5.13",
     "busboy": "1.6.0",
@@ -160,11 +160,11 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "15.0.0-canary.156",
-    "@next/polyfill-module": "15.0.0-canary.156",
-    "@next/polyfill-nomodule": "15.0.0-canary.156",
-    "@next/react-refresh-utils": "15.0.0-canary.156",
-    "@next/swc": "15.0.0-canary.156",
+    "@next/font": "15.0.0-canary.157",
+    "@next/polyfill-module": "15.0.0-canary.157",
+    "@next/polyfill-nomodule": "15.0.0-canary.157",
+    "@next/react-refresh-utils": "15.0.0-canary.157",
+    "@next/swc": "15.0.0-canary.157",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@swc/core": "1.7.0-nightly-20240714.1",

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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "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": "15.0.0-canary.156",
+  "version": "15.0.0-canary.157",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/third-parties"
@@ -26,7 +26,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "15.0.0-canary.156",
+    "next": "15.0.0-canary.157",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/.gitignore b/test/.gitignore
@@ -2,5 +2,7 @@
 .vscode
 
 e2e/**/tsconfig.json
+production/**/tsconfig.json
+
 test-junit-report/
 turbopack-test-junit-report/