wip

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

@@ -1,8 +1,15 @@
 pub(crate) mod emotion;
 pub(crate) mod modularize_imports;
+pub(crate) mod next_amp_attributes;
+pub(crate) mod next_cjs_optimizer;
+pub(crate) mod next_disallow_re_export_all_in_page;
 pub(crate) mod next_dynamic;
 pub(crate) mod next_font;
+pub(crate) mod next_optimize_server_react;
+pub(crate) mod next_page_config;
+pub(crate) mod next_pure;
 pub(crate) mod next_react_server_components;
+pub(crate) mod next_shake_exports;
 pub(crate) mod next_strip_page_exports;
 pub(crate) mod relay;
 pub(crate) mod server_actions;

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

@@ -0,0 +1,22 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::amp_attributes::amp_attributes;
+use turbopack_binding::{
+    swc::core::{
+        common::util::take::Take,
+        ecma::{ast::*, visit::FoldWith},
+    },
+    turbopack::ecmascript::{CustomTransformer, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextAmpAttributes {}
+
+#[async_trait]
+impl CustomTransformer for NextAmpAttributes {
+    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+        let p = std::mem::replace(program, Program::Module(Module::dummy()));
+        *program = p.fold_with(&mut amp_attributes());
+        Ok(())
+    }
+}

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

@@ -0,0 +1,28 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::cjs_optimizer::{cjs_optimizer, Config};
+use turbopack_binding::{
+    swc::core::{
+        common::SyntaxContext,
+        ecma::{ast::*, visit::VisitMutWith},
+    },
+    turbopack::ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextCjsOptimizer {
+    config: Config,
+}
+
+#[async_trait]
+impl CustomTransformer for NextCjsOptimizer {
+    async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
+        let mut visitor = cjs_optimizer(
+            self.config.clone(),
+            SyntaxContext::empty().apply_mark(ctx.unresolved_mark),
+        );
+
+        program.visit_mut_with(&mut visitor);
+        Ok(())
+    }
+}

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

@@ -0,0 +1,24 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::disallow_re_export_all_in_page::disallow_re_export_all_in_page;
+use turbopack_binding::{
+    swc::core::{
+        common::util::take::Take,
+        ecma::{ast::*, visit::FoldWith},
+    },
+    turbopack::ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextDisallowReExportAllInPage {
+    is_page_file: bool,
+}
+
+#[async_trait]
+impl CustomTransformer for NextDisallowReExportAllInPage {
+    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+        let p = std::mem::replace(program, Program::Module(Module::dummy()));
+        *program = p.fold_with(&mut disallow_re_export_all_in_page(self.is_page_file));
+        Ok(())
+    }
+}

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

@@ -0,0 +1,27 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::optimize_server_react::{optimize_server_react, Config};
+use turbopack_binding::{
+    swc::core::{
+        common::util::take::Take,
+        ecma::{ast::*, visit::FoldWith},
+    },
+    turbopack::ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextOptimizeServerReact {
+    optimize_use_state: bool,
+}
+
+#[async_trait]
+impl CustomTransformer for NextOptimizeServerReact {
+    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+        let p = std::mem::replace(program, Program::Module(Module::dummy()));
+
+        *program = p.fold_with(&mut optimize_server_react(Config {
+            optimize_use_state: self.optimize_use_state,
+        }));
+        Ok(())
+    }
+}

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

@@ -0,0 +1,26 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::page_config::page_config;
+use turbopack_binding::{
+    swc::core::{
+        common::util::take::Take,
+        ecma::{ast::*, visit::FoldWith},
+    },
+    turbopack::ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextPageConfig {
+    is_development: bool,
+    is_page_file: bool,
+}
+
+#[async_trait]
+impl CustomTransformer for NextPageConfig {
+    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+        let p = std::mem::replace(program, Program::Module(Module::dummy()));
+
+        *program = p.fold_with(&mut page_config(self.is_development, self.is_page_file));
+        Ok(())
+    }
+}

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

@@ -0,0 +1,18 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::pure::pure_magic;
+use turbopack_binding::{
+    swc::core::ecma::{ast::*, visit::VisitMutWith},
+    turbopack::ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextPure {}
+
+#[async_trait]
+impl CustomTransformer for NextPure {
+    async fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Result<()> {
+        program.visit_mut_with(&mut pure_magic(ctx.comments.clone()));
+        Ok(())
+    }
+}

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

@@ -0,0 +1,27 @@
+use anyhow::Result;
+use async_trait::async_trait;
+use next_custom_transforms::transforms::shake_exports::{shake_exports, Config};
+use turbopack_binding::{
+    swc::core::{
+        common::util::take::Take,
+        ecma::{ast::*, visit::FoldWith},
+    },
+    turbopack::ecmascript::{CustomTransformer, EcmascriptInputTransform, TransformContext},
+};
+
+#[derive(Debug)]
+struct NextShakeExports {
+    ignore: Vec<String>,
+}
+
+#[async_trait]
+impl CustomTransformer for NextShakeExports {
+    async fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Result<()> {
+        let p = std::mem::replace(program, Program::Module(Module::dummy()));
+
+        *program = p.fold_with(&mut shake_exports(Config {
+            ignore: self.ignore.iter().map(|s| s.clone().into()).collect(),
+        }));
+        Ok(())
+    }
+}

packages/next-swc/crates/next-custom-transforms/src/chain_transforms.rs

@@ -3,6 +3,7 @@ use std::{cell::RefCell, path::PathBuf, rc::Rc, sync::Arc};
 use either::Either;
 use fxhash::FxHashSet;
 use serde::Deserialize;
+use swc_core::ecma::visit::as_folder;
 use turbopack_binding::swc::{
     core::{
         common::{
@@ -275,11 +276,11 @@ where
         },
         match &opts.cjs_require_optimizer {
             Some(config) => {
-                Either::Left(crate::transforms::cjs_optimizer::cjs_optimizer(config.clone(), SyntaxContext::empty().apply_mark(unresolved_mark)))
+                Either::Left(as_folder(crate::transforms::cjs_optimizer::cjs_optimizer(config.clone(), SyntaxContext::empty().apply_mark(unresolved_mark))))
             },
             None => Either::Right(noop()),
         },
-        crate::transforms::pure::pure_magic(comments),
+        as_folder(crate::transforms::pure::pure_magic(comments)),
     )
 }
 

packages/next-swc/crates/next-custom-transforms/src/transforms/cjs_optimizer.rs

@@ -9,19 +9,16 @@ use turbopack_binding::swc::core::{
         },
         atoms::{Atom, JsWord},
         utils::{prepend_stmts, private_ident, ExprFactory, IdentRenamer},
-        visit::{
-            as_folder, noop_visit_mut_type, noop_visit_type, Fold, Visit, VisitMut, VisitMutWith,
-            VisitWith,
-        },
+        visit::{noop_visit_mut_type, noop_visit_type, Visit, VisitMut, VisitMutWith, VisitWith},
     },
 };
 
