Merge branch 'canary' of github.com:vercel/next.js into not-found-bou…

…ndary-reset
abhi12299 · Sep 20, 2024 · fc8a3fc · fc8a3fc
2 parents 31939f3 + cd33300
commit fc8a3fc
Show file tree

Hide file tree

Showing 432 changed files with 18,597 additions and 13,898 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'
@@ -106,16 +106,20 @@ jobs:
       fail-fast: false
       matrix:
         exclude:
-          # only build the binaries we usually test with
-          # darwin arm64, windows x64, linux GNU x64
+          # only build the binaries we run automated tests against
+          # linux GNU x64
           - settings:
               target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'i686-pc-windows-msvc' }}
+          - settings:
+              target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'aarch64-apple-darwin' }}
           - settings:
               target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'aarch64-pc-windows-msvc' }}
           - settings:
               target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'aarch64-unknown-linux-gnu' }}
           - settings:
               target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'aarch64-unknown-linux-musl' }}
+          - settings:
+              target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'x86_64-pc-windows-msvc' }}
           - settings:
               target: ${{ needs.deploy-target.outputs.value == 'automated-preview' && 'x86_64-unknown-linux-musl' }}
           - settings:

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/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -118,7 +118,6 @@ tungstenite = "0.20.1"
 
 # flate2_zlib requires zlib, use flate2_rust
 allsorts = { version = "0.14.0", default-features = false, features = [
-  "outline",
   "flate2_rust",
 ] }
 anyhow = "1.0.69"
@@ -169,8 +168,6 @@ owo-colors = "3.5.0"
 parcel_selectors = "0.27.0"
 parking_lot = "0.12.1"
 pathdiff = "0.2.1"
-# Temporary: Reference the latest git minor version of pathfinder_simd until it's published.
-pathfinder_simd = "0.5.3"
 petgraph = "0.6.3"
 pin-project-lite = "0.2.9"
 postcard = "1.0.4"
@@ -216,8 +213,3 @@ unsize = "1.1.0"
 url = "2.2.2"
 urlencoding = "2.1.2"
 webbrowser = "0.8.7"
-
-# Sync with the entries in turbo's Cargo.toml
-[patch.crates-io]
-# TODO: Use upstream when https://github.com/servo/pathfinder/pull/566 lands
-pathfinder_simd = { git = "https://github.com/vercel/pathfinder", branch = "rm-stdarch_arm_crc32"}
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).