Merge pull request #2 from patricklx/content-tag

do not flatten ContentTagMember attrs
embroider-build · Dec 12, 2023 · add537f · add537f
2 parents ac6123f + a74ccdd
commit add537f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/crates/swc_ecma_ast/src/class.rs b/crates/swc_ecma_ast/src/class.rs
@@ -64,16 +64,13 @@ impl Take for Class {
 pub struct ContentTagMember {
     pub span: Span,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub opening: Box<ContentTagStart>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub contents: Box<ContentTagContent>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub closing: Box<ContentTagEnd>,
 }
 

diff --git a/crates/swc_ecma_ast/src/expr.rs b/crates/swc_ecma_ast/src/expr.rs
@@ -527,16 +527,13 @@ pub struct FnExpr {
 pub struct ContentTagExpression {
     pub span: Span,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub opening: Box<ContentTagStart>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub contents: Box<ContentTagContent>,
 
-    #[cfg_attr(feature = "serde-impl", serde(flatten))]
-    #[span]
+    #[cfg_attr(feature = "serde-impl", serde())]
     pub closing: Box<ContentTagEnd>,
 }