From 93abe1881bd1267f2eb5ad0d19f70f4c561a10ef Mon Sep 17 00:00:00 2001
From: Alex Kirszenberg <alex.kirszenberg@vercel.com>
Date: Fri, 21 Jul 2023 15:59:09 +0200
Subject: [PATCH 1/3] Turbopack: Hide Turbo Engine internals

---
 packages/next-swc/crates/napi/src/app_structure.rs           | 2 +-
 packages/next-swc/crates/napi/src/next_api/utils.rs          | 2 +-
 packages/next-swc/crates/next-build/src/next_build.rs        | 2 +-
 packages/next-swc/crates/next-dev-tests/tests/integration.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/next-swc/crates/napi/src/app_structure.rs b/packages/next-swc/crates/napi/src/app_structure.rs
index 13936f29dc7d4..ec6a73455e60a 100644
--- a/packages/next-swc/crates/napi/src/app_structure.rs
+++ b/packages/next-swc/crates/napi/src/app_structure.rs
@@ -332,7 +332,7 @@ pub fn stream_entrypoints(
                 func.call(Ok(None), ThreadsafeFunctionCallMode::NonBlocking);
             }
 
-            Ok(unit().node)
+            Ok(unit())
         })
     });
     Ok(())
diff --git a/packages/next-swc/crates/napi/src/next_api/utils.rs b/packages/next-swc/crates/napi/src/next_api/utils.rs
index 0b7b3eb8cdf65..6be9c942e8931 100644
--- a/packages/next-swc/crates/napi/src/next_api/utils.rs
+++ b/packages/next-swc/crates/napi/src/next_api/utils.rs
@@ -266,7 +266,7 @@ pub fn subscribe<T: 'static + Send + Sync, F: Future<Output = Result<T>> + Send,
                 eprintln!("{}", error);
                 return Err(error);
             }
-            Ok(unit().node)
+            Ok(unit())
         })
     });
     Ok(External::new(RootTask {
diff --git a/packages/next-swc/crates/next-build/src/next_build.rs b/packages/next-swc/crates/next-build/src/next_build.rs
index b71d42f7186fe..f4dc5642f966e 100644
--- a/packages/next-swc/crates/next-build/src/next_build.rs
+++ b/packages/next-swc/crates/next-build/src/next_build.rs
@@ -469,7 +469,7 @@ async fn handle_issues<T>(source: Vc<T>, issue_reporter: Vc<Box<dyn IssueReporte
 
     let has_fatal = issue_reporter.report_issues(
         TransientInstance::new(issues.clone()),
-        TransientValue::new(source.node),
+        TransientValue::new(Vc::into_raw(source)),
         // TODO this should be Error, but we need to fix the errors happing first
         IssueSeverity::Fatal.cell(),
     );
diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration.rs b/packages/next-swc/crates/next-dev-tests/tests/integration.rs
index 1472bd29a1e56..5234a8ce55e9d 100644
--- a/packages/next-swc/crates/next-dev-tests/tests/integration.rs
+++ b/packages/next-swc/crates/next-dev-tests/tests/integration.rs
@@ -313,7 +313,7 @@ async fn run_test(resource: PathBuf) -> JsResult {
             )
             .await?;
 
-            Ok(unit().node)
+            Ok(unit())
         });
         tt.wait_task_completion(task, true).await.unwrap();
     }

From 1e2b47ef771e412cb34d45aed38d71e472028b38 Mon Sep 17 00:00:00 2001
From: Alex Kirszenberg <alex.kirszenberg@vercel.com>
Date: Fri, 21 Jul 2023 16:05:25 +0200
Subject: [PATCH 2/3] Link

---
 Cargo.lock                                    | 74 +++++++++----------
 Cargo.toml                                    |  6 +-
 .../next-swc/crates/next-core/js/package.json |  4 +-
 pnpm-lock.yaml                                | 18 ++---
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0ee9d60faf611..3ed182c409788 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -412,7 +412,7 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "serde",
 ]
@@ -3632,7 +3632,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "serde",
@@ -7317,7 +7317,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7349,7 +7349,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -7361,7 +7361,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "bytes",
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -7390,7 +7390,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7407,7 +7407,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7437,7 +7437,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "base16",
  "hex",
