Merge branch 'canary' into feat/remove-suspending-reducers

vercel · Oct 20, 2023 · 2966f85 · 2966f85
2 parents ec8a37e + 2faacf1
commit 2966f85
Show file tree

Hide file tree

Showing 692 changed files with 8,169 additions and 6,810 deletions.
diff --git a/.github/actions/next-stats-action/Dockerfile b/.github/actions/next-stats-action/Dockerfile
@@ -9,7 +9,7 @@ RUN apt install unzip wget curl nano htop screen build-essential pkg-config libs
 
 RUN ln $(which python3) /usr/bin/python
 
-RUN curl -sfLS https://install-node.vercel.app/v18.18.2 | bash -s -- -f
+RUN curl -sfLS https://install-node.vercel.app/v18.17.0 | bash -s -- -f
 RUN corepack enable
 
 WORKDIR /next-stats

diff --git a/.github/actions/next-stats-action/package.json b/.github/actions/next-stats-action/package.json
@@ -18,7 +18,7 @@
     "typescript": "5.1.6"
   },
   "engines": {
-    "node": ">=18.18.2",
+    "node": ">=18.17.0",
     "pnpm": "8.9.0"
   },
   "packageManager": "[email protected]"

diff --git a/.github/actions/validate-docs-links/src/index.ts b/.github/actions/validate-docs-links/src/index.ts
@@ -189,7 +189,7 @@ async function prepareDocumentMapEntry(
 // Checks if the links point to existing documents
 function validateInternalLink(errors: Errors, href: string): void {
   // /docs/api/example#heading -> ["api/example", "heading""]
-  const [link, hash] = href.replace(DOCS_PATH, '').split('#')
+  const [link, hash] = href.replace(DOCS_PATH, '').split('#', 2)
 
   let foundPage
 

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -146,7 +146,7 @@ jobs:
         group: [1, 2, 3, 4, 5]
     uses: ./.github/workflows/build_reusable.yml
     with:
-      nodeVersion: 18.18.2
+      nodeVersion: 18.17.0
       skipForDocsOnly: 'yes'
       afterBuild: RUST_BACKTRACE=0 NEXT_EXTERNAL_TESTS_FILTERS="$(pwd)/test/turbopack-tests-manifest.json" TURBOPACK=1 node run-tests.js --timings -g ${{ matrix.group }}/5 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit
@@ -211,7 +211,7 @@ jobs:
 
     uses: ./.github/workflows/build_reusable.yml
     with:
-      nodeVersion: 18.18.2
+      nodeVersion: 18.17.0
       skipForDocsOnly: 'yes'
       afterBuild: node run-tests.js --timings -g ${{ matrix.group }}/12 -c ${TEST_CONCURRENCY} --type integration
     secrets: inherit

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,11 +40,11 @@ swc_core = { version = "0.86.1", features = [
 testing = { version = "0.35.0" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231017.3" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231019.1" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231017.3" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231019.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231017.3" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231019.1" }
 
 # General Deps
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -34,7 +34,7 @@ pr:
 variables:
   PNPM_CACHE_FOLDER: $(Pipeline.Workspace)/.pnpm-store
   NEXT_TELEMETRY_DISABLED: '1'
-  node_version: ^18.18.2
+  node_version: ^18.17.0
 
 stages:
   - stage: Test

diff --git a/docs/02-app/01-building-your-application/06-optimizing/04-metadata.mdx b/docs/02-app/01-building-your-application/06-optimizing/04-metadata.mdx
@@ -248,10 +248,10 @@ The `ImageResponse` constructor allows you to generate dynamic images using JSX
 
 `ImageResponse` uses the [Edge Runtime](/docs/app/building-your-application/rendering/edge-and-nodejs-runtimes#edge-runtime), and Next.js automatically adds the correct headers to cached images at the edge, helping improve performance and reducing recomputation.
 
-To use it, you can import `ImageResponse` from `next/server`:
+To use it, you can import `ImageResponse` from `next/og`:
 
 ```jsx filename="app/about/route.js"
-import { ImageResponse } from 'next/server'
+import { ImageResponse } from 'next/og'
 
 export const runtime = 'edge'