Updagte

swc-project · Jul 18, 2024 · 0b19c48 · 0b19c48
1 parent 1e75293
commit 0b19c48
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/emotion/transform/src/lib.rs b/packages/emotion/transform/src/lib.rs
@@ -15,10 +15,10 @@ use swc_atoms::JsWord;
 use swc_common::{comments::Comments, util::take::Take, BytePos, SourceMapperDyn, DUMMY_SP};
 use swc_ecma_ast::{
     ArrayLit, CallExpr, Callee, ClassDecl, ClassMethod, ClassProp, Expr, ExprOrSpread, FnDecl, Id,
-    Ident, ImportDecl, ImportSpecifier, JSXAttr, JSXAttrName, JSXAttrOrSpread, JSXAttrValue,
-    JSXElement, JSXElementName, JSXExpr, JSXExprContainer, JSXObject, KeyValueProp, MemberProp,
-    MethodProp, ModuleExportName, ObjectLit, Pat, Prop, PropName, PropOrSpread, SourceMapperExt,
-    SpreadElement, Tpl, VarDeclarator,
+    Ident, IdentName, ImportDecl, ImportSpecifier, JSXAttr, JSXAttrName, JSXAttrOrSpread,
+    JSXAttrValue, JSXElement, JSXElementName, JSXExpr, JSXExprContainer, JSXObject, KeyValueProp,
+    MemberProp, MethodProp, ModuleExportName, ObjectLit, Pat, Prop, PropName, PropOrSpread,
+    SourceMapperExt, SpreadElement, Tpl, VarDeclarator,
 };
 use swc_ecma_utils::ExprFactory;
 use swc_ecma_visit::{Fold, FoldWith};
@@ -350,7 +350,7 @@ impl<C: Comments> EmotionTransformer<C> {
         );
         self.emotion_target_class_name_count += 1;
         PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp {
-            key: PropName::Ident(Ident::new(key.into(), DUMMY_SP)),
+            key: PropName::Ident(IdentName::new(key.into(), DUMMY_SP)),
             value: stable_class_name.into(),
         })))
     }
@@ -494,7 +494,7 @@ impl<C: Comments> Fold for EmotionTransformer<C> {
                                     if self.options.auto_label.unwrap_or(false) {
                                         args_props.push(PropOrSpread::Prop(Box::new(
                                             Prop::KeyValue(KeyValueProp {
-                                                key: PropName::Ident(Ident::new(
+                                                key: PropName::Ident(IdentName::new(
                                                     "label".into(),
                                                     DUMMY_SP,
                                                 )),
@@ -563,7 +563,7 @@ impl<C: Comments> Fold for EmotionTransformer<C> {
                                             if self.options.auto_label.unwrap_or(false) {
                                                 args_props.push(PropOrSpread::Prop(Box::new(
                                                     Prop::KeyValue(KeyValueProp {
-                                                        key: PropName::Ident(Ident::new(
+                                                        key: PropName::Ident(IdentName::new(
                                                             "label".into(),
                                                             DUMMY_SP,
                                                         )),
@@ -585,14 +585,14 @@ impl<C: Comments> Fold for EmotionTransformer<C> {
                                         }
                                         return CallExpr {
                                             span: expr.span,
-                                            type_args: expr.type_args,
                                             args: expr.args,
                                             callee: CallExpr {
                                                 span: DUMMY_SP,
                                                 type_args: None,
-                                                callee: Ident::new(i.sym.clone(), i.span)
+                                                callee: Ident::new(i.sym.clone(), i.span, i.ctxt)
                                                     .as_callee(),
                                                 args,
+                                                ..Default::default()
                                             }
                                             .as_callee(),
                                         };

diff --git a/packages/styled-components/transform/src/utils/mod.rs b/packages/styled-components/transform/src/utils/mod.rs
@@ -21,7 +21,7 @@ pub(crate) fn get_prop_key_as_expr(p: &Prop) -> Cow<Expr> {
 
 pub(crate) fn prop_name_to_expr(p: &PropName) -> Cow<Expr> {
     match p {
-        PropName::Ident(p) => Cow::Owned(Expr::Ident(p.clone())),
+        PropName::Ident(p) => Cow::Owned(Expr::Ident(p.clone().into())),
         PropName::Str(p) => Cow::Owned(Expr::Lit(Lit::Str(p.clone()))),
         PropName::Num(p) => Cow::Owned(Expr::Lit(Lit::Num(p.clone()))),
         PropName::BigInt(p) => Cow::Owned(Expr::Lit(Lit::BigInt(p.clone()))),
@@ -42,9 +42,9 @@ pub(crate) fn get_prop_name(p: &Prop) -> Option<&PropName> {
 
 pub(crate) fn get_prop_name2(p: &Prop) -> PropName {
     match p {
-        Prop::Shorthand(ident) => PropName::Ident(ident.clone()),
+        Prop::Shorthand(ident) => PropName::Ident(ident.clone().into()),
         Prop::KeyValue(p) => p.key.clone(),
-        Prop::Assign(x) => PropName::Ident(x.key.clone()),
+        Prop::Assign(x) => PropName::Ident(x.key.clone().into()),
         Prop::Getter(p) => p.key.clone(),
         Prop::Setter(p) => p.key.clone(),
         Prop::Method(p) => p.key.clone(),