diff --git a/Cargo.lock b/Cargo.lock
index 856b21cbf9e9..6d77129c402c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,7 +321,7 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "serde",
  "smallvec",
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "serde",
@@ -6934,7 +6934,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -6965,7 +6965,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -6977,7 +6977,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "bytes",
@@ -6991,7 +6991,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -7005,7 +7005,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -7021,7 +7021,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "base16",
  "hex",
@@ -7065,7 +7065,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "proc-macro-error",
@@ -7078,7 +7078,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7088,7 +7088,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "mimalloc",
 ]
@@ -7096,7 +7096,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7121,7 +7121,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7151,7 +7151,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7191,7 +7191,7 @@ dependencies = [
 [[package]]
 name = "turbopack-browser"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7214,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "clap",
@@ -7231,7 +7231,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7260,7 +7260,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7287,7 +7287,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7323,7 +7323,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7358,7 +7358,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "serde",
  "serde_json",
@@ -7369,7 +7369,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7393,7 +7393,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7409,7 +7409,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7425,7 +7425,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "base64 0.21.4",
@@ -7444,7 +7444,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "serde",
@@ -7459,7 +7459,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7474,7 +7474,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7508,7 +7508,7 @@ dependencies = [
 [[package]]
 name = "turbopack-nodejs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7528,7 +7528,7 @@ dependencies = [
 [[package]]
 name = "turbopack-resolve"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7546,7 +7546,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "serde",
@@ -7562,7 +7562,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -7573,7 +7573,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -7589,7 +7589,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240429.1#d9676c02cd63a32b0ce54a53a9573e369ffed181"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240430.2#ca175f127d57c68a2466e16c52d16aa3a5e815b6"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index 1c864e00973f..644798b39f15 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,11 +37,11 @@ swc_core = { version = "0.90.33", features = [
 testing = { version = "0.35.22" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240429.1" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240430.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-240429.1" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240430.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240429.1" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240430.2" }
 
 # General Deps
 
diff --git a/packages/next-swc/crates/napi/src/next_api/project.rs b/packages/next-swc/crates/napi/src/next_api/project.rs
index 1e2c64de8648..396f6ad2b6c5 100644
--- a/packages/next-swc/crates/napi/src/next_api/project.rs
+++ b/packages/next-swc/crates/napi/src/next_api/project.rs
@@ -35,6 +35,7 @@ use turbopack_binding::{
             issue::PlainIssue,
             source_map::Token,
             version::{PartialUpdate, TotalUpdate, Update, VersionState},
+            SOURCE_MAP_PREFIX,
         },
         ecmascript_hmr_protocol::{ClientUpdateInstruction, ResourceIdentifier},
         trace_utils::{
@@ -921,7 +922,7 @@ pub async fn project_trace_source(
                 }
             };
 
-            let Some(source_file) = original_file.strip_prefix("/turbopack/") else {
+            let Some(source_file) = original_file.strip_prefix(SOURCE_MAP_PREFIX) else {
                 bail!("Original file ({}) outside project", original_file)
             };
 
diff --git a/packages/next/package.json b/packages/next/package.json
index 38f2246e68a5..ae22ee4c6155 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -200,7 +200,7 @@
     "@types/ws": "8.2.0",
     "@vercel/ncc": "0.34.0",
     "@vercel/nft": "0.26.4",
-    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240430.2",
     "acorn": "8.5.0",
     "amphtml-validator": "1.0.35",
     "anser": "1.4.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 22057879fe71..425cfdf12100 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1072,8 +1072,8 @@ importers:
         specifier: 0.26.4
         version: 0.26.4
       '@vercel/turbopack-ecmascript-runtime':
-        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240430.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240430.2'
       acorn:
         specifier: 8.5.0
         version: 8.5.0
@@ -25773,8 +25773,8 @@ 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-240429.1':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240429.1}
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240430.2':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-240430.2}
     name: '@vercel/turbopack-ecmascript-runtime'
     version: 0.0.0
     dependencies: