refactor(next_shared): update references

packages/next-swc/crates/core/tests/fixture.rs

@@ -12,7 +12,6 @@ use next_swc::{
     shake_exports::{shake_exports, Config as ShakeExportsConfig},
 };
 use next_transform_font::{next_font_loaders, Config as FontLoaderConfig};
-use swc_relay::{relay, RelayLanguageConfig};
 use turbo_binding::swc::{
     core::{
         common::{chain, comments::SingleThreadedComments, FileName, Mark},
@@ -25,6 +24,7 @@ use turbo_binding::swc::{
             },
         },
     },
+    custom_transform::relay::{relay, RelayLanguageConfig},
     testing::fixture,
 };
 
@@ -151,7 +151,7 @@ fn page_config_fixture(input: PathBuf) {
 #[fixture("tests/fixture/relay/**/input.ts*")]
 fn relay_no_artifact_dir_fixture(input: PathBuf) {
     let output = input.parent().unwrap().join("output.js");
-    let config = swc_relay::Config {
+    let config = turbo_binding::swc::custom_transform::relay::Config {
         language: RelayLanguageConfig::TypeScript,
         artifact_directory: Some(PathBuf::from("__generated__")),
         ..Default::default()

packages/next-swc/crates/next-core/Cargo.toml

@@ -25,6 +25,7 @@ futures = { workspace = true }
 lazy_static = { workspace = true }
 turbo-binding = { workspace = true, features = [
   "__swc_transform_modularize_imports",
+  "__swc_transform_relay",
   "__feature_auto_hash_map",
   "__turbo_tasks",
   "__turbo_tasks_bytes",

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

@@ -196,15 +196,15 @@ pub async fn get_client_module_options_context(
 
     let enable_emotion = *get_emotion_compiler_config(next_config).await?;
 
-    let mut before_core_transform_plugins = vec![];
+    let mut source_transforms = vec![];
     if let Some(relay_transform_plugin) = *get_relay_transform_plugin(next_config).await? {
-        before_core_transform_plugins.push(relay_transform_plugin);
+        source_transforms.push(relay_transform_plugin);
     }
 
-    let custom_ecma_transform_plugins = Some(CustomEcmaTransformPluginsVc::cell(
-        CustomEcmaTransformPlugins {
-            before: before_core_transform_plugins,
-            after: vec![],
+    let custom_ecma_transform_plugins = Some(CustomEcmascriptTransformPluginsVc::cell(
+        CustomEcmascriptTransformPlugins {
+            source_transforms,
+            output_transforms: vec![],
         },
     ));
 

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

@@ -284,15 +284,15 @@ pub async fn get_server_module_options_context(
     let enable_emotion = *get_emotion_compiler_config(next_config).await?;
     let enable_styled_components = *get_styled_components_compiler_config(next_config).await?;
 
-    let mut before_core_transform_plugins = vec![];
+    let mut source_transforms = vec![];
     if let Some(relay_transform_plugin) = *get_relay_transform_plugin(next_config).await? {
-        before_core_transform_plugins.push(relay_transform_plugin);
+        source_transforms.push(relay_transform_plugin);
     }
 
-    let custom_ecma_transform_plugins = Some(CustomEcmaTransformPluginsVc::cell(
-        CustomEcmaTransformPlugins {
-            before: before_core_transform_plugins,
-            after: vec![],
+    let custom_ecma_transform_plugins = Some(CustomEcmascriptTransformPluginsVc::cell(
+        CustomEcmascriptTransformPlugins {
+            source_transforms,
+            output_transforms: vec![],
         },
     ));
 

packages/next-swc/crates/next-core/src/next_shared/transforms/mod.rs

@@ -17,6 +17,7 @@ use turbo_binding::turbopack::{
     core::reference_type::{ReferenceType, UrlReferenceSubType},
     turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect, ModuleType},
 };
+use turbo_tasks::Value;
 
 use crate::next_image::{module::BlurPlaceholderMode, StructuredImageModuleTypeVc};
 

packages/next-swc/crates/next-core/src/next_shared/transforms/modularize_imports.rs

@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 
+use anyhow::Result;
 use async_trait::async_trait;
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
@@ -80,14 +81,14 @@ impl CustomTransformer for ModularizeImportsTransformer {
         &self,
         program: &mut Program,
         _ctx: &TransformContext<'_>,
-    ) -> Option<Program> {
+    ) -> Result<Option<Program>> {
         let p = std::mem::replace(program, Program::Module(Module::dummy()));
         *program = p.fold_with(&mut modularize_imports(
             turbo_binding::swc::custom_transform::modularize_imports::Config {
                 packages: self.packages.clone(),
             },
         ));
 
-        None
+        Ok(None)
     }
 }

packages/next-swc/crates/next-core/src/next_shared/transforms/next_dynamic.rs

@@ -59,15 +59,15 @@ impl CustomTransformer for NextJsDynamic {
         &self,
         program: &mut Program,
         ctx: &TransformContext<'_>,
-    ) -> Option<Program> {
+    ) -> Result<Option<Program>> {
         let module_program = unwrap_module_program(program);
-        Some(module_program.fold_with(&mut next_dynamic(
+        Ok(Some(module_program.fold_with(&mut next_dynamic(
             self.is_development,
             self.is_server,
             self.is_server_components,
             NextDynamicMode::Turbo,
             FileName::Real(ctx.file_path_str.into()),
             self.pages_dir.clone(),
-        )))
+        ))))
     }
 }

packages/next-swc/crates/next-core/src/next_shared/transforms/next_font.rs

@@ -1,3 +1,4 @@
+use anyhow::Result;
 use async_trait::async_trait;
 use swc_core::ecma::{ast::Program, atoms::JsWord, visit::VisitMutWith};
 use turbo_binding::turbopack::{
@@ -41,13 +42,13 @@ impl CustomTransformer for NextJsFont {
         &self,
         program: &mut Program,
         ctx: &TransformContext<'_>,
-    ) -> Option<Program> {
+    ) -> Result<Option<Program>> {
         let mut next_font = next_transform_font::next_font_loaders(next_transform_font::Config {
             font_loaders: self.font_loaders.clone(),
             relative_file_path_from_root: ctx.file_name_str.into(),
         });
 
         program.visit_mut_with(&mut next_font);
-        None
+        Ok(None)
     }
 }

packages/next-swc/crates/next-core/src/next_shared/transforms/next_strip_page_exports.rs

@@ -59,16 +59,13 @@ impl CustomTransformer for NextJsStripPageExports {
         &self,
         program: &mut Program,
         _ctx: &TransformContext<'_>,
-    ) -> Option<Program> {
+    ) -> Result<Option<Program>> {
         // TODO(alexkirsz) Connect the eliminated_packages to telemetry.
         let eliminated_packages = Default::default();
 
         let module_program = unwrap_module_program(program);
-        Some(
-            module_program.fold_with(&mut next_transform_strip_page_exports(
-                self.export_filter,
-                eliminated_packages,
-            )),
-        )
+        Ok(Some(module_program.fold_with(
+            &mut next_transform_strip_page_exports(self.export_filter, eliminated_packages),
+        )))
     }
 }

packages/next-swc/crates/next-dev-tests/Cargo.toml

@@ -54,6 +54,7 @@ turbo-binding = { workspace = true, features = [
   "__turbopack_core_issue_path",
   "__turbopack_node",
   "__turbopack_dev_server",
+  "__swc_transform_relay"
 ]}
 turbo-tasks = { workspace = true }
 url = { workspace = true }