-pub fn cjs_optimizer(config: Config, unresolved_ctxt: SyntaxContext) -> impl Fold + VisitMut {
-    as_folder(CjsOptimizer {
+pub fn cjs_optimizer(config: Config, unresolved_ctxt: SyntaxContext) -> CjsOptimizer {
+    CjsOptimizer {
         data: State::default(),
         packages: config.packages,
         unresolved_ctxt,
-    })
+    }
 }
 
 #[derive(Clone, Debug, Deserialize)]
@@ -35,7 +32,7 @@ pub struct PackageConfig {
     pub transforms: FxHashMap<JsWord, JsWord>,
 }
 
-struct CjsOptimizer {
+pub struct CjsOptimizer {
     data: State,
     packages: FxHashMap<String, PackageConfig>,
     unresolved_ctxt: SyntaxContext,

packages/next-swc/crates/next-custom-transforms/src/transforms/mod.rs

@@ -5,13 +5,15 @@ pub mod disallow_re_export_all_in_page;
 pub mod dynamic;
 pub mod fonts;
 pub mod import_analyzer;
-pub mod named_import_transform;
 pub mod next_ssg;
-pub mod optimize_barrel;
 pub mod optimize_server_react;
 pub mod page_config;
 pub mod pure;
 pub mod react_server_components;
 pub mod server_actions;
 pub mod shake_exports;
 pub mod strip_page_exports;
+
+//[TODO] PACK-1564: need to decide reuse vs. turbopack specific
+pub mod named_import_transform;
+pub mod optimize_barrel;

packages/next-swc/crates/next-custom-transforms/src/transforms/pure.rs

@@ -2,23 +2,23 @@ use turbopack_binding::swc::core::{
     common::{comments::Comments, errors::HANDLER, util::take::Take, Span, Spanned, DUMMY_SP},
     ecma::{
         ast::{CallExpr, Callee, EmptyStmt, Expr, Module, ModuleDecl, ModuleItem, Stmt},
-        visit::{as_folder, noop_visit_mut_type, Fold, VisitMut, VisitMutWith},
+        visit::{noop_visit_mut_type, VisitMut, VisitMutWith},
     },
 };
 
 use crate::transforms::import_analyzer::ImportMap;
 
-pub fn pure_magic<C>(comments: C) -> impl Fold
+pub fn pure_magic<C>(comments: C) -> PureTransform<C>
 where
     C: Comments,
 {
-    as_folder(PureTransform {
+    PureTransform {
         imports: Default::default(),
         comments,
-    })
+    }
 }
 
-struct PureTransform<C>
+pub struct PureTransform<C>
 where
     C: Comments,
 {