Merge branch 'canary' into feedthejim/fix-parallel-route-groups

vercel · Apr 13, 2023 · f9a19d6 · f9a19d6
2 parents 8dadd66 + 2d420f0
commit f9a19d6
Show file tree

Hide file tree

Showing 63 changed files with 995 additions and 3,789 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -1191,7 +1191,7 @@ jobs:
 
   test-native:
     name: Unit Test Native Code
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-core-oss
 
     steps:
       - uses: actions/checkout@v3

diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock
diff --git a/packages/next-swc/Cargo.toml b/packages/next-swc/Cargo.toml
@@ -47,11 +47,11 @@ swc_emotion = { version = "0.29.10" }
 testing = { version = "0.31.31" }
 
 # Turbo crates
-turbo-binding = { git = "/~https://github.com/vercel/turbo.git", tag = "turbopack-230412.3" }
+turbo-binding = { git = "/~https://github.com/vercel/turbo.git", tag = "turbopack-230413.2" }
 # [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-230412.3" }
+turbo-tasks = { git = "/~https://github.com/vercel/turbo.git", tag = "turbopack-230413.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "/~https://github.com/vercel/turbo.git", tag = "turbopack-230412.3" }
+turbo-tasks-fs = { git = "/~https://github.com/vercel/turbo.git", tag = "turbopack-230413.2" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/next-core/js/package.json b/packages/next-swc/crates/next-core/js/package.json
@@ -10,7 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-dev-runtime": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230411.2",
+    "@vercel/turbopack-dev": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-dev/js?turbopack-230413.2",
+    "@vercel/turbopack-node": "https://gitpkg.vercel.app/vercel/turbo/crates/turbopack-node/js?turbopack-230413.2",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",