Skip to content

Commit 9c6b60a

Browse files
committed
Revert "Remove ServerDirectiveTransformer (#56496)"
This reverts commit bfdb349.
1 parent a301eb6 commit 9c6b60a

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

packages/next-swc/crates/next-core/src/next_client/context.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use turbopack_binding::{
1818
},
1919
dev::{react_refresh::assert_can_resolve_react_refresh, DevChunkingContext},
2020
ecmascript::chunk::EcmascriptChunkingContext,
21+
ecmascript_plugin::transform::directives::server::ServerDirectiveTransformer,
2122
node::execution_context::ExecutionContext,
2223
turbopack::{
2324
condition::ContextCondition,
@@ -243,6 +244,11 @@ pub async fn get_client_module_options_context(
243244
*get_emotion_transform_plugin(next_config).await?,
244245
*get_styled_components_transform_plugin(next_config).await?,
245246
*get_styled_jsx_transform_plugin().await?,
247+
Some(Vc::cell(Box::new(ServerDirectiveTransformer::new(
248+
// ServerDirective is not implemented yet and always reports an issue.
249+
// We don't have to pass a valid transition name yet, but the API is prepared.
250+
&Vc::cell("TODO".to_string()),
251+
)) as _)),
246252
]
247253
.into_iter()
248254
.flatten()

packages/next-swc/crates/next-core/src/next_server/context.rs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ use turbopack_binding::{
1818
resolve::{parse::Request, pattern::Pattern},
1919
},
2020
ecmascript::TransformPlugin,
21-
ecmascript_plugin::transform::directives::client::ClientDirectiveTransformer,
21+
ecmascript_plugin::transform::directives::{
22+
client::ClientDirectiveTransformer, server::ServerDirectiveTransformer,
23+
},
2224
node::execution_context::ExecutionContext,
2325
turbopack::{
2426
condition::ContextCondition,
@@ -289,6 +291,12 @@ pub async fn get_server_module_options_context(
289291
let styled_components_transform_plugin =
290292
*get_styled_components_transform_plugin(next_config).await?;
291293
let styled_jsx_transform_plugin = *get_styled_jsx_transform_plugin().await?;
294+
let server_directive_transform_plugin =
295+
Some(Vc::cell(Box::new(ServerDirectiveTransformer::new(
296+
// ServerDirective is not implemented yet and always reports an issue.
297+
// We don't have to pass a valid transition name yet, but the API is prepared.
298+
&Vc::cell("TODO".to_string()),
299+
)) as _));
292300

293301
// ModuleOptionsContext related options
294302
let tsconfig = get_typescript_transform_options(project_path);
@@ -387,6 +395,7 @@ pub async fn get_server_module_options_context(
387395
let mut base_source_transforms: Vec<Vc<TransformPlugin>> = vec![
388396
styled_components_transform_plugin,
389397
styled_jsx_transform_plugin,
398+
server_directive_transform_plugin,
390399
]
391400
.into_iter()
392401
.flatten()
@@ -460,11 +469,13 @@ pub async fn get_server_module_options_context(
460469
ecmascript_client_reference_transition_name,
461470
..
462471
} => {
463-
let mut base_source_transforms: Vec<Vc<TransformPlugin>> =
464-
vec![styled_components_transform_plugin]
465-
.into_iter()
466-
.flatten()
467-
.collect();
472+
let mut base_source_transforms: Vec<Vc<TransformPlugin>> = vec![
473+
styled_components_transform_plugin,
474+
server_directive_transform_plugin,
475+
]
476+
.into_iter()
477+
.flatten()
478+
.collect();
468479

469480
if let Some(ecmascript_client_reference_transition_name) =
470481
ecmascript_client_reference_transition_name

0 commit comments

Comments
 (0)