diff --git a/Cargo.lock b/Cargo.lock
index 6d2c36e7f1f06..38d5b7829522f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -400,7 +400,7 @@ dependencies = [
[[package]]
name = "auto-hash-map"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"serde",
]
@@ -3413,7 +3413,7 @@ dependencies = [
[[package]]
name = "node-file-trace"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"serde",
@@ -6980,7 +6980,7 @@ dependencies = [
[[package]]
name = "turbo-binding"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"auto-hash-map",
"mdxjs",
@@ -7020,7 +7020,7 @@ dependencies = [
[[package]]
name = "turbo-malloc"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"mimalloc",
]
@@ -7028,7 +7028,7 @@ dependencies = [
[[package]]
name = "turbo-tasks"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"auto-hash-map",
@@ -7058,7 +7058,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-build"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"cargo-lock",
@@ -7070,7 +7070,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-bytes"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"bytes",
@@ -7085,7 +7085,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-env"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"dotenvy",
@@ -7099,7 +7099,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fetch"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"indexmap",
@@ -7116,7 +7116,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-fs"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"auto-hash-map",
@@ -7145,7 +7145,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-hash"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"base16",
"hex",
@@ -7157,7 +7157,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"convert_case 0.6.0",
@@ -7171,7 +7171,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-macros-shared"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"proc-macro2",
"quote",
@@ -7181,7 +7181,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-memory"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"auto-hash-map",
@@ -7203,7 +7203,7 @@ dependencies = [
[[package]]
name = "turbo-tasks-testing"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"auto-hash-map",
@@ -7215,7 +7215,7 @@ dependencies = [
[[package]]
name = "turbopack"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-recursion",
@@ -7244,7 +7244,7 @@ dependencies = [
[[package]]
name = "turbopack-bench"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"chromiumoxide",
@@ -7274,7 +7274,7 @@ dependencies = [
[[package]]
name = "turbopack-cli-utils"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"clap 4.1.11",
@@ -7291,7 +7291,7 @@ dependencies = [
[[package]]
name = "turbopack-core"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-trait",
@@ -7318,7 +7318,7 @@ dependencies = [
[[package]]
name = "turbopack-create-test-app"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"clap 4.1.11",
@@ -7331,7 +7331,7 @@ dependencies = [
[[package]]
name = "turbopack-css"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-trait",
@@ -7353,7 +7353,7 @@ dependencies = [
[[package]]
name = "turbopack-dev"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"indexmap",
@@ -7374,7 +7374,7 @@ dependencies = [
[[package]]
name = "turbopack-dev-server"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-compression",
@@ -7408,7 +7408,7 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-trait",
@@ -7444,11 +7444,15 @@ dependencies = [
[[package]]
name = "turbopack-ecmascript-plugins"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-trait",
+ "indexmap",
+ "modularize_imports",
"serde",
+ "styled_components",
+ "styled_jsx",
"swc_core",
"swc_emotion",
"swc_relay",
@@ -7461,7 +7465,7 @@ dependencies = [
[[package]]
name = "turbopack-env"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"indexmap",
@@ -7477,7 +7481,7 @@ dependencies = [
[[package]]
name = "turbopack-image"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"base64 0.21.0",
@@ -7497,7 +7501,7 @@ dependencies = [
[[package]]
name = "turbopack-json"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"serde",
@@ -7512,7 +7516,7 @@ dependencies = [
[[package]]
name = "turbopack-mdx"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"mdxjs",
@@ -7527,7 +7531,7 @@ dependencies = [
[[package]]
name = "turbopack-node"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"async-stream",
@@ -7561,7 +7565,7 @@ dependencies = [
[[package]]
name = "turbopack-static"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"serde",
@@ -7577,7 +7581,7 @@ dependencies = [
[[package]]
name = "turbopack-swc-utils"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"swc_core",
"turbo-tasks",
@@ -7588,7 +7592,7 @@ dependencies = [
[[package]]
name = "turbopack-test-utils"
version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230508.2#b9e5e6d750c048bb083bfa60941554c479f6685f"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230510.1#95be42aa8a2e9d55207fd8ca8da5e247c2f7f322"
dependencies = [
"anyhow",
"once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index cefc763c5180a..d03e26c127045 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,11 +41,11 @@ swc_core = { version = "0.75.41" }
testing = { version = "0.33.4" }
# Turbo crates
-turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" }
+turbo-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.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-230508.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230508.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230510.1" }
# General Deps
diff --git a/packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs b/packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs
index 96293968fe2fa..0f388c0ab19c6 100644
--- a/packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs
+++ b/packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs
@@ -9,10 +9,6 @@ pub use next_dynamic::get_next_dynamic_transform_rule;
pub use next_font::get_next_font_transform_rule;
pub use next_strip_page_exports::get_next_pages_transforms_rule;
pub use relay::get_relay_transform_plugin;
-use swc_core::{
- common::util::take::Take,
- ecma::ast::{Module, ModuleItem, Program},
-};
use turbo_binding::turbopack::{
core::reference_type::{ReferenceType, UrlReferenceSubType},
turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect, ModuleType},
@@ -53,18 +49,3 @@ pub(crate) fn module_rule_match_js_no_url() -> ModuleRuleCondition {
]),
])
}
-
-pub(crate) fn unwrap_module_program(program: &mut Program) -> Program {
- match program {
- Program::Module(module) => Program::Module(module.take()),
- Program::Script(s) => Program::Module(Module {
- span: s.span,
- body: s
- .body
- .iter()
- .map(|stmt| ModuleItem::Stmt(stmt.clone()))
- .collect(),
- shebang: s.shebang.clone(),
- }),
- }
-}
diff --git a/packages/next-swc/crates/next-core/src/next_shared/transforms/modularize_imports.rs b/packages/next-swc/crates/next-core/src/next_shared/transforms/modularize_imports.rs
index e4b495035d0ee..9be81b756d9b8 100644
--- a/packages/next-swc/crates/next-core/src/next_shared/transforms/modularize_imports.rs
+++ b/packages/next-swc/crates/next-core/src/next_shared/transforms/modularize_imports.rs
@@ -77,11 +77,7 @@ impl ModularizeImportsTransformer {
#[async_trait]
impl CustomTransformer for ModularizeImportsTransformer {
- async fn transform(
- &self,
- program: &mut Program,
- _ctx: &TransformContext<'_>,
- ) -> Result