feat: remove unused swc_core features

svg-rust · Sep 21, 2024 · 0f1ea2e · 0f1ea2e
1 parent 359f5a4
commit 0f1ea2e
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 1,141 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/binding/Cargo.toml b/crates/binding/Cargo.toml
@@ -14,7 +14,6 @@ crate-type = ["cdylib"]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.12.0", default-features = false, features = ["napi4"] }
 napi-derive = { version = "2.12.2" }
-swc_core = { version = "0.100.1", default-features = false, features = ["base_node"] }
 svgr-rs = { path = "../core" }
 
 [build-dependencies]

diff --git a/crates/core/src/add_jsx_attribute.rs b/crates/core/src/add_jsx_attribute.rs
@@ -223,7 +223,7 @@ fn svg_prop_to_attr(key: &str, value: &str) -> Attribute {
 
 #[cfg(test)]
 mod tests {
-  use std::sync::Arc;
+  use std::rc::Rc;
 
   use swc_core::{
     common::{FileName, SourceMap},
@@ -243,7 +243,7 @@ mod tests {
   }
 
   fn code_test(input: &str, opts: Options, expected: &str) {
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let lexer = Lexer::new(

diff --git a/crates/core/src/hast_to_swc_ast/mod.rs b/crates/core/src/hast_to_swc_ast/mod.rs
@@ -248,7 +248,7 @@ pub fn to_swc_ast(hast: swc_xml::ast::Document) -> Option<JSXElement> {
 
 #[cfg(test)]
 mod tests {
-  use std::{borrow::Borrow, path::PathBuf, sync::Arc};
+  use std::{borrow::Borrow, path::PathBuf, rc::Rc};
 
   use swc_core::{
     common::{FileName, SourceFile, SourceMap},
@@ -259,7 +259,7 @@ mod tests {
 
   use super::*;
 
-  fn transform(cm: Arc<SourceMap>, fm: Arc<SourceFile>, minify: bool) -> String {
+  fn transform(cm: Rc<SourceMap>, fm: Rc<SourceFile>, minify: bool) -> String {
     let mut errors = vec![];
     let doc = parse_file_as_document(fm.borrow(), Default::default(), &mut errors).unwrap();
 
@@ -291,7 +291,7 @@ mod tests {
   fn document_test(input: PathBuf) {
     let jsx_path = input.parent().unwrap().join("output.jsx");
 
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.load_file(&input).expect("failed to load fixture file");
 
     let res = transform(cm, fm, false);
@@ -302,7 +302,7 @@ mod tests {
   }
 
   fn code_test(input: &str, expected: &str) {
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let res = transform(cm, fm, true);

diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
@@ -1,7 +1,7 @@
 #![feature(path_file_prefix)]
 #![deny(clippy::all)]
 
-use std::sync::Arc;
+use std::rc::Rc;
 
 use swc_core::{
   common::{comments::SingleThreadedComments, FileName, SourceMap},
@@ -54,7 +54,7 @@ pub use self::core::state::{Caller, Config as State};
 pub fn transform(code: String, config: Config, state: State) -> Result<String, SvgrError> {
   let state = core::state::expand_state(&state);
 
-  let cm = Arc::<SourceMap>::default();
+  let cm = Rc::<SourceMap>::default();
   let fm = cm.new_source_file(FileName::Anon.into(), code);
 
   let mut errors = vec![];

diff --git a/crates/core/src/remove_jsx_attribute.rs b/crates/core/src/remove_jsx_attribute.rs
@@ -51,7 +51,7 @@ impl VisitMut for Visitor {
 
 #[cfg(test)]
 mod tests {
-  use std::{default::Default, sync::Arc};
+  use std::{default::Default, rc::Rc};
 
   use swc_core::{
     common::{FileName, SourceMap},
@@ -71,7 +71,7 @@ mod tests {
   }
 
   fn code_test(input: &str, opts: Options, expected: &str) {
-    let cm = Arc::new(SourceMap::default());
+    let cm = Rc::new(SourceMap::default());
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let lexer = Lexer::new(

diff --git a/crates/core/src/replace_jsx_attribute.rs b/crates/core/src/replace_jsx_attribute.rs
@@ -64,7 +64,7 @@ fn get_attr_value(new: &str) -> JSXAttrValue {
 
 #[cfg(test)]
 mod tests {
-  use std::sync::Arc;
+  use std::rc::Rc;
 
   use swc_core::{
     common::{FileName, SourceMap},
@@ -79,7 +79,7 @@ mod tests {
   use super::*;
 
   fn code_test(input: &str, replace_attr_values: HashMap<String, String>, expected: &str) {
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let lexer = Lexer::new(

diff --git a/crates/core/src/svg_dynamic_title.rs b/crates/core/src/svg_dynamic_title.rs
@@ -219,7 +219,7 @@ impl VisitMut for Visitor {
 
 #[cfg(test)]
 mod tests {
-  use std::sync::Arc;
+  use std::rc::Rc;
 
   use swc_core::{
     common::{FileName, SourceMap},
@@ -234,7 +234,7 @@ mod tests {
   use super::*;
 
   fn code_test(input: &str, tag: String, expected: &str) {
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let lexer = Lexer::new(

diff --git a/crates/core/src/svg_em_dimensions.rs b/crates/core/src/svg_em_dimensions.rs
@@ -132,7 +132,7 @@ fn get_value(raw: Option<&Size>) -> JSXAttrValue {
 
 #[cfg(test)]
 mod tests {
-  use std::{default::Default, sync::Arc};
+  use std::{default::Default, rc::Rc};
 
   use swc_core::{
     common::{FileName, SourceMap},
@@ -152,7 +152,7 @@ mod tests {
   }
 
   fn code_test(input: &str, opts: Options, expected: &str) {
-    let cm = Arc::new(SourceMap::default());
+    let cm = Rc::new(SourceMap::default());
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let lexer = Lexer::new(

diff --git a/crates/core/src/transform_react_native_svg.rs b/crates/core/src/transform_react_native_svg.rs
@@ -250,8 +250,6 @@ impl VisitMut for ImportDeclVisitor {
 
 #[cfg(test)]
 mod tests {
-  use std::sync::Arc;
-
   use swc_core::{
     common::{comments::SingleThreadedComments, FileName, SourceMap},
     ecma::{
@@ -265,7 +263,7 @@ mod tests {
   use super::*;
 
   fn code_test(input: &str, expected: &str) {
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let lexer = Lexer::new(

diff --git a/crates/core/src/transform_svg_component/mod.rs b/crates/core/src/transform_svg_component/mod.rs
@@ -128,7 +128,7 @@ pub fn transform(
 
 #[cfg(test)]
 mod tests {
-  use std::{borrow::Borrow, sync::Arc};
+  use std::rc::Rc;
 
   use swc_core::{
     common::{FileName, SourceMap},
@@ -147,12 +147,12 @@ mod tests {
     state: &core::state::InternalConfig,
     expected: &str,
   ) {
-    let cm = Arc::<SourceMap>::default();
+    let cm = Rc::<SourceMap>::default();
     let fm = cm.new_source_file(FileName::Anon.into(), input.to_string());
 
     let mut recovered_errors = vec![];
     let expr = parser::parse_file_as_expr(
-      fm.borrow(),
+      fm.as_ref(),
       parser::Syntax::Es(parser::EsSyntax {
         jsx: true,
         ..Default::default()

diff --git a/crates/core/src/transform_svg_component/variables.rs b/crates/core/src/transform_svg_component/variables.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Borrow, sync::Arc};
+use std::rc::Rc;
 
 use swc_core::common::SyntaxContext;
 use swc_core::{
@@ -323,12 +323,12 @@ pub fn get_variables(
 
       if let Some(caller) = &state.caller {
         if let Some(previous_export) = caller.previous_export.clone() {
-          let cm = Arc::<SourceMap>::default();
+          let cm = Rc::<SourceMap>::default();
           let fm = cm.new_source_file(FileName::Anon.into(), previous_export);
 
           let mut recovered_errors = vec![];
           let module = parser::parse_file_as_module(
-            fm.borrow(),
+            fm.as_ref(),
             parser::Syntax::Es(parser::EsSyntax {
               jsx: true,
               ..Default::default()