Merge branch 'canary' into 09-17-test_add_next-types-plugin_test

vercel · Sep 17, 2024 · d8c383a · d8c383a
2 parents 2d49c78 + 4e14037
commit d8c383a
Show file tree

Hide file tree

Showing 53 changed files with 216 additions and 156 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.16.2
-  TURBO_VERSION: 2.0.9
+  TURBO_VERSION: 2.1.2
   NODE_LTS_VERSION: 20
   CARGO_PROFILE_RELEASE_LTO: 'true'
   TURBO_TEAM: 'vercel'

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 2.0.9
+  TURBO_VERSION: 2.1.2
   NODE_MAINTENANCE_VERSION: 18
   NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 8

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
@@ -67,7 +67,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 2.0.3
+  TURBO_VERSION: 2.1.2
   NODE_LTS_VERSION: 20.9.0
   TEST_CONCURRENCY: 8
   # disable backtrace for test snapshots

diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml
@@ -17,7 +17,7 @@ name: Code Freeze
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 2.0.9
+  TURBO_VERSION: 2.1.2
   NODE_LTS_VERSION: 20
 
 jobs:

diff --git a/.github/workflows/pull_request_stats.yml b/.github/workflows/pull_request_stats.yml
@@ -6,7 +6,7 @@ name: Generate Pull Request Stats
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 2.0.9
+  TURBO_VERSION: 2.1.2
   NODE_LTS_VERSION: 20
   TEST_CONCURRENCY: 6
 

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -35,7 +35,7 @@ name: Trigger Release
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 2.0.9
+  TURBO_VERSION: 2.1.2
   NODE_LTS_VERSION: 20
 
 jobs:

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -1 +1 @@
-This document has been moved to [nextjs.org/docs/upgrading](https://nextjs.org/docs/upgrading). It's also available in this repository on [/docs/02-app/01-building-your-application/10-upgrading](/docs/02-app/01-building-your-application/10-upgrading).
+This document has been moved to [nextjs.org/docs/upgrading](https://nextjs.org/docs/upgrading). It's also available in this repository on [/docs/02-app/01-building-your-application/11-upgrading](/docs/02-app/01-building-your-application/11-upgrading).
diff --git a/docs/02-app/01-building-your-application/01-routing/14-middleware.mdx b/docs/02-app/01-building-your-application/01-routing/14-middleware.mdx
@@ -573,7 +573,7 @@ export default async function middleware(req) {
 
 ## Runtime
 
-Middleware currently only supports the [Edge runtime](/docs/app/building-your-application/rendering/edge-and-nodejs-runtimes). The Node.js runtime can not be used.
+Middleware currently only supports APIs compatible with the [Edge runtime](/docs/app/building-your-application/rendering/edge-and-nodejs-runtimes). APIs exclusive to Node.js are [unsupported](/docs/app/api-reference/edge#unsupported-apis).
 
 ## Version History
 

diff --git a/docs/02-app/01-building-your-application/02-data-fetching/01-fetching.mdx b/docs/02-app/01-building-your-application/02-data-fetching/01-fetching.mdx
@@ -275,14 +275,14 @@ interface Post {
 }
 
 async function getPost(id: string) {
-  let res = await fetch(`https://api.example.com/posts/${id}`)
+  let res = await fetch(`https://api.vercel.app/blog/${id}`)
   let post: Post = await res.json()
   if (!post) notFound()
   return post
 }
 
 export async function generateStaticParams() {
-  let posts = await fetch('https://api.example.com/posts').then((res) =>
+  let posts = await fetch('https://api.vercel.app/blog').then((res) =>
     res.json()
   )
 
@@ -315,14 +315,14 @@ export default async function Page({ params }: { params: { id: string } }) {
 import { notFound } from 'next/navigation'
 
 async function getPost(id) {
-  let res = await fetch(`https://api.example.com/posts/${id}`)
+  let res = await fetch(`https://api.vercel.app/blog/${id}`)
   let post = await res.json()
   if (!post) notFound()
   return post
 }
 
 export async function generateStaticParams() {
-  let posts = await fetch('https://api.example.com/posts').then((res) =>
+  let posts = await fetch('https://api.vercel.app/blog').then((res) =>
     res.json()
   )
 

diff --git a/...-building-your-application/02-data-fetching/03-server-actions-and-mutations.mdx b/...-building-your-application/02-data-fetching/03-server-actions-and-mutations.mdx
@@ -66,7 +66,7 @@ export async function create() {}
 import { create } from '@/app/actions'
 
 export function Button() {
-  return <button onClick={create}>Create</button>
+  return <button onClick={() => create()}>Create</button>
 }
 ```
 
@@ -76,7 +76,7 @@ export function Button() {
 import { create } from '@/app/actions'
 
 export function Button() {
-  return <button onClick={create}>Create</button>
+  return <button onClick={() => create()}>Create</button>
 }
 ```
 
@@ -450,7 +450,7 @@ The [`useFormStatus`](https://react.dev/reference/react-dom/hooks/useFormStatus)
 ```tsx filename="app/submit-button.tsx" highlight={6} switcher
 'use client'
 
-import { useFormStatus } from 'react'
+import { useFormStatus } from 'react-dom'
 
 export function SubmitButton() {
   const { pending } = useFormStatus()
@@ -466,7 +466,7 @@ export function SubmitButton() {
 ```jsx filename="app/submit-button.js" highlight={6} switcher
 'use client'
 
-import { useFormStatus } from 'react'
+import { useFormStatus } from 'react-dom'
 
 export function SubmitButton() {
   const { pending } = useFormStatus()

diff --git a/.../02-app/01-building-your-application/06-optimizing/12-third-party-libraries.mdx b/.../02-app/01-building-your-application/06-optimizing/12-third-party-libraries.mdx
@@ -128,7 +128,7 @@ export function EventButton() {
   return (
     <div>
       <button
-        onClick={() => sendGTMEvent('event', 'buttonClicked', { value: 'xyz' })}
+        onClick={() => sendGTMEvent({ event: 'buttonClicked', value: 'xyz' })}
       >
         Send Event
       </button>

diff --git a/docs/02-app/01-building-your-application/07-configuring/10-custom-server.mdx b/docs/02-app/01-building-your-application/07-configuring/10-custom-server.mdx
@@ -40,27 +40,27 @@ app.prepare().then(() => {
 ```
 
 ```js filename="server.js" switcher
-import { createServer } from "http";
-import { parse } from "url";
-import next from "next";
+import { createServer } from 'http'
+import { parse } from 'url'
+import next from 'next'
 
-const port = parseInt(process.env.PORT || "3000", 10);
-const dev = process.env.NODE_ENV !== "production";
-const app = next({ dev });
-const handle = app.getRequestHandler();
+const port = parseInt(process.env.PORT || '3000', 10)
+const dev = process.env.NODE_ENV !== 'production'
+const app = next({ dev })
+const handle = app.getRequestHandler()
 
 app.prepare().then(() => {
   createServer((req, res) => {
-    const parsedUrl = parse(req.url!, true);
-    handle(req, res, parsedUrl);
-  }).listen(port);
+    const parsedUrl = parse(req.url, true)
+    handle(req, res, parsedUrl)
+  }).listen(port)
 
   console.log(
     `> Server listening at http://localhost:${port} as ${
-      dev ? "development" : process.env.NODE_ENV
-    }`,
-  );
-});
+      dev ? 'development' : process.env.NODE_ENV
+    }`
+  )
+})
 ```
 
 > `server.js` does not run through the Next.js Compiler or bundling process. Make sure the syntax and source code this file requires are compatible with the current Node.js version you are using. [View an example](https://github.com/vercel/next.js/tree/canary/examples/custom-server).

diff --git a/docs/02-app/01-building-your-application/07-configuring/11-draft-mode.mdx b/docs/02-app/01-building-your-application/07-configuring/11-draft-mode.mdx
@@ -5,7 +5,7 @@ related:
   title: Next Steps
   description: See the API reference for more information on how to use Draft Mode.
   links:
-    - app/building-your-application/configuring/draft-mode
+    - app/api-reference/functions/draft-mode
 ---
 
 **Draft Mode** allows you to preview draft content from your headless CMS in your Next.js application. This is useful for static pages that are generated at build time as it allows you to switch to [dynamic rendering](/docs/app/building-your-application/rendering/server-components#dynamic-rendering) and see the draft changes without having to rebuild your entire site.

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
@@ -205,7 +205,7 @@ Back in your `<SignupForm />`, you can use React's `useFormState` hook to displa
 ```tsx filename="app/ui/signup-form.tsx" switcher highlight={7,15,21,27-39}
 'use client'
 
-import { useFormState, useFormStatus } from 'react'
+import { useFormState, useFormStatus } from 'react-dom'
 import { signup } from '@/app/actions/auth'
 
 export function SignupForm() {
@@ -258,7 +258,7 @@ function SubmitButton() {
 ```jsx filename="app/ui/signup-form.js" switcher highlight={7,15,21,27-39}
 'use client'
 
-import { useFormState, useFormStatus } from 'react'
+import { useFormState, useFormStatus } from 'react-dom'
 import { signup } from '@/app/actions/auth'
 
 export function SignupForm() {
@@ -270,19 +270,19 @@ export function SignupForm() {
         <label htmlFor="name">Name</label>
         <input id="name" name="name" placeholder="John Doe" />
       </div>
-      {state.errors.name && <p>{state.errors.name}</p>}
+      {state?.errors?.name && <p>{state.errors.name}</p>}
 
       <div>
         <label htmlFor="email">Email</label>
         <input id="email" name="email" placeholder="john@example.com" />
       </div>
-      {state.errors.email && <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/docs/02-app/02-api-reference/01-components/image.mdx b/docs/02-app/02-api-reference/01-components/image.mdx
@@ -93,13 +93,13 @@ When using an external URL, you must add it to [remotePatterns](#remotepatterns)
 
 ### `width`
 
-The `width` property represents the _intrinsic_ image width in pixels.
+The `width` property represents the _intrinsic_ image width in pixels. This property is used to infer the correct aspect ratio of the image and avoid layout shift during loading. It does not determine the rendered size of the image, which is controlled by CSS, similar to the `width` attribute in the HTML `<img>` tag.
 
 Required, except for [statically imported images](/docs/app/building-your-application/optimizing/images#local-images) or images with the [`fill` property](#fill).
 
 ### `height`
 
-The `height` property represents the _intrinsic_ image height in pixels.
+The `height` property represents the _intrinsic_ image height in pixels. This property is used to infer the correct aspect ratio of the image and avoid layout shift during loading. It does not determine the rendered size of the image, which is controlled by CSS, similar to the `height` attribute in the HTML `<img>` tag.
 
 Required, except for [statically imported images](/docs/app/building-your-application/optimizing/images#local-images) or images with the [`fill` property](#fill).
 

diff --git a/docs/02-app/02-api-reference/02-file-conventions/route-segment-config.mdx b/docs/02-app/02-api-reference/02-file-conventions/route-segment-config.mdx
@@ -5,16 +5,16 @@ description: Learn about how to configure options for Next.js route segments.
 
 The Route Segment options allows you to configure the behavior of a [Page](/docs/app/building-your-application/routing/layouts-and-templates), [Layout](/docs/app/building-your-application/routing/layouts-and-templates), or [Route Handler](/docs/app/building-your-application/routing/route-handlers) by directly exporting the following variables:
 
-| Option                                | Type                                                                                                                      | Default                    |
-| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------------------- |
-| [`experimental_ppr`](#dynamic)        | `'true' \| 'false'`                                                                                                       |
-| [`dynamic`](#dynamic)                 | `'auto' \| 'force-dynamic' \| 'error' \| 'force-static'`                                                                  | `'auto'`                   |
-| [`dynamicParams`](#dynamicparams)     | `boolean`                                                                                                                 | `true`                     |
-| [`revalidate`](#revalidate)           | `false \| 0 \| number`                                                                                                    | `false`                    |
-| [`fetchCache`](#fetchcache)           | `'auto' \| 'default-cache' \| 'only-cache' \| 'force-cache' \| 'force-no-store' \| 'default-no-store' \| 'only-no-store'` | `'auto'`                   |
-| [`runtime`](#runtime)                 | `'nodejs' \| 'edge'`                                                                                                      | `'nodejs'`                 |
-| [`preferredRegion`](#preferredregion) | `'auto' \| 'global' \| 'home' \| string \| string[]`                                                                      | `'auto'`                   |
-| [`maxDuration`](#maxduration)         | `number`                                                                                                                  | Set by deployment platform |
+| Option                                  | Type                                                                                                                      | Default                    |
+| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------------------- |
+| [`experimental_ppr`](#experimental_ppr) | `'true' \| 'false'`                                                                                                       |
+| [`dynamic`](#dynamic)                   | `'auto' \| 'force-dynamic' \| 'error' \| 'force-static'`                                                                  | `'auto'`                   |
+| [`dynamicParams`](#dynamicparams)       | `boolean`                                                                                                                 | `true`                     |
+| [`revalidate`](#revalidate)             | `false \| 0 \| number`                                                                                                    | `false`                    |
+| [`fetchCache`](#fetchcache)             | `'auto' \| 'default-cache' \| 'only-cache' \| 'force-cache' \| 'force-no-store' \| 'default-no-store' \| 'only-no-store'` | `'auto'`                   |
+| [`runtime`](#runtime)                   | `'nodejs' \| 'edge'`                                                                                                      | `'nodejs'`                 |
+| [`preferredRegion`](#preferredregion)   | `'auto' \| 'global' \| 'home' \| string \| string[]`                                                                      | `'auto'`                   |
+| [`maxDuration`](#maxduration)           | `number`                                                                                                                  | Set by deployment platform |
 
 ## Options
 

diff --git a/examples/github-pages/README.md b/examples/github-pages/README.md
@@ -19,7 +19,8 @@ pnpm create next-app --example github-pages nextjs-github-pages
 ### Deploy to GitHub Pages
 
 1.  Create a new public GitHub repository.
-1.  Edit `next.config.js` to match your GitHub repository name.
+1.  Edit `next.config.js` to match your GitHub repository name:
+    - Given the pattern `https://github.com/<user>/<repo>`, update your `basePath` config to `/repo`.
 1.  Push the starter code to the `main` branch.
 1.  Run the `deploy` script (e.g. `npm run deploy`) to create the `gh-pages` branch.
 1.  On GitHub, go to **Settings** > **Pages** > **Branch**, and choose `gh-pages` as the branch with the `/root` folder. Hit **Save**.

diff --git a/examples/with-docker-compose/docker-compose.dev.yml b/examples/with-docker-compose/docker-compose.dev.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   next-app:
     container_name: next-app

diff --git a/examples/with-docker-compose/docker-compose.prod-without-multistage.yml b/examples/with-docker-compose/docker-compose.prod-without-multistage.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   next-app:
     container_name: next-app

diff --git a/examples/with-docker-compose/docker-compose.prod.yml b/examples/with-docker-compose/docker-compose.prod.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   next-app:
     container_name: next-app

diff --git a/examples/with-docker/.dockerignore b/examples/with-docker/.dockerignore
@@ -4,6 +4,4 @@ node_modules
 npm-debug.log
 README.md
 .next
-!.next/static
-!.next/standalone
 .git
diff --git a/examples/with-strict-csp/middleware.js b/examples/with-strict-csp/middleware.js
@@ -4,7 +4,7 @@ export function middleware(request) {
   const nonce = Buffer.from(crypto.randomUUID()).toString("base64");
   const cspHeader = `
     default-src 'self';
-    script-src 'self' 'nonce-${nonce}' 'strict-dynamic' https: http: 'unsafe-inline' ${
+    script-src 'self' 'nonce-${nonce}' 'strict-dynamic' https: http: ${
       process.env.NODE_ENV === "production" ? "" : `'unsafe-eval'`
     };
     style-src 'self' 'nonce-${nonce}';

diff --git a/examples/with-supabase/README.md b/examples/with-supabase/README.md
@@ -64,7 +64,7 @@ If you wish to just develop locally and not deploy to Vercel, [follow the steps
    cd name-of-new-app
    ```
 
-4. Rename `.env.local.example` to `.env.local` and update the following:
+4. Rename `.env.example` to `.env.local` and update the following:
 
    ```
    NEXT_PUBLIC_SUPABASE_URL=[INSERT SUPABASE PROJECT URL]

diff --git a/examples/with-supabase/app/(auth-pages)/smtp-message.tsx b/examples/with-supabase/app/(auth-pages)/smtp-message.tsx
@@ -7,8 +7,8 @@ export function SmtpMessage() {
       <InfoIcon size={16} className="mt-0.5" />
       <div className="flex flex-col gap-1">
         <small className="text-sm text-secondary-foreground">
-          <strong> Note:</strong> Emails are limited to 4 per hour. Enable a
-          custom SMTP endpoint to increase the rate limit.
+          <strong> Note:</strong> Emails are rate limited. Enable Custom SMTP to
+          increase the rate limit.
         </small>
         <div>
           <Link

diff --git a/examples/with-supabase/components/deploy-button.tsx b/examples/with-supabase/components/deploy-button.tsx
@@ -10,7 +10,7 @@ export default function DeployButton() {
       >
         <Button className="flex items-center gap-2" size={"sm"}>
           <svg
-            className="h-3 h-3"
+            className="h-3 w-3"
             viewBox="0 0 76 65"
             fill="hsl(var(--background)/1)"
             xmlns="http://www.w3.org/2000/svg"

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/package.json b/package.json
@@ -242,7 +242,7 @@
     "taskr": "1.1.0",
     "tree-kill": "1.2.2",
     "tsec": "0.2.1",
-    "turbo": "2.0.9",
+    "turbo": "2.1.2",
     "typescript": "5.5.3",
     "unfetch": "4.2.0",
     "wait-port": "0.2.2",

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",