diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index c1b5fd0fa880..b61f60a8e49b 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "serde", ] @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "clap 4.1.8", @@ -5090,6 +5090,7 @@ dependencies = [ "swc_ecma_transforms_base", "swc_ecma_transforms_module", "swc_ecma_transforms_optimization", + "swc_ecma_transforms_proposal", "swc_ecma_transforms_react", "swc_ecma_transforms_testing", "swc_ecma_transforms_typescript", @@ -6540,7 +6541,7 @@ dependencies = [ [[package]] name = "turbo-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "mimalloc", ] @@ -6548,7 +6549,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "auto-hash-map", @@ -6578,7 +6579,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "cargo-lock", @@ -6590,7 +6591,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "dotenvy", @@ -6604,7 +6605,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "indexmap", @@ -6621,7 +6622,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "auto-hash-map", @@ -6650,7 +6651,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "base16", "hex", @@ -6662,7 +6663,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -6676,7 +6677,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "proc-macro2", "quote", @@ -6686,7 +6687,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "auto-hash-map", @@ -6708,7 +6709,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "auto-hash-map", @@ -6720,7 +6721,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "async-recursion", @@ -6746,7 +6747,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "clap 4.1.8", @@ -6762,7 +6763,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "async-trait", @@ -6789,7 +6790,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "clap 4.1.8", @@ -6802,7 +6803,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "async-trait", @@ -6824,7 +6825,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "async-compression", @@ -6856,7 +6857,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "async-trait", @@ -6891,7 +6892,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "serde", @@ -6906,7 +6907,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "serde", @@ -6921,7 +6922,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "mdxjs", @@ -6936,7 +6937,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "futures", @@ -6962,7 +6963,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "serde", @@ -6978,7 +6979,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "swc_core", "turbo-tasks", @@ -6989,7 +6990,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230317.2#11cca6719665fbb17d6750d8c62bd95fe4f2998e" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230321.1#4e461236222a57a22da484836bcf76a50b72890f" dependencies = [ "anyhow", "once_cell", diff --git a/packages/next-swc/Cargo.toml b/packages/next-swc/Cargo.toml index 5c1214882069..63cc60356edb 100644 --- a/packages/next-swc/Cargo.toml +++ b/packages/next-swc/Cargo.toml @@ -46,36 +46,36 @@ swc_emotion = { version = "0.29.10" } testing = { version = "0.31.31" } # Turbo crates -auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2", default-features = false } -turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2", default-features = false } -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } -turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230317.2" } +auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1", default-features = false } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1", default-features = false } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } +turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230321.1" } # General Deps diff --git a/packages/next-swc/crates/next-core/src/app_render/next_layout_entry_transition.rs b/packages/next-swc/crates/next-core/src/app_render/next_layout_entry_transition.rs index 2590f5634ff3..0d999f191004 100644 --- a/packages/next-swc/crates/next-core/src/app_render/next_layout_entry_transition.rs +++ b/packages/next-swc/crates/next-core/src/app_render/next_layout_entry_transition.rs @@ -1,6 +1,6 @@ use anyhow::Result; use indexmap::indexmap; -use turbo_tasks::Value; +use turbo_tasks::{primitives::OptionStringVc, Value}; use turbo_tasks_fs::FileSystemPathVc; use turbopack::{ self, @@ -69,7 +69,11 @@ impl Transition for NextLayoutEntryTransition { EcmascriptInputTransform::TypeScript { use_define_for_class_fields: false, }, - EcmascriptInputTransform::React { refresh: false }, + EcmascriptInputTransform::React { + refresh: false, + import_source: OptionStringVc::cell(None), + runtime: OptionStringVc::cell(None), + }, ]), context.compile_time_info(), InnerAssetsVc::cell(indexmap! { diff --git a/packages/next-swc/crates/next-core/src/app_source.rs b/packages/next-swc/crates/next-core/src/app_source.rs index b77a312a990d..6fb38b0e1aa8 100644 --- a/packages/next-swc/crates/next-core/src/app_source.rs +++ b/packages/next-swc/crates/next-core/src/app_source.rs @@ -6,7 +6,7 @@ use std::{ use anyhow::{anyhow, Result}; use indexmap::indexmap; -use turbo_tasks::{TryJoinIterExt, Value, ValueToString}; +use turbo_tasks::{primitives::OptionStringVc, TryJoinIterExt, Value, ValueToString}; use turbo_tasks_env::{CustomProcessEnvVc, EnvMapVc, ProcessEnvVc}; use turbo_tasks_fs::{rope::RopeBuilder, File, FileContent, FileSystemPathVc}; use turbopack::{ @@ -658,7 +658,11 @@ import BOOTSTRAP from {}; context, Value::new(EcmascriptModuleAssetType::Typescript), EcmascriptInputTransformsVc::cell(vec![ - EcmascriptInputTransform::React { refresh: false }, + EcmascriptInputTransform::React { + refresh: false, + import_source: OptionStringVc::cell(None), + runtime: OptionStringVc::cell(None), + }, EcmascriptInputTransform::TypeScript { use_define_for_class_fields: false, }, diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs index 9a7cac3860e4..2ed2fecca3b9 100644 --- a/packages/next-swc/crates/next-core/src/next_client/context.rs +++ b/packages/next-swc/crates/next-core/src/next_client/context.rs @@ -8,7 +8,7 @@ use turbo_tasks_fs::{FileSystem, FileSystemPathVc}; use turbopack::{ module_options::{ module_options_context::{ModuleOptionsContext, ModuleOptionsContextVc}, - PostCssTransformOptions, WebpackLoadersOptions, + JsxTransformOptions, PostCssTransformOptions, WebpackLoadersOptions, }, resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, transition::TransitionsByNameVc, @@ -156,7 +156,13 @@ pub async fn get_client_module_options_context( // We don't need to resolve React Refresh for each module. Instead, // we try resolve it once at the root and pass down a context to all // the modules. - enable_jsx: true, + enable_jsx: Some( + JsxTransformOptions { + import_source: None, + runtime: None, + } + .cell(), + ), enable_emotion: true, enable_react_refresh, enable_styled_components: true, diff --git a/packages/next-swc/crates/next-core/src/next_client/transition.rs b/packages/next-swc/crates/next-core/src/next_client/transition.rs index 8557b3f4105e..1e49c2d02ee4 100644 --- a/packages/next-swc/crates/next-core/src/next_client/transition.rs +++ b/packages/next-swc/crates/next-core/src/next_client/transition.rs @@ -1,6 +1,6 @@ use anyhow::Result; use indexmap::indexmap; -use turbo_tasks::Value; +use turbo_tasks::{primitives::OptionStringVc, Value}; use turbo_tasks_fs::FileSystemPathVc; use turbopack::{ ecmascript::chunk_group_files_asset::ChunkGroupFilesAsset, @@ -83,7 +83,11 @@ impl Transition for NextClientTransition { EcmascriptInputTransform::TypeScript { use_define_for_class_fields: false, }, - EcmascriptInputTransform::React { refresh: false }, + EcmascriptInputTransform::React { + refresh: false, + import_source: OptionStringVc::cell(None), + runtime: OptionStringVc::cell(None), + }, ]), context.compile_time_info(), InnerAssetsVc::cell(indexmap! { diff --git a/packages/next-swc/crates/next-core/src/next_client_component/server_to_client_transition.rs b/packages/next-swc/crates/next-core/src/next_client_component/server_to_client_transition.rs index acc7bdc02356..078175ec016b 100644 --- a/packages/next-swc/crates/next-core/src/next_client_component/server_to_client_transition.rs +++ b/packages/next-swc/crates/next-core/src/next_client_component/server_to_client_transition.rs @@ -1,6 +1,6 @@ use anyhow::Result; use indexmap::indexmap; -use turbo_tasks::Value; +use turbo_tasks::{primitives::OptionStringVc, Value}; use turbopack::{ transition::{Transition, TransitionVc}, ModuleAssetContextVc, @@ -57,7 +57,11 @@ impl Transition for NextServerToClientTransition { EcmascriptInputTransform::TypeScript { use_define_for_class_fields: false, }, - EcmascriptInputTransform::React { refresh: false }, + EcmascriptInputTransform::React { + refresh: false, + import_source: OptionStringVc::cell(None), + runtime: OptionStringVc::cell(None), + }, ]), context.compile_time_info(), InnerAssetsVc::cell(indexmap! { diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs index e8e8de3bdb6f..ab5e851129c8 100644 --- a/packages/next-swc/crates/next-core/src/next_server/context.rs +++ b/packages/next-swc/crates/next-core/src/next_server/context.rs @@ -4,8 +4,8 @@ use turbo_tasks_env::ProcessEnvVc; use turbo_tasks_fs::FileSystemPathVc; use turbopack::{ module_options::{ - ModuleOptionsContext, ModuleOptionsContextVc, PostCssTransformOptions, - WebpackLoadersOptions, + JsxTransformOptions, JsxTransformOptionsVc, ModuleOptionsContext, ModuleOptionsContextVc, + PostCssTransformOptions, WebpackLoadersOptions, }, resolve_options_context::{ResolveOptionsContext, ResolveOptionsContextVc}, }; @@ -238,7 +238,7 @@ pub async fn get_server_module_options_context( ..Default::default() }; ModuleOptionsContext { - enable_jsx: true, + enable_jsx: Some(get_jsx_transform_options()), enable_styled_jsx: true, enable_postcss_transform, enable_webpack_loaders, @@ -257,7 +257,7 @@ pub async fn get_server_module_options_context( ..Default::default() }; ModuleOptionsContext { - enable_jsx: true, + enable_jsx: Some(get_jsx_transform_options()), enable_styled_jsx: true, enable_postcss_transform, enable_webpack_loaders, @@ -279,7 +279,7 @@ pub async fn get_server_module_options_context( ..Default::default() }; ModuleOptionsContext { - enable_jsx: true, + enable_jsx: Some(get_jsx_transform_options()), enable_postcss_transform, enable_webpack_loaders, enable_typescript_transform: Some(tsconfig), @@ -314,7 +314,7 @@ pub async fn get_server_module_options_context( ..Default::default() }; ModuleOptionsContext { - enable_jsx: true, + enable_jsx: Some(get_jsx_transform_options()), enable_styled_jsx: true, enable_postcss_transform, enable_webpack_loaders, @@ -333,6 +333,15 @@ pub async fn get_server_module_options_context( Ok(module_options_context) } +#[turbo_tasks::function] +pub fn get_jsx_transform_options() -> JsxTransformOptionsVc { + JsxTransformOptions { + import_source: None, + runtime: None, + } + .cell() +} + #[turbo_tasks::function] pub fn get_build_module_options_context() -> ModuleOptionsContextVc { ModuleOptionsContext { diff --git a/packages/next-swc/crates/next-core/src/page_source.rs b/packages/next-swc/crates/next-core/src/page_source.rs index fa6c2c7259de..a83682aacdc1 100644 --- a/packages/next-swc/crates/next-core/src/page_source.rs +++ b/packages/next-swc/crates/next-core/src/page_source.rs @@ -2,7 +2,7 @@ use anyhow::Result; use indexmap::indexmap; use serde::{Deserialize, Serialize}; use turbo_tasks::{ - primitives::{StringVc, StringsVc}, + primitives::{OptionStringVc, StringVc, StringsVc}, trace::TraceRawVcs, Value, }; @@ -721,7 +721,11 @@ impl SsrEntryVc { EcmascriptInputTransform::TypeScript { use_define_for_class_fields: false, }, - EcmascriptInputTransform::React { refresh: false }, + EcmascriptInputTransform::React { + refresh: false, + import_source: OptionStringVc::cell(None), + runtime: OptionStringVc::cell(None), + }, ]), this.context.compile_time_info(), InnerAssetsVc::cell(inner_assets),