chore: update swc v1 (farm-fe#1836)

* chore: update to swc v1 * chore: swc updated
JobinJia · Oct 20, 2024 · 571b37f · 571b37f
1 parent e49bf71
commit 571b37f
Show file tree

Hide file tree

Showing 72 changed files with 1,312 additions and 953 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/compiler/src/generate/partial_bundling.rs b/crates/compiler/src/generate/partial_bundling.rs
@@ -227,10 +227,7 @@ mod tests {
   fn test_generate_resource_pot_map() {
     let mut module_graph = construct_test_module_graph_complex();
     let module_group_graph = module_group_graph_from_entries(
-      &module_graph
-        .entries
-        .clone().into_keys()
-        .collect(),
+      &module_graph.entries.clone().into_keys().collect(),
       &mut module_graph,
     );
 
@@ -307,10 +304,7 @@ mod tests {
     module_graph.module_mut(&"H".into()).unwrap().external = true;
 
     let module_group_graph = module_group_graph_from_entries(
-      &module_graph
-        .entries
-        .clone().into_keys()
-        .collect(),
+      &module_graph.entries.clone().into_keys().collect(),
       &mut module_graph,
     );
 

diff --git a/crates/compiler/src/update/patch_module_group_graph/tests.rs b/crates/compiler/src/update/patch_module_group_graph/tests.rs
@@ -182,10 +182,7 @@ fn test_patch_module_group_graph_3() {
 
   let updated_modules = vec!["F".into(), "E".into(), "B".into()];
   let mut module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
   let diff_result = diff_module_graph(updated_modules.clone(), &module_graph, &update_module_graph);
@@ -210,10 +207,7 @@ fn test_patch_module_group_graph_3() {
   );
 
   let update_module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
 
@@ -291,10 +285,7 @@ fn test_patch_module_group_graph_css_modules() {
 
   let start_points = vec!["D".into()];
   let mut module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
   let diff_result = diff_module_graph(start_points.clone(), &module_graph, &update_module_graph);
@@ -315,10 +306,7 @@ fn test_patch_module_group_graph_css_modules() {
   assert_eq!(affected_groups, HashSet::from(["D".into(), "B".into()]));
 
   let update_module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
 

diff --git a/crates/compiler/src/update/regenerate_resources/generate_and_diff_resource_pots.rs b/crates/compiler/src/update/regenerate_resources/generate_and_diff_resource_pots.rs
@@ -249,9 +249,7 @@ fn diff_and_patch_resource_pot_map(
             let resource_pot = resource_pot_map
               .remove_resource_pot(resource_pot)
               .unwrap_or_else(|| {
-                panic!(
-                  "The resource pot {resource_pot:?} should be in the resource pot map"
-                )
+                panic!("The resource pot {resource_pot:?} should be in the resource pot map")
               });
 
             // also remove the related resource

diff --git a/...enerate_resources/generate_and_diff_resource_pots/test_generate_and_diff_resource_pots.rs b/...enerate_resources/generate_and_diff_resource_pots/test_generate_and_diff_resource_pots.rs
@@ -42,10 +42,7 @@ fn test_generate_and_diff_resource_pots() {
 
   let updated_modules = vec!["F".into(), "E".into(), "B".into()];
   let mut module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
   let diff_result = diff_module_graph(updated_modules.clone(), &module_graph, &update_module_graph);
@@ -244,10 +241,7 @@ fn test_generate_and_diff_resource_pots_one_module_changed() {
     )
     .unwrap();
   let mut module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
   let updated_modules = vec!["I".into()];

diff --git a/...regenerate_resources/generate_and_diff_resource_pots/test_handle_enforce_resource_pots.rs b/...regenerate_resources/generate_and_diff_resource_pots/test_handle_enforce_resource_pots.rs
@@ -43,10 +43,7 @@ fn test_handle_enforce_resource_pots() {
 
   let updated_modules = vec!["F".into(), "E".into(), "B".into()];
   let mut module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
   let diff_result = diff_module_graph(updated_modules.clone(), &module_graph, &update_module_graph);
@@ -169,10 +166,7 @@ fn test_handle_enforce_resource_pots_one_module_changed() {
     )
     .unwrap();
   let mut module_group_graph = module_group_graph_from_entries(
-    &module_graph
-      .entries
-      .clone().into_keys()
-      .collect(),
+    &module_graph.entries.clone().into_keys().collect(),
     &mut module_graph,
   );
   let updated_modules = vec!["I".into()];

diff --git a/crates/compiler/tests/tree_shake.rs b/crates/compiler/tests/tree_shake.rs
@@ -125,6 +125,7 @@ fn tree_shake_changed_ast() {
           Default::default(),
           Default::default(),
           None as Option<NoopComments>,
+          unresolved_mark,
           top_level_mark,
         ));
         ast.visit_mut_with(&mut react::<NoopComments>(

diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -31,31 +31,30 @@ ptr_meta = "0.1.4"
 thiserror = "1.0"
 rayon = "1.5"
 petgraph = "0.6"
-bytecheck = "0.7.0"
 downcast-rs = "1.2"
 wax = { version = "0.6", default-features = false, features = [
   "miette",
   "walk",
 ] }
 globset = { version = "0.4.14" }
-swc_ecma_ast = { version = "0.115.1", features = ["rkyv-impl", "serde-impl"] }
-swc_ecma_parser = { version = "0.146.12" }
-swc_common = { version = "0.34.4", features = [
+swc_ecma_ast = { version = "1.0.0", features = ["rkyv-impl", "serde-impl"] }
+swc_ecma_parser = { version = "1.0.1" }
+swc_common = { version = "1.0.0", features = [
   "concurrent",
   "sourcemap",
   "rkyv-impl",
 ] }
-swc_css_ast = { version = "0.141.0", features = ["rkyv-impl"] }
-swc_css_prefixer = { version = "0.155.0" }
-swc_html_ast = { version = "0.34.0", features = ["rkyv-impl"] }
-heck = "0.4.1"
-puffin = { version = "0.18.0", features = [
+swc_css_ast = { version = "1.0.0", features = ["rkyv-impl"] }
+swc_css_prefixer = { version = "1.0.0" }
+swc_html_ast = { version = "1.0.0", features = ["rkyv-impl"] }
+heck = "0.5.0"
+puffin = { version = "0.19.1", features = [
   "packing",
   "lz4",
   "serialization",
 ], optional = true }
 regex = "1.7.3"
-enhanced-magic-string = { version = "0.0.15" }
+enhanced-magic-string = { version = "0.1.0" }
 
 [features]
 profile = ["dep:puffin"]
diff --git a/crates/core/src/cache/cache_store.rs b/crates/core/src/cache/cache_store.rs
@@ -9,7 +9,7 @@ use std::{
 
 use crate::config::Mode;
 
-const FARM_CACHE_VERSION: &str = "0.4.9";
+const FARM_CACHE_VERSION: &str = "0.5.0";
 const FARM_CACHE_MANIFEST_FILE: &str = "farm-cache.json";
 
 // TODO make CacheStore a trait and implement DiskCacheStore or RemoteCacheStore or more.

diff --git a/crates/core/src/config/custom.rs b/crates/core/src/config/custom.rs
@@ -28,8 +28,8 @@ pub fn get_config_external_record(config: &Config) -> ExternalConfig {
       return ExternalConfig::new();
     }
 
-    let external: HashMap<String, String> = serde_json::from_str(val)
-      .unwrap_or_else(|_| panic!("failed parse record external {val:?}"));
+    let external: HashMap<String, String> =
+      serde_json::from_str(val).unwrap_or_else(|_| panic!("failed parse record external {val:?}"));
 
     let mut external_config = ExternalConfig::new();
 

diff --git a/crates/core/src/config/mod.rs b/crates/core/src/config/mod.rs
@@ -35,13 +35,6 @@ pub mod tree_shaking;
 
 pub use output::*;
 
-type ResolverFunction = Box<dyn Fn(String, String) -> Option<String>>;
-
-// #[derive(Debug, Clone, Serialize, Deserialize)]
-// pub struct ResolverObject {
-//   resolve: ResolverFunction,
-// }
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
 pub enum AliasItem {
@@ -50,9 +43,6 @@ pub enum AliasItem {
   Complex {
     find: StringOrRegex,
     replacement: String,
-    // TODO custom resolver
-    // #[serde(skip_serializing_if = "Option::is_none")]
-    // custom_resolver: Option<ResolverObject>,
   },
 }
 

diff --git a/crates/core/src/config/persistent_cache.rs b/crates/core/src/config/persistent_cache.rs
@@ -80,13 +80,13 @@ impl PersistentCacheConfig {
         let mut keys: Vec<_> = cloned_obj.envs.keys().collect();
         keys.sort();
         let config_str = keys
-            .into_iter()
-            .map(|k| {
-                let v = cloned_obj.envs.get(k).unwrap();
-                format!("{k}={v}")
-            })
-            .collect::<Vec<_>>()
-            .join("&");
+          .into_iter()
+          .map(|k| {
+            let v = cloned_obj.envs.get(k).unwrap();
+            format!("{k}={v}")
+          })
+          .collect::<Vec<_>>()
+          .join("&");
         let config_hash = sha256(config_str.as_bytes(), 32);
 
         cloned_obj.build_dependencies.push(config_hash);

diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
@@ -24,6 +24,7 @@ pub const VERSION: &str = "0.5.0";
 // re-export common external crates
 pub use dashmap;
 pub use enhanced_magic_string;
+pub use heck;
 pub use parking_lot;
 pub use petgraph;
 #[cfg(feature = "profile")]
@@ -42,7 +43,6 @@ pub use swc_ecma_ast;
 pub use swc_ecma_parser;
 pub use swc_html_ast;
 pub use wax;
-pub use heck;
 
 #[macro_export]
 macro_rules! farm_profile_scope {

diff --git a/crates/create-farm-rs/src/package_manager.rs b/crates/create-farm-rs/src/package_manager.rs
@@ -72,7 +72,7 @@ impl PackageManager {
         Template::Preact,
         Template::Nestjs,
         Template::Tauri(None),
-        Template::Electron(None)
+        Template::Electron(None),
       ],
     }
   }

diff --git a/crates/create-farm-rs/src/utils/colors.rs b/crates/create-farm-rs/src/utils/colors.rs
@@ -40,7 +40,11 @@ pub fn is_color_enabled() -> bool {
   true
 }
 
-pub fn create_formatter<'a>(open: &'a str, close: &'a str, replace: Option<&'a str>) -> impl Fn(&'a str) -> String + 'a {
+pub fn create_formatter<'a>(
+  open: &'a str,
+  close: &'a str,
+  replace: Option<&'a str>,
+) -> impl Fn(&'a str) -> String + 'a {
   move |input| {
     let string = input.to_string();
     let index = string.find(close).unwrap_or(open.len());

diff --git a/crates/create-farm-rs/src/utils/prompts.rs b/crates/create-farm-rs/src/utils/prompts.rs
@@ -25,11 +25,7 @@ pub(crate) fn select<'t, T: Displayable>(
   Ok(items.get(selected))
 }
 
-pub(crate) fn input(
-  prompt: &str,
-  default: Option<&str>,
-  allow_empty: bool,
-) -> Result<String> {
+pub(crate) fn input(prompt: &str, default: Option<&str>, allow_empty: bool) -> Result<String> {
   let theme = ColorfulTheme::default();
   let mut builder = dialoguer::Input::with_theme(&theme)
     .with_prompt(prompt)

diff --git a/crates/node/src/plugin_adapters/js_plugin_adapter/mod.rs b/crates/node/src/plugin_adapters/js_plugin_adapter/mod.rs
@@ -398,19 +398,15 @@ impl Plugin for JsPluginAdapter {
 
 pub fn get_named_property<T: FromNapiValue>(env: &Env, obj: &JsObject, field: &str) -> Result<T> {
   if obj.has_named_property(field).map_err(|e| {
-    CompilationError::NAPIError(format!(
-      "Get field {field} of config object failed. {e:?}"
-    ))
+    CompilationError::NAPIError(format!("Get field {field} of config object failed. {e:?}"))
   })? {
     unsafe {
       T::from_napi_value(
         env.raw(),
         obj
           .get_named_property::<JsUnknown>(field)
           .map_err(|e| {
-            CompilationError::NAPIError(format!(
-              "Get field {field} of config object failed. {e:?}"
-            ))
+            CompilationError::NAPIError(format!("Get field {field} of config object failed. {e:?}"))
           })?
           .raw(),
       )

diff --git a/crates/node/src/plugin_adapters/rust_plugin_adapter/plugin_loader.rs b/crates/node/src/plugin_adapters/rust_plugin_adapter/plugin_loader.rs
@@ -28,7 +28,7 @@ Please upgrade or downgrade the plugin or @farmfe/core to make the versions matc
   plugin core 0.4 -> @farmfe/core < 1.3.0
   plugin core 0.5 -> @farmfe/core >= 1.3.0
 
-If you are plugin author, please build your plugin with rust toolchain `nightly-2024-04-16`\n",
+If you are plugin author, please build your plugin with rust toolchain `nightly-2024-10-07`\n",
       VERSION, core_version, filename
     );
   }

diff --git a/crates/plugin_bundle/src/resource_pot_to_bundle/bundle/mod.rs b/crates/plugin_bundle/src/resource_pot_to_bundle/bundle/mod.rs
@@ -13,7 +13,7 @@ use farmfe_core::{
   module::{module_graph::ModuleGraph, ModuleId, ModuleSystem},
   plugin::ResolveKind,
   rayon::iter::{IntoParallelIterator, ParallelIterator},
-  swc_common::{util::take::Take, DUMMY_SP},
+  swc_common::{util::take::Take, SyntaxContext, DUMMY_SP},
   swc_ecma_ast::{
     self, BindingIdent, CallExpr, ClassDecl, Decl, EmptyStmt, Expr, ExprStmt, FnDecl, Ident,
     Module, ModuleDecl, ModuleItem, Stmt, VarDecl, VarDeclarator,
@@ -606,6 +606,7 @@ impl<'a> ModuleAnalyzerManager<'a> {
                               init: Some(export_default_decl.expr),
                               definite: false,
                             }],
+                            ctxt: SyntaxContext::empty()
                           }))));
                         },
                         _ => {}
@@ -623,7 +624,7 @@ impl<'a> ModuleAnalyzerManager<'a> {
                   if !commonjs_import_executed.contains(source) {
                     ast.body[*index] = ModuleItem::Stmt(Stmt::Expr(
                       ExprStmt { span: DUMMY_SP, expr: Box::new(Expr::Call(
-                        CallExpr { span: DUMMY_SP, callee: swc_ecma_ast::Callee::Expr(Box::new(Expr::Ident(bundle_variable.name(self.module_global_uniq_name.commonjs_name(source).unwrap()).as_str().into()))), args: vec![], type_args: None }
+                        CallExpr { span: DUMMY_SP, callee: swc_ecma_ast::Callee::Expr(Box::new(Expr::Ident(bundle_variable.name(self.module_global_uniq_name.commonjs_name(source).unwrap()).as_str().into()))), args: vec![], type_args: None, ctxt: SyntaxContext::empty() }
                       )) }
                     ));
                     commonjs_import_executed.insert(source.clone());
@@ -721,7 +722,7 @@ impl<'a> ModuleAnalyzerManager<'a> {
             bundle_variable,
             &context.config,
             polyfill,
-            external_config
+            external_config,
           )
         }
 

diff --git a/crates/plugin_bundle/src/resource_pot_to_bundle/defined_idents_collector.rs b/crates/plugin_bundle/src/resource_pot_to_bundle/defined_idents_collector.rs
@@ -3,7 +3,9 @@ use std::collections::{HashMap, HashSet};
 use farmfe_core::{
   swc_common::DUMMY_SP,
   swc_ecma_ast::{
-    AssignExpr, AssignOp, AssignTarget, BindingIdent, Expr, Id, KeyValuePatProp, KeyValueProp, MemberProp, ObjectPat, ObjectPatProp, Pat, Prop, PropName, PropOrSpread, SimpleAssignTarget
+    AssignExpr, AssignOp, AssignTarget, BindingIdent, Expr, Id, IdentName, KeyValuePatProp,
+    KeyValueProp, MemberProp, ObjectPat, ObjectPatProp, Pat, Prop, PropName, PropOrSpread,
+    SimpleAssignTarget,
   },
 };
 use farmfe_toolkit::{
@@ -98,10 +100,9 @@ impl<'a> VisitMut for RenameIdent<'a> {
       Prop::Shorthand(m) => {
         if let Some(new_name) = self.rename(m) {
           *n = Prop::KeyValue(farmfe_core::swc_ecma_ast::KeyValueProp {
-            key: farmfe_core::swc_ecma_ast::PropName::Ident(Ident {
+            key: farmfe_core::swc_ecma_ast::PropName::Ident(IdentName {
               span: DUMMY_SP,
               sym: m.sym.as_str().into(),
-              optional: false,
             }),
             value: Box::new(farmfe_core::swc_ecma_ast::Expr::Ident(
               new_name.as_str().into(),
@@ -123,10 +124,9 @@ impl<'a> VisitMut for RenameIdent<'a> {
         Prop::Shorthand(ident) => {
           if let Some(new_name) = self.rename(ident) {
             *p = Prop::KeyValue(KeyValueProp {
-              key: farmfe_core::swc_ecma_ast::PropName::Ident(Ident {
+              key: farmfe_core::swc_ecma_ast::PropName::Ident(IdentName {
                 span: DUMMY_SP,
                 sym: ident.sym.as_str().into(),
-                optional: false,
               }),
               value: Box::new(farmfe_core::swc_ecma_ast::Expr::Ident(
                 new_name.as_str().into(),