Merge remote-tracking branch 'origin/canary' into kdy1/swc-core-79-1

vercel · Jul 21, 2023 · 62c9ba2 · 62c9ba2
2 parents 7dacebd + e887772
commit 62c9ba2
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 91 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.9.6
+  TURBO_VERSION: 1.10.9
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18.16.1

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: 1.9.6
+  TURBO_VERSION: 1.10.9
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18.16.1

diff --git a/.github/workflows/build_reusable.yml b/.github/workflows/build_reusable.yml
@@ -52,7 +52,7 @@ on:
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.9.6
+  TURBO_VERSION: 1.10.9
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18.16.1

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: 1.9.6
+  TURBO_VERSION: 1.10.9
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18.16.1

diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml
@@ -25,7 +25,7 @@ name: Trigger Release
 
 env:
   NAPI_CLI_VERSION: 2.14.7
-  TURBO_VERSION: 1.9.6
+  TURBO_VERSION: 1.10.9
   PNPM_VERSION: 7.24.3
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18.16.1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,11 +44,11 @@ swc_core = { version = "0.79.22" }
 testing = { version = "0.33.21" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230719.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.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-230719.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230719.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230721.1" }
 
 # General Deps