fix(plugin:emotion): panic when target to chrome 40

crates/mako/src/ast/js_ast.rs

@@ -23,7 +23,6 @@ use crate::ast::{error, utils};
 use crate::compiler::Context;
 use crate::config::{DevtoolConfig, Mode, OutputMode};
 use crate::module::Dependency;
-use crate::plugin::PluginTransformJsParam;
 use crate::utils::base64_encode;
 use crate::visitors::dep_analyzer::DepAnalyzer;
 
@@ -134,7 +133,6 @@ impl JsAst {
         &mut self,
         mut_visitors: &mut Vec<Box<dyn visit::VisitMut>>,
         folders: &mut Vec<Box<dyn visit::Fold>>,
-        file: &File,
         should_inject_helpers: bool,
         context: Arc<Context>,
     ) -> Result<()> {
@@ -151,28 +149,11 @@ impl JsAst {
                         }
 
                         // folders
-                        let body = ast.body.take();
-                        let mut module = Module {
-                            span: ast.span,
-                            shebang: ast.shebang.clone(),
-                            body,
-                        };
+                        let mut module = ast.take();
                         for folder in folders {
                             module = folder.as_mut().fold_module(module);
                         }
-                        ast.body = module.body;
-
-                        // transform with plugin
-                        context.plugin_driver.transform_js(
-                            &PluginTransformJsParam {
-                                handler,
-                                path: file.path.to_str().unwrap(),
-                                top_level_mark: self.top_level_mark,
-                                unresolved_mark: self.unresolved_mark,
-                            },
-                            ast,
-                            &context,
-                        )?;
+                        *ast = module;
 
                         // FIXME: remove this, it's special logic
                         // inject helpers

crates/mako/src/build/transform.rs

@@ -1,19 +1,22 @@
 use std::sync::Arc;
 
 use anyhow::Result;
+use swc_core::common::errors::HANDLER;
 use swc_core::common::GLOBALS;
 use swc_core::css::ast::{AtRule, AtRulePrelude, ImportHref, Rule, Str, Stylesheet, UrlValue};
 use swc_core::css::compat::compiler::{self, Compiler};
 use swc_core::css::{compat as swc_css_compat, prefixer, visit as swc_css_visit};
 use swc_core::ecma::preset_env::{self as swc_preset_env};
 use swc_core::ecma::transforms::base::feature::FeatureFlag;
 use swc_core::ecma::transforms::base::fixer::paren_remover;
+use swc_core::ecma::transforms::base::helpers::{Helpers, HELPERS};
 use swc_core::ecma::transforms::base::{resolver, Assumptions};
 use swc_core::ecma::transforms::compat::reserved_words;
 use swc_core::ecma::transforms::optimization::simplifier;
 use swc_core::ecma::transforms::optimization::simplify::{dce, Config as SimpilifyConfig};
 use swc_core::ecma::transforms::proposal::decorators;
 use swc_core::ecma::visit::{Fold, VisitMut};
+use swc_error_reporters::handler::try_with_handler;
 
 use crate::ast::css_ast::CssAst;
 use crate::ast::file::File;
@@ -23,6 +26,7 @@ use crate::compiler::Context;
 use crate::config::Mode;
 use crate::features;
 use crate::module::ModuleAst;
+use crate::plugin::PluginTransformJsParam;
 use crate::plugins::context_module::ContextModuleVisitor;
 use crate::visitors::css_assets::CSSAssets;
 use crate::visitors::css_flexbugs::CSSFlexbugs;
@@ -107,7 +111,7 @@ impl Transform {
                         && is_browser;
                     if is_jsx {
                         visitors.push(react(
-                            cm,
+                            cm.clone(),
                             context.clone(),
                             use_refresh,
                             &top_level_mark,
@@ -169,34 +173,6 @@ impl Transform {
                     let comments = origin_comments.get_swc_comments().clone();
                     let assumptions = context.assumptions_for(file);
 
-                    folders.push(Box::new(swc_preset_env::preset_env(
-                        unresolved_mark,
-                        Some(comments),
-                        swc_preset_env::Config {
-                            mode: Some(swc_preset_env::Mode::Entry),
-                            targets: Some(swc_preset_env_targets_from_map(
-                                context.config.targets.clone(),
-                            )),
-                            ..Default::default()
-                        },
-                        assumptions,
-                        &mut FeatureFlag::default(),
-                    )));
-                    folders.push(Box::new(reserved_words::reserved_words()));
-                    folders.push(Box::new(paren_remover(Default::default())));
-                    // simplify, but keep top level dead code
-                    // e.g. import x from 'foo'; but x is not used
-                    // this must be kept for tree shaking to work
-                    folders.push(Box::new(simplifier(
-                        unresolved_mark,
-                        SimpilifyConfig {
-                            dce: dce::Config {
-                                top_level: false,
-                                ..Default::default()
-                            },
-                            ..Default::default()
-                        },
-                    )));
                     // NOTICE: remove optimize_package_imports temporarily
                     // folders.push(Box::new(Optional {
                     //     enabled: should_optimize(file.path.to_str().unwrap(), context.clone()),
@@ -206,7 +182,59 @@ impl Transform {
                     //     ),
                     // }));
 
-                    ast.transform(&mut visitors, &mut folders, file, true, context.clone())?;
+                    ast.transform(&mut visitors, &mut folders, false, context.clone())?;
+
+                    // run transform js in plugins
+                    try_with_handler(cm.clone(), Default::default(), |handler| {
+                        HELPERS.set(&Helpers::new(true), || {
+                            HANDLER.set(handler, || {
+                                // transform with plugin
+                                context.plugin_driver.transform_js(
+                                    &PluginTransformJsParam {
+                                        handler,
+                                        path: file.path.to_str().unwrap(),
+                                        top_level_mark,
+                                        unresolved_mark,
+                                    },
+                                    &mut ast.ast,
+                                    &context,
+                                )
+                            })
+                        })
+                    })?;
+
+                    // preset_env should go last
+                    let mut preset_folders: Vec<Box<dyn Fold>> = vec![
+                        Box::new(swc_preset_env::preset_env(
+                            unresolved_mark,
+                            Some(comments),
+                            swc_preset_env::Config {
+                                mode: Some(swc_preset_env::Mode::Entry),
+                                targets: Some(swc_preset_env_targets_from_map(
+                                    context.config.targets.clone(),
+                                )),
+                                ..Default::default()
+                            },
+                            assumptions,
+                            &mut FeatureFlag::default(),
+                        )),
+                        Box::new(reserved_words::reserved_words()),
+                        Box::new(paren_remover(Default::default())),
+                        // simplify, but keep top level dead code
+                        // e.g. import x from 'foo'; but x is not used
+                        // this must be kept for tree shaking to work
+                        Box::new(simplifier(
+                            unresolved_mark,
+                            SimpilifyConfig {
+                                dce: dce::Config {
+                                    top_level: false,
+                                    ..Default::default()
+                                },
+                                ..Default::default()
+                            },
+                        )),
+                    ];
+                    ast.transform(&mut vec![], &mut preset_folders, true, context.clone())?;
 
                     Ok(())
                 })

crates/mako/src/plugins/emotion.rs

@@ -3,6 +3,7 @@
 use anyhow::Ok;
 use swc_core::common::comments::NoopComments;
 use swc_core::common::sync::Lrc;
+use swc_core::common::util::take::Take;
 use swc_core::common::SourceMap;
 use swc_core::ecma::ast::Module;
 use swc_core::ecma::visit::{Fold, VisitMut, VisitMutWith};
@@ -77,8 +78,7 @@
             self.cm.clone(),
             NoopComments,
         );
-        module.body = folder.fold_module(module.clone()).body;
 
-        module.visit_mut_children_with(self);
+        *module = folder.fold_module(module.take());
     }
 }

crates/mako/src/visitors/fix_helper_inject_position.rs

@@ -97,7 +97,6 @@ mod tests {
     use swc_core::ecma::visit::{Fold, VisitMut, VisitMutWith};
 
     use super::FixHelperInjectPosition;
-    use crate::ast::file::File;
     use crate::ast::tests::TestUtils;
     use crate::build::targets::swc_preset_env_targets_from_map;
 
@@ -190,8 +189,7 @@ export { foo };
             )));
             let mut visitors: Vec<Box<dyn VisitMut>> = vec![];
             let context = test_utils.context.clone();
-            let file = File::new("test.ts".to_string(), context.clone());
-            ast.transform(&mut visitors, &mut folders, &file, false, context)
+            ast.transform(&mut visitors, &mut folders, false, context)
                 .unwrap();
         });
         test_utils.js_ast_to_code()

e2e/fixtures/config.emotion/expect.js

@@ -55,3 +55,7 @@ const test = async () => {
   }
 };
 module.exports = test;
+
+if (!module.parent) {
+  test();
+}

e2e/fixtures/config.emotion/mako.config.json

@@ -1,3 +1,7 @@
 {
-  "emotion": true
+  "emotion": true,
+  "targets": {
+    "chrome": 40
+  },
+  "progress": false
 }