Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
196 changes: 196 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ turbopack-trace-server = { path = "turbopack/crates/turbopack-trace-server" }
turbopack-trace-utils = { path = "turbopack/crates/turbopack-trace-utils" }
turbopack-wasm = { path = "turbopack/crates/turbopack-wasm" }

react_compiler_swc = { version = "0.1.5", package = "nextjs_react_compiler_swc" }
react_compiler = { version = "0.1.5", package = "nextjs_react_compiler" }

# SWC crates
swc_core = { version = "65.0.3", default-features = false, features = [
"ecma_loader_lru",
Expand Down
3 changes: 3 additions & 0 deletions crates/next-core/src/next_client/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@ pub async fn get_client_module_options_context(
.resolved_cell()
});

let enable_rust_react_compiler = *next_config.rust_react_compiler().await?;

let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext {
esm_url_rewrite_behavior: Some(UrlRewriteBehavior::Relative),
Expand Down Expand Up @@ -423,6 +425,7 @@ pub async fn get_client_module_options_context(
enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options.to_resolved().await?),
enable_rust_react_compiler,
..module_options_context.ecmascript.clone()
},
enable_webpack_loaders,
Expand Down
37 changes: 26 additions & 11 deletions crates/next-core/src/next_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ use turbopack_core::{
module_graph::style_groups::StyleGroupsAlgorithm,
resolve::ResolveAliasMap,
};
use turbopack_ecmascript::{OptionTreeShaking, TreeShakingMode};
use turbopack_ecmascript::{
OptionTreeShaking, TreeShakingMode,
transform::{OptionReactCompilerCompilationMode, ReactCompilerCompilationMode},
};
use turbopack_ecmascript_plugins::transform::{
emotion::EmotionTransformConfig, relay::RelayConfig,
styled_components::StyledComponentsTransformConfig,
Expand Down Expand Up @@ -927,16 +930,6 @@ pub enum MdxRsOptions {
Option(MdxTransformOptions),
}

#[turbo_tasks::value(shared, operation)]
#[derive(Clone, Debug, Default, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub enum ReactCompilerCompilationMode {
#[default]
Infer,
Annotation,
All,
}

#[turbo_tasks::value(shared, operation)]
#[derive(Clone, Debug, Default, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
Expand Down Expand Up @@ -1327,6 +1320,8 @@ pub struct ExperimentalConfig {
turbopack_local_postcss_config: Option<bool>,
// Whether to enable the global-not-found convention
global_not_found: Option<bool>,
/// Experimental Rust React compiler (Turbopack only); requires `reactCompiler`.
turbopack_rust_react_compiler: Option<bool>,
/// Defaults to false in development mode, true in production mode.
turbopack_remove_unused_imports: Option<bool>,
/// Defaults to false in development mode, true in production mode.
Expand Down Expand Up @@ -2128,6 +2123,26 @@ impl NextConfig {
options.cell()
}

/// Returns compilation mode when both `reactCompiler` and `turbopackRustReactCompiler` are set;
/// `None` otherwise.
#[turbo_tasks::function]
pub fn rust_react_compiler(&self) -> Vc<OptionReactCompilerCompilationMode> {
let use_rust = self
.experimental
.turbopack_rust_react_compiler
.unwrap_or(false);
let mode = match (use_rust, &self.react_compiler) {
(true, Some(ReactCompilerOptionsOrBoolean::Boolean(true))) => {
Some(ReactCompilerCompilationMode::Infer)
}
(true, Some(ReactCompilerOptionsOrBoolean::Option(opts))) => {
Some(opts.compilation_mode)
}
_ => None,
};
Vc::cell(mode)
}

#[turbo_tasks::function]
pub fn sass_config(&self) -> Vc<JsonValue> {
Vc::cell(self.sass_options.clone().unwrap_or_default())
Expand Down
7 changes: 7 additions & 0 deletions crates/next-core/src/next_server/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,8 @@ pub async fn get_server_module_options_context(
.flatten()
.collect();

let enable_rust_react_compiler = *next_config.rust_react_compiler().await?;

let source_maps = *next_config.server_source_maps().await?;
let module_options_context = ModuleOptionsContext {
ecmascript: EcmascriptOptionsContext {
Expand Down Expand Up @@ -659,6 +661,7 @@ pub async fn get_server_module_options_context(
enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options.to_resolved().await?),
enable_rust_react_compiler: None,
..module_options_context.ecmascript
},
enable_webpack_loaders,
Expand Down Expand Up @@ -721,6 +724,7 @@ pub async fn get_server_module_options_context(
enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options.to_resolved().await?),
enable_rust_react_compiler,
..module_options_context.ecmascript
},
enable_webpack_loaders,
Expand Down Expand Up @@ -801,6 +805,7 @@ pub async fn get_server_module_options_context(
enable_jsx: Some(rsc_jsx_runtime_options),
enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options.to_resolved().await?),
enable_rust_react_compiler: None,
..module_options_context.ecmascript
},
enable_webpack_loaders,
Expand Down Expand Up @@ -877,6 +882,7 @@ pub async fn get_server_module_options_context(
enable_jsx: Some(rsc_jsx_runtime_options),
enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options.to_resolved().await?),
enable_rust_react_compiler: None,
..module_options_context.ecmascript
},
enable_webpack_loaders,
Expand Down Expand Up @@ -964,6 +970,7 @@ pub async fn get_server_module_options_context(
enable_jsx: Some(jsx_runtime_options),
enable_typescript_transform: Some(tsconfig),
enable_decorators: Some(decorators_options.to_resolved().await?),
enable_rust_react_compiler: None,
..module_options_context.ecmascript
},
enable_webpack_loaders,
Expand Down
Loading
Loading