feat/upgrade swc

Cargo.toml

@@ -7,7 +7,7 @@ cached            = "0.46.1"
 mimalloc-rust     = { version = "=0.2.1" }
 serde             = { version = "1.0.171", features = ["derive"] }
 serde_json        = "1.0.100"
-swc_core          = { version = "=0.83.22", default-features = false }
+swc_core          = { version = "0.96.0", default-features = false }
 tikv-jemallocator = { version = "=0.5.4", features = ["disable_initial_exec_tls"] }
 
 [profile.release]

crates/binding/Cargo.toml

@@ -23,6 +23,3 @@ tikv-jemallocator = { workspace = true }
 
 [build-dependencies]
 napi-build = "2.0.1"
-
-[profile.release]
-lto = true

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

@@ -30,6 +30,7 @@ serde_json       = { workspace = true }
 url              = { version = "2.5.0" }
 
 swc_core = { workspace = true, features = [
+  "__common",
   "__ecma",
   "__ecma_plugin_transform",
   "__ecma_transforms",
@@ -67,9 +68,9 @@ swc_core = { workspace = true, features = [
   "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.16"
+swc_error_reporters = "=0.18.1"
+swc_node_comments   = "=0.21.0"
 
 anyhow                = "1.0.71"
 base64                = "0.21.2"
@@ -87,8 +88,7 @@ hyper-staticfile      = "0.9.6"
 hyper-tungstenite     = "0.10.0"
 indexmap              = "2.0.0"
 md5                   = "0.7.0"
-mdxjs                 = "0.1.14"
-merge-source-map      = "1.2.0"
+mdxjs                 = "=0.2.5"
 mime_guess            = "2.0.4"
 notify                = { version = "6.1.1", default-features = false, features = ["macos_kqueue"] }
 notify-debouncer-full = { version = "0.3.1", default-features = false }

crates/mako/src/ast/css_ast.rs

@@ -46,7 +46,10 @@ impl CssAst {
             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;
@@ -51,7 +51,7 @@ impl JsAst {
         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

@@ -1,8 +1,5 @@
-use std::path::PathBuf;
-
-use merge_source_map::sourcemap::SourceMap as MergeSourceMap;
-use merge_source_map::{merge, MergeOptions};
-use pathdiff::diff_paths;
+// use merge_source_map::sourcemap::SourceMap as MergeSourceMap;
+// use merge_source_map::{merge, MergeOptions};
 use swc_core::base::sourcemap;
 use swc_core::common::source_map::SourceMapGenConfig;
 use swc_core::common::sync::Lrc;
@@ -69,34 +66,45 @@ impl From<sourcemap::SourceMap> for RawSourceMap {
 impl From<RawSourceMap> for 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(),
+            ),
         )
     }
 }
-
-pub fn merge_source_map(source_map_chain: Vec<Vec<u8>>, root: PathBuf) -> Vec<u8> {
-    let source_map_chain = source_map_chain
-        .iter()
-        .map(|s| MergeSourceMap::from_slice(s).unwrap())
-        .collect::<Vec<_>>();
-
-    let merged = merge(
-        source_map_chain,
-        MergeOptions {
-            source_replacer: Some(Box::new(move |src| {
-                diff_paths(src, &root)
-                    .unwrap_or(src.into())
-                    .to_string_lossy()
-                    .to_string()
-            })),
-        },
-    );
-
-    let mut buf = vec![];
-    merged.to_writer(&mut buf).unwrap();
-    buf
-}
+//
+// pub fn merge_source_map(source_map_chain: Vec<Vec<u8>>, root: PathBuf) -> Vec<u8> {
+//     let source_map_chain = source_map_chain
+//         .iter()
+//         .map(|s| MergeSourceMap::from_slice(s).unwrap())
+//         .collect::<Vec<_>>();
+//
+//     let merged = merge(
+//         source_map_chain,
+//         MergeOptions {
+//             source_replacer: Some(Box::new(move |src| {
+//                 diff_paths(src, &root)
+//                     .unwrap_or(src.into())
+//                     .to_string_lossy()
+//                     .to_string()
+//             })),
+//         },
+//     );
+//
+//     let mut buf = vec![];
+//     merged.to_writer(&mut buf).unwrap();
+//     buf
+// }

crates/mako/src/build/load.rs

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

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;
@@ -183,13 +184,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

@@ -141,8 +141,8 @@ impl VisitMut for MockFilenameAndDirname {
         if let Expr::Ident(ident) = expr
             && ident.span.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 {

crates/mako/src/generate/chunk_pot/ast_impl.rs

@@ -15,7 +15,7 @@ use swc_core::ecma::ast::{
 use swc_core::ecma::utils::{quote_ident, quote_str, ExprFactory};
 
 use crate::ast::js_ast::JsAst;
-use crate::ast::sourcemap::{build_source_map_to_buf, merge_source_map};
+use crate::ast::sourcemap::build_source_map_to_buf;
 use crate::compiler::Context;
 use crate::config::Mode;
 use crate::generate::chunk::{Chunk, ChunkType};
@@ -97,7 +97,9 @@ pub(crate) fn render_css_chunk(
 
             source_map_chain.push(build_source_map_to_buf(&source_map, cm));
 
-            Some(merge_source_map(source_map_chain, context.root.clone()))
+            // TODO
+            // Some(merge_source_map(source_map_chain, context.root.clone()))
+            source_map_chain.pop()
         }
     };
 

crates/mako/src/generate/chunk_pot/mod.rs

@@ -12,7 +12,7 @@ use swc_core::css::ast::Stylesheet;
 
 use crate::compiler::Context;
 use crate::config::Mode;
-use crate::generate::chunk::{Chunk, ChunkType};
+use crate::generate::chunk::Chunk;
 pub use crate::generate::chunk_pot::util::CHUNK_FILE_NAME_HASH_LENGTH;
 use crate::generate::chunk_pot::util::{hash_hashmap, hash_vec};
 use crate::generate::generate_chunks::ChunkFile;
@@ -22,7 +22,6 @@ use crate::ternary;
 
 pub struct ChunkPot<'a> {
     pub chunk_id: String,
-    pub chunk_type: ChunkType,
     pub js_name: String,
     pub module_map: HashMap<String, (&'a Module, u64)>,
     pub js_hash: u64,
@@ -39,7 +38,6 @@ impl<'cp> ChunkPot<'cp> {
 
         ChunkPot {
             js_name: chunk.filename(),
-            chunk_type: chunk.chunk_type.clone(),
             chunk_id: chunk.id.id.clone(),
             module_map: js_modules.module_map,
             js_hash: js_modules.raw_hash,

crates/mako/src/generate/chunk_pot/str_impl.rs

@@ -218,11 +218,7 @@ fn pot_to_chunk_module_object_string(
     chunk_prefix_offset: u32,
 ) -> Result<(String, RawSourceMap)> {
     let sorted_kv = {
-        let mut sorted_kv = pot
-            .module_map
-            .iter()
-            .map(|(k, v)| (k, v))
-            .collect::<Vec<_>>();
+        let mut sorted_kv = pot.module_map.iter().collect::<Vec<_>>();
 
         sorted_kv.sort_by_key(|(k, _)| *k);
 

crates/mako/src/generate/chunk_pot/util.rs

@@ -123,7 +123,7 @@ where
     K: Hash + Eq + Ord,
     V: Hash,
 {
-    let mut sorted_kv = map.iter().map(|(k, v)| (k, v)).collect::<Vec<_>>();
+    let mut sorted_kv = map.iter().collect::<Vec<_>>();
     sorted_kv.sort_by_key(|(k, _)| *k);
 
     let mut hasher: XxHash64 = Default::default();
@@ -156,11 +156,7 @@ pub(super) fn to_array_lit(elems: Vec<ExprOrSpread>) -> ArrayLit {
 pub(crate) fn pot_to_module_object(pot: &ChunkPot, context: &Arc<Context>) -> Result<ObjectLit> {
     crate::mako_profile_function!();
 
-    let mut sorted_kv = pot
-        .module_map
-        .iter()
-        .map(|(k, v)| (k, v))
-        .collect::<Vec<_>>();
+    let mut sorted_kv = pot.module_map.iter().collect::<Vec<_>>();
     sorted_kv.sort_by_key(|(k, _)| *k);
 
     let mut props = Vec::new();
@@ -240,7 +236,7 @@ pub(crate) fn pot_to_chunk_module(
             }
             .into(),
         )
-        .make_assign_to(AssignOp::Assign, chunk_global_expr.clone().as_pat_or_expr())
+        .make_assign_to(AssignOp::Assign, chunk_global_expr.clone().into())
         .wrap_with_paren()
         .make_member::<Ident>(quote_ident!("push"));
     let chunk_register_stmt = chunk_global_obj

crates/mako/src/generate/mod.rs

@@ -34,14 +34,6 @@ use crate::stats::{write_stats, StatsJsonMap};
 use crate::utils::base64_encode;
 use crate::visitors::async_module::mark_async;
 
-#[derive(Clone)]
-pub struct EmitFile {
-    pub filename: String,
-    pub content: String,
-    pub chunk_id: String,
-    pub hashname: String,
-}
-
 #[derive(Serialize)]
 struct ChunksUrlMap {
     js: HashMap<String, String>,

crates/mako/src/generate/swc_helpers.rs

@@ -1,6 +1,7 @@
 use indexmap::IndexSet;
 
 pub struct SwcHelpers {
+    #[allow(dead_code)]
     pub helpers: IndexSet<String>,
 }
 

crates/mako/src/generate/transform.rs

@@ -218,7 +218,6 @@ pub fn transform_js_generate(transform_js_param: TransformJsParam) -> Result<()>
                             to_replace: dep_map,
                             context,
                             unresolved_mark,
-                            top_level_mark,
                         };
                         ast.ast.visit_mut_with(&mut dep_replacer);
 
@@ -328,7 +327,7 @@ mod tests {
     }
 
     fn transform_css_code(content: &str, path: Option<&str>) -> String {
-        let path = if let Some(p) = path { p } else { "test.css" };
+        let path = path.unwrap_or("test.css");
         let context: Arc<Context> = Arc::new(Default::default());
         let mut ast = CssAst::build(path, content, context.clone(), false).unwrap();
         transform_css_generate(&mut ast.ast, &context);

crates/mako/src/lib.rs

@@ -1,7 +1,6 @@
 #![feature(box_patterns)]
 #![feature(hasher_prefixfree_extras)]
 #![feature(let_chains)]
-#![feature(result_option_inspect)]
 
 pub mod ast;
 mod build;

crates/mako/src/main.rs

@@ -1,6 +1,5 @@
 #![feature(box_patterns)]
 #![feature(let_chains)]
-#![feature(result_option_inspect)]
 
 use std::sync::Arc;
 

crates/mako/src/plugins/bundless_compiler.rs

@@ -235,7 +235,6 @@ fn transform_js_generate(
                                 to_replace: dep_map,
                                 context,
                                 unresolved_mark: ast.unresolved_mark,
-                                top_level_mark: ast.top_level_mark,
                             };
                             ast.ast.visit_mut_with(&mut dep_replacer);
 

crates/mako/src/plugins/context_module.rs

@@ -203,8 +203,7 @@ fn try_replace_context_arg(
         // handle `(...)`
         Expr::Paren(ParenExpr {
             expr: paren_expr, ..
-        }) => try_replace_context_arg(paren_expr, has_visit_top_bin)
-            .map(|(prefix, suffix)| (prefix, suffix)),
+        }) => try_replace_context_arg(paren_expr, has_visit_top_bin),
 
         // handle `'./foo/' + bar`
         Expr::Bin(BinExpr {