feat/upgrade swc

Cargo.toml

@@ -4,10 +4,12 @@ resolver = "2"
 
 [workspace.dependencies]
 cached            = "0.46.1"
+clap              = "4.3.11"
 mimalloc-rust     = { version = "=0.2.1" }
-serde             = { version = "1.0.171", features = ["derive"] }
+regex             = "1.9.3"
+serde             = "1.0.171"
 serde_json        = "1.0.100"
-swc_core          = { version = "=0.83.22", default-features = false }
+swc_core          = { version = "0.101.4", default-features = false }
 tikv-jemallocator = { version = "=0.5.4", features = ["disable_initial_exec_tls"] }
 
 [profile.release]

biome.json

@@ -20,7 +20,8 @@
       "./tmp/**",
       "./.pnpm-store/**",
       "./packages/*/dist/**",
-      "**/package.json"
+      "**/package.json",
+      "./crates/svgr-rs/__fixture__/**"
     ]
   },
   "formatter": {

crates/binding/src/tsfn.rs

@@ -64,6 +64,7 @@ pub struct JsHooks {
 }
 
 pub struct TsFnHooks {
+    #[allow(dead_code)]
     pub name: String,
     pub build_start: Option<threadsafe_function::ThreadsafeFunction<ReadMessage<(), ()>>>,
     pub generate_end:

crates/mako/Cargo.toml

@@ -14,7 +14,6 @@ test = false
 bitflags     = { version = "2.4.2", features = ["serde"] }
 cached       = { workspace = true }
 dashmap      = "4.0.1"
-delegate     = "0.12.0"
 fixedbitset  = "0.4.2"
 get_if_addrs = "0.5.3"
 glob-match   = "0.2.1"
@@ -30,13 +29,6 @@ serde_json       = { workspace = true }
 url              = { version = "2.5.0" }
 
 swc_core = { workspace = true, features = [
-  "__ecma",
-  "__ecma_plugin_transform",
-  "__ecma_transforms",
-  "__parser",
-  "__testing_transform",
-  "__utils",
-  "__visit",
   "base",
   "common_concurrent",
   "common_sourcemap",
@@ -50,11 +42,11 @@ swc_core = { workspace = true, features = [
   "css_prefixer",
   "css_utils",
   "css_visit",
-  "css_visit_path",
   "ecma_ast",
   "ecma_codegen",
   "ecma_minifier",
   "ecma_minifier_concurrent",
+  "ecma_parser",
   "ecma_preset_env",
   "ecma_quote",
   "ecma_transforms_compat",
@@ -63,18 +55,19 @@ swc_core = { workspace = true, features = [
   "ecma_transforms_proposal",
   "ecma_transforms_react",
   "ecma_transforms_typescript",
+  "ecma_utils",
   "ecma_visit_path",
   "swc_ecma_quote_macros",
 ] }
 
-swc_emotion         = "0.51.0"
-swc_error_reporters = "0.16.1"
-swc_node_comments   = "0.19.1"
+swc_emotion         = "0.72.19"
+swc_error_reporters = "0.21.0"
+swc_node_comments   = "0.24.0"
 
 anyhow                = "1.0.71"
 base64                = "0.21.2"
 chrono                = "0.4.38"
-clap                  = { version = "4.3.11", features = ["derive"] }
+clap                  = { workspace = true, features = ["derive"] }
 colored               = "2"
 config                = "0.13.3"
 convert_case          = "0.6.0"
@@ -89,7 +82,7 @@ hyper-tungstenite     = "0.10.0"
 indexmap              = "2.0.0"
 indicatif             = "0.17.8"
 md5                   = "0.7.0"
-mdxjs                 = "0.1.14"
+mdxjs                 = "0.2.6"
 mime_guess            = "2.0.4"
 nohash-hasher         = "0.2.0"
 notify                = { version = "6.1.1", default-features = false, features = ["macos_kqueue"] }
@@ -101,11 +94,11 @@ petgraph              = "0.6.3"
 puffin                = { version = "0.16.0", optional = true }
 puffin_egui           = { version = "0.22.0", optional = true }
 rayon                 = "1.7.0"
-regex                 = "1.9.3"
+regex                 = { workspace = true }
 sailfish              = "0.8.3"
 serde-xml-rs          = "0.6.0"
 serde_yaml            = "0.9.22"
-svgr-rs               = "0.1.3"
+svgr-rs               = { path = "../svgr-rs" }
 thiserror             = "1.0.43"
 tokio                 = { version = "1", features = ["rt-multi-thread", "sync"] }
 tokio-tungstenite     = "0.19.0"

crates/mako/src/ast/comments.rs

@@ -1,14 +1,13 @@
-use delegate::delegate;
 use swc_core::common;
 use swc_core::common::comments::{Comment, Comments as CommentsTrait};
 use swc_core::common::{BytePos, Span};
 use swc_node_comments::SwcComments;
 
 #[derive(Default)]
-pub struct Comments(MakoComments);
+pub struct Comments(SwcComments);
 
 impl Comments {
-    pub fn get_swc_comments(&self) -> &MakoComments {
+    pub fn get_swc_comments(&self) -> &SwcComments {
         &self.0
     }
 
@@ -85,38 +84,3 @@ impl Comments {
         found
     }
 }
-
-#[derive(Clone, Default)]
-pub struct MakoComments(SwcComments);
-
-impl CommentsTrait for MakoComments {
-    fn add_pure_comment(&self, pos: BytePos) {
-        //ref: https://github.com/swc-project/swc/pull/8172
-        if pos.is_dummy() {
-            #[cfg(debug_assertions)]
-            {
-                use tracing::warn;
-                warn!("still got pure comments at dummy pos! UPGRADE SWC!!!");
-            }
-            return;
-        }
-        self.0.add_pure_comment(pos);
-    }
-
-    delegate! {
-        to self.0 {
-            fn add_leading(&self, pos: BytePos, cmt: Comment);
-            fn add_leading_comments(&self, pos: BytePos, comments: Vec<Comment>);
-            fn has_leading(&self, pos: BytePos) -> bool;
-            fn move_leading(&self, from: BytePos, to: BytePos);
-            fn take_leading(&self, pos: BytePos) -> Option<Vec<Comment>>;
-            fn get_leading(&self, pos: BytePos) -> Option<Vec<Comment>>;
-            fn add_trailing(&self, pos: BytePos, cmt: Comment);
-            fn add_trailing_comments(&self, pos: BytePos, comments: Vec<Comment>);
-            fn has_trailing(&self, pos: BytePos) -> bool;
-            fn move_trailing(&self, from: BytePos, to: BytePos);
-            fn take_trailing(&self, pos: BytePos) -> Option<Vec<Comment>>;
-            fn get_trailing(&self, pos: BytePos) -> Option<Vec<Comment>>;
-        }
-    }
-}

crates/mako/src/ast/css_ast.rs

@@ -38,15 +38,18 @@ impl fmt::Debug for CssAst {
 impl CssAst {
     pub fn new(file: &File, context: Arc<Context>, css_modules: bool) -> Result<Self> {
         let fm = context.meta.css.cm.new_source_file(
-            FileName::Real(file.relative_path.clone()),
+            FileName::Real(file.relative_path.clone()).into(),
             file.get_content_raw(),
         );
         let config = parser::parser::ParserConfig {
             css_modules,
             legacy_ie: true,
             ..Default::default()
         };
-        let lexer = parser::lexer::Lexer::new(StringInput::from(&*fm), config);
+
+        let comments = context.meta.css.comments.clone();
+
+        let lexer = parser::lexer::Lexer::new(StringInput::from(&*fm), Some(&comments), config);
         let mut parser = parser::parser::Parser::new(lexer, config);
         let parse_result = parser.parse_all();
         let mut ast_errors = parser.take_errors();

crates/mako/src/ast/js_ast.rs

@@ -11,7 +11,7 @@ use swc_core::ecma::codegen::text_writer::JsWriter;
 use swc_core::ecma::codegen::{Config as JsCodegenConfig, Emitter};
 use swc_core::ecma::parser::error::SyntaxError;
 use swc_core::ecma::parser::lexer::Lexer;
-use swc_core::ecma::parser::{EsConfig, Parser, StringInput, Syntax, TsConfig};
+use swc_core::ecma::parser::{EsSyntax, Parser, StringInput, Syntax, TsSyntax};
 use swc_core::ecma::transforms::base::helpers::{inject_helpers, Helpers, HELPERS};
 use swc_core::ecma::utils::contains_top_level_await;
 use swc_core::ecma::visit;
@@ -45,13 +45,13 @@ impl fmt::Debug for JsAst {
 impl JsAst {
     pub fn new(file: &File, context: Arc<Context>) -> Result<Self> {
         let fm = context.meta.script.cm.new_source_file(
-            FileName::Real(file.relative_path.to_path_buf()),
+            FileName::Real(file.relative_path.to_path_buf()).into(),
             file.get_content_raw(),
         );
         let comments = context.meta.script.origin_comments.read().unwrap();
         let extname = &file.extname;
         let syntax = if extname == "ts" || extname == "tsx" {
-            Syntax::Typescript(TsConfig {
+            Syntax::Typescript(TsSyntax {
                 tsx: extname == "tsx",
                 decorators: true,
                 ..Default::default()
@@ -60,7 +60,7 @@ impl JsAst {
             let jsx = file.is_content_jsx()
                 || extname == "jsx"
                 || (extname == "js" && !file.is_under_node_modules);
-            Syntax::Es(EsConfig {
+            Syntax::Es(EsSyntax {
                 jsx,
                 decorators: true,
                 decorators_before_export: true,

crates/mako/src/ast/sourcemap.rs

@@ -68,11 +68,22 @@
 impl From<RawSourceMap> for swc_sourcemap::SourceMap {
     fn from(rsm: RawSourceMap) -> Self {
         Self::new(
-            rsm.file,
+            rsm.file.map(|f| f.into_boxed_str().into()),
             rsm.tokens,
-            rsm.names,
-            rsm.sources,
-            Some(rsm.sources_content),
+            rsm.names
+                .into_iter()
+                .map(|n| n.into_boxed_str().into())
+                .collect(),
+            rsm.sources
+                .into_iter()
+                .map(|n| n.into_boxed_str().into())
+                .collect(),
+            Some(
+                rsm.sources_content
+                    .into_iter()
+                    .map(|op_string| op_string.map(|s| s.into_boxed_str().into()))
+                    .collect(),
+            ),
         )
     }
 }
@@ -122,6 +133,7 @@
                     final_token.get_src_col(),
                     replaced_source.as_deref(),
                     final_token.get_name(),
+                    false,
                 );
 
                 // add source centent

crates/mako/src/ast/utils.rs

@@ -2,8 +2,8 @@ use base64::engine::general_purpose;
 use base64::Engine;
 use swc_core::common::{Mark, DUMMY_SP};
 use swc_core::ecma::ast::{
-    CallExpr, Callee, Expr, ExprOrSpread, Ident, Import, Lit, MemberExpr, MemberProp, MetaPropExpr,
-    MetaPropKind, Module, ModuleItem,
+    CallExpr, Callee, Expr, ExprOrSpread, Ident, IdentName, Import, Lit, MemberExpr, MemberProp,
+    MetaPropExpr, MetaPropKind, Module, ModuleItem,
 };
 
 pub fn base64_encode<T: AsRef<[u8]>>(raw: T) -> String {
@@ -72,7 +72,7 @@ pub fn get_call_expr_ident(call_expr: &CallExpr) -> Option<&Ident> {
 }
 
 pub fn is_ident_undefined(ident: &Ident, sym: &str, unresolved_mark: &Mark) -> bool {
-    ident.sym == *sym && ident.span.ctxt.outer() == *unresolved_mark
+    ident.sym == *sym && ident.ctxt.outer() == *unresolved_mark
 }
 
 pub fn get_first_str_arg(call_expr: &CallExpr) -> Option<String> {
@@ -98,7 +98,7 @@ pub fn is_import_meta_url(expr: &Expr) -> bool {
                     ..
                 }),
             prop:
-                MemberProp::Ident(Ident {
+                MemberProp::Ident(IdentName {
                     sym,
                     ..
                 }),
@@ -109,16 +109,16 @@ pub fn is_import_meta_url(expr: &Expr) -> bool {
 
 pub fn id(s: &str) -> Ident {
     Ident {
+        ctxt: Default::default(),
         span: DUMMY_SP,
         sym: s.into(),
         optional: false,
     }
 }
 pub fn member_prop(s: &str) -> MemberProp {
-    MemberProp::Ident(Ident {
+    MemberProp::Ident(IdentName {
         span: DUMMY_SP,
         sym: s.into(),
-        optional: false,
     })
 }
 
@@ -133,6 +133,7 @@ pub fn promise_all(promises: ExprOrSpread) -> Expr {
 pub fn member_call(obj: Expr, member_prop: MemberProp, args: Vec<ExprOrSpread>) -> Expr {
     Expr::Call(CallExpr {
         span: DUMMY_SP,
+        ctxt: Default::default(),
         callee: Callee::Expr(Box::new(Expr::Member(MemberExpr {
             span: DUMMY_SP,
             obj: Box::new(obj),
@@ -146,7 +147,7 @@ pub fn member_call(obj: Expr, member_prop: MemberProp, args: Vec<ExprOrSpread>)
 pub fn require_ensure(source: String) -> Expr {
     member_call(
         Expr::Ident(id("__mako_require__")),
-        MemberProp::Ident(id("ensure")),
+        MemberProp::Ident(id("ensure").into()),
         vec![ExprOrSpread {
             spread: None,
             expr: Box::new(Expr::Lit(Lit::Str(source.into()))),

crates/mako/src/build/load.rs

@@ -133,7 +133,7 @@
                 Err(reason) => {
                     return Err(anyhow!(LoadError::CompileMdError {
                         path: file.path.to_string_lossy().to_string(),
-                        reason,
+                        reason: reason.to_string(),
                     }));
                 }
             };

crates/mako/src/build/transform.rs

@@ -84,13 +84,14 @@ impl Transform {
                             cm.clone(),
                             context.clone(),
                             top_level_mark,
+                            unresolved_mark,
                         )))
                     }
                     // strip should be ts only
                     // since when use this in js, it will remove all unused imports
                     // which is not expected as what webpack does
                     if is_ts {
-                        visitors.push(Box::new(ts_strip(top_level_mark)))
+                        visitors.push(Box::new(ts_strip(unresolved_mark, top_level_mark)));
                     }
                     // named default export
                     if context.args.watch && !file.is_under_node_modules && is_jsx {

crates/mako/src/compiler.rs

@@ -10,6 +10,7 @@ use regex::Regex;
 use swc_core::common::sync::Lrc;
 use swc_core::common::{Globals, SourceMap, DUMMY_SP};
 use swc_core::ecma::ast::Ident;
+use swc_node_comments::SwcComments;
 use tracing::debug;
 
 use crate::ast::comments::Comments;
@@ -174,6 +175,7 @@ impl ScriptMeta {
 
 fn build_ident(ident: &str) -> Ident {
     Ident {
+        ctxt: Default::default(),
         span: DUMMY_SP,
         sym: ident.into(),
         optional: false,
@@ -183,13 +185,15 @@ fn build_ident(ident: &str) -> Ident {
 pub struct CssMeta {
     pub cm: Lrc<SourceMap>,
     pub globals: Globals,
+    pub comments: SwcComments,
 }
 
 impl CssMeta {
     fn new() -> Self {
         Self {
             cm: Default::default(),
             globals: Globals::default(),
+            comments: Default::default(),
         }
     }
 }

crates/mako/src/features/node.rs

@@ -139,10 +139,10 @@
 impl VisitMut for MockFilenameAndDirname {
     fn visit_mut_expr(&mut self, expr: &mut Expr) {
         if let Expr::Ident(ident) = expr
-            && ident.span.ctxt.outer() == self.unresolved_mark
+            && ident.ctxt.outer() == self.unresolved_mark
         {
-            let is_filename = ident.sym.to_string() == "__filename";
-            let is_dirname = ident.sym.to_string() == "__dirname";
+            let is_filename = ident.sym == "__filename";
+            let is_dirname = ident.sym == "__dirname";
             if is_filename || is_dirname {
                 let path = diff_paths(&self.current_path, &self.context.root).unwrap_or("".into());
                 let value = if is_filename {