diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 3d9c45d65f6551..1f4d8e5f61566d 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -10,6 +10,7 @@ env:
   TURBO_VERSION: 1.10.9
   NODE_MAINTENANCE_VERSION: 16
   NODE_LTS_VERSION: 18.16.1
+  CARGO_PROFILE_RELEASE_LTO: 'true'
 
 jobs:
   build:
@@ -231,6 +232,7 @@ jobs:
           options: >-
             -e RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
             -e CARGO_INCREMENTAL=${{ env.CARGO_INCREMENTAL }}
+            -e CARGO_PROFILE_RELEASE_LTO=${{ env.CARGO_PROFILE_RELEASE_LTO }}
             -e CARGO_TERM_COLOR=${{ env.CARGO_TERM_COLOR }}
             -e RUST_BACKTRACE=${{ env.RUST_BACKTRACE }}
             -e CARGO_REGISTRIES_CRATES_IO_PROTOCOL=${{ env.CARGO_REGISTRIES_CRATES_IO_PROTOCOL }}
diff --git a/Cargo.lock b/Cargo.lock
index 16f4e615a9fa02..acba432fbdecfc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -412,7 +412,6 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "serde",
 ]
@@ -3633,7 +3632,6 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "serde",
@@ -7318,7 +7316,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7350,7 +7347,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -7362,7 +7358,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "bytes",
@@ -7377,7 +7372,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -7391,7 +7385,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7408,7 +7401,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7438,7 +7430,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "base16",
  "hex",
@@ -7450,7 +7441,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -7464,7 +7454,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7474,7 +7463,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "mimalloc",
 ]
@@ -7482,7 +7470,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7505,7 +7492,6 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-testing"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7518,7 +7504,6 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7549,7 +7534,6 @@ dependencies = [
 [[package]]
 name = "turbopack-bench"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "chromiumoxide",
