Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(transforms): enable rsc transforms for the remaining contexts #61231

Merged
merged 6 commits into from
Feb 6, 2024
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 38 additions & 11 deletions packages/next-swc/crates/next-core/src/next_server/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ use crate::{
},
transforms::{
emotion::get_emotion_transform_rule, get_ecma_transform_rule,
next_react_server_components::get_next_react_server_components_transform_rule,
relay::get_relay_transform_rule,
styled_components::get_styled_components_transform_rule,
styled_jsx::get_styled_jsx_transform_rule,
Expand Down Expand Up @@ -382,12 +383,21 @@ pub async fn get_server_module_options_context(
ServerContextType::Pages { .. }
| ServerContextType::PagesData { .. }
| ServerContextType::PagesApi { .. } => {
let custom_source_transform_rules: Vec<ModuleRule> =
let mut custom_source_transform_rules: Vec<ModuleRule> =
vec![styled_components_transform_rule, styled_jsx_transform_rule]
.into_iter()
.flatten()
.collect();

let mut foreign_custom_transform_rules = custom_source_transform_rules.clone();

if let ServerContextType::Pages { .. } = ty.into_value() {
custom_source_transform_rules.push(
get_next_react_server_components_transform_rule(next_config, false, None)
.await?,
);
}

base_next_server_rules.extend(custom_source_transform_rules);
base_next_server_rules.extend(source_transform_rules);

Expand All @@ -408,8 +418,9 @@ pub async fn get_server_module_options_context(
..Default::default()
};

foreign_custom_transform_rules.extend(internal_custom_rules);
let foreign_code_module_options_context = ModuleOptionsContext {
custom_rules: internal_custom_rules.clone(),
custom_rules: foreign_custom_transform_rules.clone(),
enable_webpack_loaders: foreign_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
Expand All @@ -419,7 +430,7 @@ pub async fn get_server_module_options_context(
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
enable_jsx: Some(JsxTransformOptions::default().cell()),
custom_rules: internal_custom_rules,
custom_rules: foreign_custom_transform_rules,
..module_options_context.clone()
};

Expand All @@ -444,33 +455,41 @@ pub async fn get_server_module_options_context(
..module_options_context
}
}
ServerContextType::AppSSR { .. } => {
let custom_source_transform_rules: Vec<ModuleRule> =
ServerContextType::AppSSR { app_dir, .. } => {
let mut custom_source_transform_rules: Vec<ModuleRule> =
vec![styled_components_transform_rule, styled_jsx_transform_rule]
.into_iter()
.flatten()
.collect();

let mut foreign_custom_transform_rules = custom_source_transform_rules.clone();

custom_source_transform_rules.push(
get_next_react_server_components_transform_rule(next_config, false, Some(app_dir))
.await?,
);

base_next_server_rules.extend(custom_source_transform_rules.clone());
base_next_server_rules.extend(source_transform_rules);

let module_options_context = ModuleOptionsContext {
custom_rules: custom_source_transform_rules,
execution_context: Some(execution_context),
use_lightningcss,
tree_shaking_mode: Some(TreeShakingMode::ReexportsOnly),
..Default::default()
};

foreign_custom_transform_rules.extend(internal_custom_rules);
let foreign_code_module_options_context = ModuleOptionsContext {
custom_rules: internal_custom_rules.clone(),
custom_rules: foreign_custom_transform_rules.clone(),
enable_webpack_loaders: foreign_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
..module_options_context.clone()
};
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
custom_rules: internal_custom_rules,
custom_rules: foreign_custom_transform_rules,
..module_options_context.clone()
};

Expand All @@ -496,6 +515,7 @@ pub async fn get_server_module_options_context(
}
}
ServerContextType::AppRSC {
app_dir,
ecmascript_client_reference_transition_name,
..
} => {
Expand All @@ -517,6 +537,13 @@ pub async fn get_server_module_options_context(
));
}

let mut foreign_custom_transform_rules = custom_source_transform_rules.clone();

custom_source_transform_rules.push(
get_next_react_server_components_transform_rule(next_config, true, Some(app_dir))
.await?,
);

base_next_server_rules.extend(custom_source_transform_rules.clone());
base_next_server_rules.extend(source_transform_rules);

Expand All @@ -527,17 +554,17 @@ pub async fn get_server_module_options_context(
..Default::default()
};

custom_source_transform_rules.extend(internal_custom_rules);
foreign_custom_transform_rules.extend(internal_custom_rules);
let foreign_code_module_options_context = ModuleOptionsContext {
custom_rules: custom_source_transform_rules.clone(),
custom_rules: foreign_custom_transform_rules.clone(),
enable_webpack_loaders: foreign_webpack_loaders,
// NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
enable_postcss_transform: enable_foreign_postcss_transform,
..module_options_context.clone()
};
let internal_module_options_context = ModuleOptionsContext {
enable_typescript_transform: Some(TypescriptTransformOptions::default().cell()),
custom_rules: custom_source_transform_rules,
custom_rules: foreign_custom_transform_rules,
..module_options_context.clone()
};
ModuleOptionsContext {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ use crate::{
get_server_actions_transform_rule, next_amp_attributes::get_next_amp_attr_rule,
next_cjs_optimizer::get_next_cjs_optimizer_rule,
next_disallow_re_export_all_in_page::get_next_disallow_export_all_in_page_rule,
next_pure::get_next_pure_rule,
next_react_server_components::get_next_react_server_components_transform_rule,
server_actions::ActionsTransform,
next_pure::get_next_pure_rule, server_actions::ActionsTransform,
},
};

Expand Down Expand Up @@ -74,8 +72,6 @@ pub async fn get_next_server_transforms_rules(
mdx_rs,
));

rules.push(get_next_react_server_components_transform_rule(next_config, true).await?);

if let Some(client_transition) = client_transition {
rules.push(get_next_css_client_reference_transforms_rule(
client_transition,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
use std::path::PathBuf;

use anyhow::Result;
use async_trait::async_trait;
use next_custom_transforms::transforms::react_server_components::*;
use swc_core::{
common::{util::take::Take, FileName},
ecma::{
ast::{Module, Program},
visit::FoldWith,
},
common::FileName,
ecma::{ast::Program, visit::VisitWith},
};
use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath;
use turbopack_binding::turbopack::{
ecmascript::{CustomTransformer, TransformContext},
turbopack::module_options::ModuleRule,
Expand All @@ -20,13 +16,31 @@ use super::get_ecma_transform_rule;
use crate::next_config::NextConfig;

/// Returns a rule which applies the Next.js react server components transform.
/// This transform owns responsibility to assert various import / usage
/// conditions against each code's context. Refer below table how we are
/// applying this rules against various contexts.
///
/// +-----------------+---------+--------------------+
/// | Context\Enabled | Enabled | isReactServerLayer |
/// +-----------------+---------+--------------------+
/// | SSR | true | false |
/// | Client | true | false |
/// | Middleware | false | false |
/// | Api | false | false |
/// | RSC | true | true |
/// | Pages | true | false |
/// +-----------------+---------+--------------------+
pub async fn get_next_react_server_components_transform_rule(
next_config: Vc<NextConfig>,
is_react_server_layer: bool,
app_dir: Option<Vc<FileSystemPath>>,
) -> Result<ModuleRule> {
let enable_mdx_rs = *next_config.mdx_rs().await?;
Ok(get_ecma_transform_rule(
Box::new(NextJsReactServerComponents::new(is_react_server_layer)),
Box::new(NextJsReactServerComponents::new(
is_react_server_layer,
app_dir,
)),
enable_mdx_rs,
true,
))
Expand All @@ -35,32 +49,39 @@ pub async fn get_next_react_server_components_transform_rule(
#[derive(Debug)]
struct NextJsReactServerComponents {
is_react_server_layer: bool,
app_dir: Option<Vc<FileSystemPath>>,
}

impl NextJsReactServerComponents {
fn new(is_react_server_layer: bool) -> Self {
fn new(is_react_server_layer: bool, app_dir: Option<Vc<FileSystemPath>>) -> Self {
Self {
is_react_server_layer,
app_dir,
}
}
}

#[async_trait]
impl CustomTransformer for NextJsReactServerComponents {
async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
let p = std::mem::replace(program, Program::Module(Module::dummy()));
let file_name = if ctx.file_path_str.is_empty() {
FileName::Anon
} else {
FileName::Real(ctx.file_path_str.into())
};

let mut visitor = server_components(
FileName::Custom(ctx.file_path_str.to_string()),
let mut visitor = server_components_assert(
file_name,
Config::WithOptions(Options {
is_react_server_layer: self.is_react_server_layer,
}),
ctx.comments,
Some(PathBuf::from(ctx.file_path.parent().await?.path.clone())),
match self.app_dir {
None => None,
Some(path) => Some(path.await?.path.clone().into()),
},
);

*program = p.fold_with(&mut visitor);

program.visit_with(&mut visitor);
Ok(())
}
}