@@ -7449,7 +7449,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -7463,7 +7463,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7473,7 +7473,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "mimalloc",
 ]
@@ -7481,7 +7481,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7504,7 +7504,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-testing"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7517,7 +7517,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7548,7 +7548,7 @@ dependencies = [
 [[package]]
 name = "turbopack-bench"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "chromiumoxide",
@@ -7578,7 +7578,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7621,7 +7621,7 @@ dependencies = [
 [[package]]
 name = "turbopack-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7643,7 +7643,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "clap 4.1.11",
@@ -7667,7 +7667,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7696,7 +7696,7 @@ dependencies = [
 [[package]]
 name = "turbopack-create-test-app"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "clap 4.1.11",
@@ -7709,7 +7709,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7731,7 +7731,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7755,7 +7755,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7792,7 +7792,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7826,7 +7826,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "serde",
  "serde_json",
@@ -7837,7 +7837,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7860,7 +7860,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7877,7 +7877,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7893,7 +7893,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "base64 0.21.0",
@@ -7913,7 +7913,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "serde",
@@ -7928,7 +7928,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7943,7 +7943,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7978,7 +7978,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "serde",
@@ -7994,7 +7994,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -8005,7 +8005,7 @@ dependencies = [
 [[package]]
 name = "turbopack-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -8023,7 +8023,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230804.2#cdfb31efc33f89fce9366365935cb12793f08ba8"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230807.2#f9cbcf26fe0416c1e1ee405dbc94906ad4846eaa"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index 158655de227c8..fab9a1bcf99fe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,11 +44,11 @@ swc_core = { version = "0.79.40" }
 testing = { version = "0.33.21" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230807.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-230804.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230807.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230804.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230807.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
index 36f81f0579cb4..27db7a92ff47b 100644
--- a/packages/next-swc/crates/next-core/js/package.json
+++ b/packages/next-swc/crates/next-core/js/package.json
@@ -10,8 +10,8 @@
     "check": "tsc --noEmit"
   },
   "dependencies": {
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230807.2",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230807.2",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 759325008c648..0820a6afade27 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1419,11 +1419,11 @@ importers:
   packages/next-swc/crates/next-core/js:
     dependencies:
       '@vercel/turbopack-ecmascript-runtime':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2(react-refresh@0.12.0)(webpack@5.86.0)'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230807.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230807.2(react-refresh@0.12.0)(webpack@5.86.0)'
       '@vercel/turbopack-node':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230807.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230807.2'
       anser:
         specifier: ^2.1.1
         version: 2.1.1
@@ -26413,9 +26413,9 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
-  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2(react-refresh@0.12.0)(webpack@5.86.0)':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2}
-    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230804.2'
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230807.2(react-refresh@0.12.0)(webpack@5.86.0)':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230807.2}
+    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230807.2'
     name: '@vercel/turbopack-ecmascript-runtime'
     version: 0.0.0
     dependencies:
@@ -26426,8 +26426,8 @@ packages:
       - webpack
     dev: false
 
-  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230804.2}
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230807.2':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230807.2}
     name: '@vercel/turbopack-node'
     version: 0.0.0
     dependencies:

From 81b2a74a121f724c0ce920bf63031606b9186df8 Mon Sep 17 00:00:00 2001
From: Alex Kirszenberg <alex.kirszenberg@vercel.com>
Date: Mon, 7 Aug 2023 14:46:06 +0200
Subject: [PATCH 3/3] Fix rebase issue

---
 packages/next-swc/crates/next-api/src/versioned_content_map.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next-swc/crates/next-api/src/versioned_content_map.rs b/packages/next-swc/crates/next-api/src/versioned_content_map.rs
index e11761cf26ce8..27984d70f5b3f 100644
--- a/packages/next-swc/crates/next-api/src/versioned_content_map.rs
+++ b/packages/next-swc/crates/next-api/src/versioned_content_map.rs
@@ -75,7 +75,7 @@ impl VersionedContentMap {
             bail!("could not find versioned content for path {}", path);
         };
         // NOTE(alexkirsz) This is necessary to mark the task as active again.
-        content.node.connect();
+        Vc::connect(content);
         Ok(content)
     }
 }