From 4074a7af28a9c259c979b2efb2ded6909490c124 Mon Sep 17 00:00:00 2001 From: Cong-Cong Date: Fri, 20 Sep 2024 18:59:59 +0800 Subject: [PATCH] chore: revert rc to arc --- crates/binding/Cargo.toml | 2 +- crates/core/src/add_jsx_attribute.rs | 2 +- crates/core/src/hast_to_swc_ast/mod.rs | 2 +- crates/core/src/lib.rs | 2 +- crates/core/src/remove_jsx_attribute.rs | 2 +- crates/core/src/replace_jsx_attribute.rs | 2 +- crates/core/src/svg_dynamic_title.rs | 2 +- crates/core/src/svg_em_dimensions.rs | 2 +- crates/core/src/transform_react_native_svg.rs | 33 ++++++++++--------- .../core/src/transform_svg_component/mod.rs | 2 +- 10 files changed, 27 insertions(+), 24 deletions(-) diff --git a/crates/binding/Cargo.toml b/crates/binding/Cargo.toml index 3f9add9..a188794 100644 --- a/crates/binding/Cargo.toml +++ b/crates/binding/Cargo.toml @@ -14,7 +14,7 @@ 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", "async"] } napi-derive = { version = "2.12.2" } -swc_core = { version = "0.100.1", features = ["base_node"] } +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 index ef6413f..0cdb1f3 100644 --- a/crates/core/src/add_jsx_attribute.rs +++ b/crates/core/src/add_jsx_attribute.rs @@ -222,7 +222,7 @@ fn svg_prop_to_attr(key: &str, value: &str) -> Attribute { #[cfg(test)] mod tests { - use std::rc::Arc; + use std::sync::Arc; use swc_core::{ common::{FileName, SourceMap}, diff --git a/crates/core/src/hast_to_swc_ast/mod.rs b/crates/core/src/hast_to_swc_ast/mod.rs index c2d8b1b..a19f31b 100644 --- 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 { #[cfg(test)] mod tests { - use std::{borrow::Borrow, path::PathBuf, rc::Arc}; + use std::{borrow::Borrow, path::PathBuf, sync::Arc}; use swc_core::{ common::{FileName, SourceFile, SourceMap}, diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index 0382068..4379e3c 100644 --- 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::sync::Arc; use swc_core::{ common::{comments::SingleThreadedComments, FileName, SourceMap}, diff --git a/crates/core/src/remove_jsx_attribute.rs b/crates/core/src/remove_jsx_attribute.rs index ea2fee6..f98f494 100644 --- 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, rc::Arc}; + use std::{default::Default, sync::Arc}; use swc_core::{ common::{FileName, SourceMap}, diff --git a/crates/core/src/replace_jsx_attribute.rs b/crates/core/src/replace_jsx_attribute.rs index c48a488..7979083 100644 --- a/crates/core/src/replace_jsx_attribute.rs +++ b/crates/core/src/replace_jsx_attribute.rs @@ -63,7 +63,7 @@ fn get_attr_value(new: &str) -> JSXAttrValue { #[cfg(test)] mod tests { - use std::rc::Arc; + use std::sync::Arc; use swc_core::{ common::{FileName, SourceMap}, diff --git a/crates/core/src/svg_dynamic_title.rs b/crates/core/src/svg_dynamic_title.rs index d332485..11971e4 100644 --- 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::rc::Arc; + use std::sync::Arc; use swc_core::{ common::{FileName, SourceMap}, diff --git a/crates/core/src/svg_em_dimensions.rs b/crates/core/src/svg_em_dimensions.rs index 042e61e..ba9101e 100644 --- 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, rc::Arc}; + use std::{default::Default, sync::Arc}; use swc_core::{ common::{FileName, SourceMap}, diff --git a/crates/core/src/transform_react_native_svg.rs b/crates/core/src/transform_react_native_svg.rs index 468611d..cfa152c 100644 --- a/crates/core/src/transform_react_native_svg.rs +++ b/crates/core/src/transform_react_native_svg.rs @@ -1,4 +1,5 @@ -use std::{cell::RefCell, collections::HashMap, sync::Arc}; +use std::rc::Rc; +use std::{cell::RefCell, collections::HashMap}; use linked_hash_set::LinkedHashSet; use swc_core::common::SyntaxContext; @@ -15,16 +16,16 @@ use swc_core::{ }; pub struct Visitor<'a> { - replaced_components: Arc>>, - unsupported_components: Arc>>, + replaced_components: Rc>>, + unsupported_components: Rc>>, comments: &'a dyn Comments, } impl<'a> Visitor<'a> { pub fn new(comments: &'a dyn Comments) -> Self { Visitor { - replaced_components: Arc::new(RefCell::new(LinkedHashSet::new())), - unsupported_components: Arc::new(RefCell::new(LinkedHashSet::new())), + replaced_components: Rc::new(RefCell::new(LinkedHashSet::new())), + unsupported_components: Rc::new(RefCell::new(LinkedHashSet::new())), comments, } } @@ -66,14 +67,14 @@ impl VisitMut for Visitor<'_> { } struct SvgElementVisitor { - replaced_components: Arc>>, - unsupported_components: Arc>>, + replaced_components: Rc>>, + unsupported_components: Rc>>, } impl SvgElementVisitor { fn new( - replaced_components: Arc>>, - unsupported_components: Arc>>, + replaced_components: Rc>>, + unsupported_components: Rc>>, ) -> Self { SvgElementVisitor { replaced_components, @@ -105,14 +106,14 @@ impl VisitMut for SvgElementVisitor { struct JSXElementVisitor { element_to_component: HashMap<&'static str, &'static str>, - replaced_components: Arc>>, - unsupported_components: Arc>>, + replaced_components: Rc>>, + unsupported_components: Rc>>, } impl JSXElementVisitor { fn new( - replaced_components: Arc>>, - unsupported_components: Arc>>, + replaced_components: Rc>>, + unsupported_components: Rc>>, ) -> Self { JSXElementVisitor { element_to_component: get_element_to_component(), @@ -191,12 +192,12 @@ fn get_element_to_component() -> HashMap<&'static str, &'static str> { } struct ImportDeclVisitor { - replaced_components: Arc>>, + replaced_components: Rc>>, import_decl_span: Option, } impl ImportDeclVisitor { - fn new(replaced_components: Arc>>) -> Self { + fn new(replaced_components: Rc>>) -> Self { ImportDeclVisitor { replaced_components, import_decl_span: None, @@ -249,6 +250,8 @@ impl VisitMut for ImportDeclVisitor { #[cfg(test)] mod tests { + use std::sync::Arc; + use swc_core::{ common::{comments::SingleThreadedComments, FileName, SourceMap}, ecma::{ diff --git a/crates/core/src/transform_svg_component/mod.rs b/crates/core/src/transform_svg_component/mod.rs index 3e105f3..0381be3 100644 --- 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, rc::Arc}; + use std::{borrow::Borrow, sync::Arc}; use swc_core::{ common::{FileName, SourceMap},