@@ -7579,7 +7563,6 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7622,7 +7605,6 @@ dependencies = [
 [[package]]
 name = "turbopack-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7644,7 +7626,6 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "clap 4.1.11",
@@ -7668,7 +7649,6 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7697,7 +7677,6 @@ dependencies = [
 [[package]]
 name = "turbopack-create-test-app"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "clap 4.1.11",
@@ -7710,7 +7689,6 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7732,7 +7710,6 @@ dependencies = [
 [[package]]
 name = "turbopack-dev"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7756,7 +7733,6 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7793,7 +7769,6 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7827,7 +7802,6 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "serde",
  "serde_json",
@@ -7838,7 +7812,6 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7861,7 +7834,6 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7878,7 +7850,6 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7894,7 +7865,6 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "base64 0.21.0",
@@ -7914,7 +7884,6 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "serde",
@@ -7929,7 +7898,6 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7944,7 +7912,6 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7979,7 +7946,6 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "serde",
@@ -7995,7 +7961,6 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -8006,7 +7971,6 @@ dependencies = [
 [[package]]
 name = "turbopack-test-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -8024,7 +7988,6 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230809.2#030a67136c82f9e193574df3170f594dea6feae7"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index 1b3e5fc02c2ec2..e8cf1d0c0e4725 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
   "scripts/send-trace-to-jaeger",
@@ -22,8 +23,9 @@ opt-level = 2
 [profile.dev.package."*"]
 debug-assertions = false
 
-[profile.release]
-lto = true
+# Set the settings for build scripts and proc-macros.
+[profile.dev.build-override]
+opt-level = 3
 
 [workspace.dependencies]
 # Workspace crates
@@ -44,11 +46,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-230809.2" }
+turbopack-binding = { path = "../turbo/crates/turbopack-binding" } # last tag: "turbopack-230809.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-230809.2" }
+turbo-tasks = { path = "../turbo/crates/turbo-tasks" } # last tag: "turbopack-230809.2"
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230809.2" }
+turbo-tasks-fs = { path = "../turbo/crates/turbo-tasks-fs" } # last tag: "turbopack-230809.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 1e4bc14843f699..35766c36cf07ee 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-230809.2",
-    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2",
+    "@vercel/turbopack-ecmascript-runtime": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230811.2",
+    "@vercel/turbopack-node": "https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230811.2",
     "anser": "^2.1.1",
     "css.escape": "^1.5.1",
     "next": "*",
diff --git a/packages/next-swc/crates/next-core/src/next_font/google/mod.rs b/packages/next-swc/crates/next-core/src/next_font/google/mod.rs
index 04c345d17fc9a6..ec9edf5ba5c9ff 100644
--- a/packages/next-swc/crates/next-core/src/next_font/google/mod.rs
+++ b/packages/next-swc/crates/next-core/src/next_font/google/mod.rs
@@ -26,7 +26,6 @@ use turbopack_binding::{
             resolve::{
                 options::{ImportMapResult, ImportMapping, ImportMappingReplacement},
                 parse::Request,
-                pattern::QueryMap,
                 ResolveResult,
             },
             virtual_source::VirtualSource,
@@ -134,7 +133,7 @@ impl ImportMappingReplacement for NextFontGoogleReplacer {
                         export default fontData;
                     "#,
                     // Pass along whichever options we received to the css handler
-                    qstring::QString::new(query.as_ref().unwrap().iter().collect()),
+                    qstring::QString::from(&**query),
                     properties.font_family.await?,
                     properties
                         .weight
@@ -366,25 +365,20 @@ async fn get_font_css_properties(
 
 #[turbo_tasks::function]
 async fn font_options_from_query_map(
-    query: Vc<QueryMap>,
+    query: Vc<String>,
     font_data: Vc<FontData>,
 ) -> Result<Vc<NextFontGoogleOptions>> {
-    let query_map = &*query.await?;
-    // These are invariants from the next/font swc transform. Regular errors instead
-    // of Issues should be okay.
-    let query_map = query_map
-        .as_ref()
-        .context("next/font/google queries must exist")?;
+    let query_map = qstring::QString::from(&**query.await?);
 
     if query_map.len() != 1 {
-        bail!("next/font/google queries must only have one entry");
+        bail!("next/font/google queries must have exactly one entry");
     }
 
-    let Some((json, _)) = query_map.iter().next() else {
+    let Some((json, _)) = query_map.into_iter().next() else {
         bail!("Expected one entry");
     };
 
-    options_from_request(&parse_json_with_source_context(json)?, &*font_data.await?)
+    options_from_request(&parse_json_with_source_context(&json)?, &*font_data.await?)
         .map(|o| NextFontGoogleOptions::new(Value::new(o)))
 }
 
diff --git a/packages/next-swc/crates/next-core/src/next_font/local/mod.rs b/packages/next-swc/crates/next-core/src/next_font/local/mod.rs
index e2d01ea873d6f9..91ffffee05824e 100644
--- a/packages/next-swc/crates/next-core/src/next_font/local/mod.rs
+++ b/packages/next-swc/crates/next-core/src/next_font/local/mod.rs
@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{bail, Result};
 use indoc::formatdoc;
 use turbo_tasks::Vc;
 use turbopack_binding::{
@@ -11,7 +11,6 @@ use turbopack_binding::{
         resolve::{
             options::{ImportMapResult, ImportMapping, ImportMappingReplacement},
             parse::Request,
-            pattern::QueryMap,
             ResolveResult,
         },
         virtual_source::VirtualSource,
@@ -97,7 +96,7 @@ impl ImportMappingReplacement for NextFontLocalReplacer {
                 export default fontData;
                         "#,
             // Pass along whichever options we received to the css handler
-            qstring::QString::new(query_vc.await?.as_ref().unwrap().iter().collect()),
+            qstring::QString::from(&**query_vc.await?),
             properties.font_family.await?,
             properties
                 .weight
@@ -222,22 +221,17 @@ async fn get_font_css_properties(
 }
 
 #[turbo_tasks::function]
-async fn font_options_from_query_map(query: Vc<QueryMap>) -> Result<Vc<NextFontLocalOptions>> {
-    let query_map = &*query.await?;
-    // These are invariants from the next/font swc transform. Regular errors instead
-    // of Issues should be okay.
-    let query_map = query_map
-        .as_ref()
-        .context("next/font/local queries must exist")?;
+async fn font_options_from_query_map(query: Vc<String>) -> Result<Vc<NextFontLocalOptions>> {
+    let query_map = qstring::QString::from(&**query.await?);
 
     if query_map.len() != 1 {
-        bail!("next/font/local queries must only have one entry");
+        bail!("next/font/local queries have exactly one entry");
     }
 
-    let Some((json, _)) = query_map.iter().next() else {
+    let Some((json, _)) = query_map.into_iter().next() else {
         bail!("Expected one entry");
     };
 
-    options_from_request(&parse_json_with_source_context(json)?)
+    options_from_request(&parse_json_with_source_context(&json)?)
         .map(|o| NextFontLocalOptions::new(Value::new(o)))
 }
diff --git a/packages/next-swc/crates/next-core/src/next_font/util.rs b/packages/next-swc/crates/next-core/src/next_font/util.rs
index f6498c29572bdb..632a6ea9185815 100644
--- a/packages/next-swc/crates/next-core/src/next_font/util.rs
+++ b/packages/next-swc/crates/next-core/src/next_font/util.rs
@@ -1,8 +1,6 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use turbo_tasks::Vc;
-use turbopack_binding::{
-    turbo::tasks_hash::hash_xxh3_hash64, turbopack::core::resolve::pattern::QueryMap,
-};
+use turbopack_binding::turbo::tasks_hash::hash_xxh3_hash64;
 
 /// CSS properties and values for a given font variation. These are rendered as
 /// values in both the returned JavaScript object and in the referenced css
@@ -19,9 +17,8 @@ pub(crate) struct FontCssProperties {
 /// next/font. Used to uniquely identify font requests for generated filenames
 /// and scoped font family names.
 #[turbo_tasks::function]
-pub(crate) async fn get_request_hash(query_vc: Vc<QueryMap>) -> Result<Vc<u32>> {
-    let query = &*query_vc.await?;
-    let query = query.as_ref().context("Query map must be present")?;
+pub(crate) async fn get_request_hash(query_vc: Vc<String>) -> Result<Vc<u32>> {
+    let query = qstring::QString::from(&**query_vc.await?);
     let mut to_hash = vec![];
     for (k, v) in query {
         to_hash.push(k);
diff --git a/packages/next-swc/crates/next-core/src/next_shared/resolve.rs b/packages/next-swc/crates/next-core/src/next_shared/resolve.rs
index 46ba476b331e9b..013f87f9fd5b60 100644
--- a/packages/next-swc/crates/next-core/src/next_shared/resolve.rs
+++ b/packages/next-swc/crates/next-core/src/next_shared/resolve.rs
@@ -21,7 +21,7 @@ use turbopack_binding::{
 use crate::next_telemetry::ModuleFeatureTelemetry;
 
 lazy_static! {
-    static ref UNSUPPORTED_PACKAGES: HashSet<&'static str> = ["@vercel/og"].into();
+    static ref UNSUPPORTED_PACKAGES: HashSet<&'static str> = [].into();
     static ref UNSUPPORTED_PACKAGE_PATHS: HashSet<(&'static str, &'static str)> = [].into();
     // Set of the features we want to track, following existing references in webpack/plugins/telemetry-plugin.
     static ref FEATURE_MODULES: HashMap<&'static str, Vec<&'static str>> = HashMap::from([
diff --git a/packages/next-swc/crates/next-dev/src/lib.rs b/packages/next-swc/crates/next-dev/src/lib.rs
index a76574a4384f94..ee9f959e292066 100644
--- a/packages/next-swc/crates/next-dev/src/lib.rs
+++ b/packages/next-swc/crates/next-dev/src/lib.rs
@@ -60,7 +60,7 @@ use turbopack_binding::{
         core::{
             environment::ServerAddr,
             issue::{IssueReporter, IssueSeverity},
-            resolve::{parse::Request, pattern::QueryMap},
+            resolve::parse::Request,
             server_fs::ServerFileSystem,
             PROJECT_FILESYSTEM_NAME,
         },
@@ -349,10 +349,14 @@ async fn source(
     let entry_requests = entry_requests
         .iter()
         .map(|r| match r {
-            EntryRequest::Relative(p) => Request::relative(Value::new(p.clone().into()), false),
-            EntryRequest::Module(m, p) => {
-                Request::module(m.clone(), Value::new(p.clone().into()), QueryMap::none())
+            EntryRequest::Relative(p) => {
+                Request::relative(Value::new(p.clone().into()), Vc::<String>::empty(), false)
             }
+            EntryRequest::Module(m, p) => Request::module(
+                m.clone(),
+                Value::new(p.clone().into()),
+                Vc::<String>::empty(),
+            ),
         })
         .collect();
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5a07565659b38d..79cda10ae3275d 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-230809.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2(react-refresh@0.12.0)(webpack@5.86.0)'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230811.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230811.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-230809.2
-        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2'
+        specifier: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230811.2
+        version: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230811.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-230809.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-230809.2}
-    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230809.2'
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230811.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-230811.2}
+    id: '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-ecmascript-runtime/js?turbopack-230811.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-230809.2':
-    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230809.2}
+  '@gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230811.2':
+    resolution: {tarball: https://gitpkg-fork.vercel.sh/vercel/turbo/crates/turbopack-node/js?turbopack-230811.2}
     name: '@vercel/turbopack-node'
     version: 0.0.0
     dependencies: