@swc/plugin-styled-jsx 1.5.6 → 1.5.8

package/Cargo.toml

@@ -1,23 +1,22 @@
 [package]
 authors = ["강동윤 <kdy1997.dev@gmail.com>"]
-description = "SWC plugin for styled-jsx"
+description = "SWC Plugin for styled-jsx"
 edition = "2021"
 license = "Apache-2.0"
 name = "swc_plugin_styled_jsx"
-version = "0.6.0"
+version = "0.8.0"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
-plugin = ["swc_core/plugin_transform"]
 custom_transform = ["swc_core/common_concurrent"]
 
 [dependencies]
 easy-error = "1.0.0"
 tracing = "0.1.32"
 
-swc_core = { version = "0.34.1", features = [
+swc_core = {version = "0.38.1", features = [
   "common",
   "ecma_ast",
   "css_ast",
@@ -28,11 +27,13 @@ swc_core = { version = "0.34.1", features = [
   "ecma_parser",
   "ecma_minifier",
   "ecma_utils",
-  "ecma_visit"
-] }
+  "ecma_visit",
+]}
+
+styled_jsx = {version = "0.23.0", path = "./transform"}
 
 [dev-dependencies]
-testing = "0.31.5"
-swc_core = { features = [
-  "testing_transform"
-], version = "0.34.1" }
+swc_core = {features = [
+  "testing_transform",
+], version = "0.38.1"}
+testing = "0.31.8"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-styled-jsx",
-  "version": "1.5.6",
+  "version": "1.5.8",
   "description": "SWC plugin for styled-jsx",
   "main": "swc_plugin_styled_jsx.wasm",
   "scripts": {

package/src/lib.rs

@@ -1,23 +1,17 @@
+#![allow(clippy::not_unsafe_ptr_arg_deref)]
 #![feature(box_patterns)]
-#[cfg(feature = "plugin")]
+
+use styled_jsx::visitor;
 use swc_core::{
     common::{sync::Lrc, FileName, SourceMap},
     ecma::{ast::Program, visit::FoldWith},
     plugin::{plugin_transform, proxies::TransformPluginProgramMetadata},
 };
 
-pub mod style;
-mod transform_css;
-mod utils;
-pub mod visitor;
-
-#[cfg(feature = "plugin")]
 #[plugin_transform]
 fn styled_jsx_plugin(program: Program, _: TransformPluginProgramMetadata) -> Program {
     // TODO(kdy1): This is wrong, but it does not use cm
     let cm = Lrc::new(SourceMap::default());
 
-    let program = program.fold_with(&mut visitor::styled_jsx(cm, FileName::Anon));
-
-    program
+    program.fold_with(&mut visitor::styled_jsx(cm, FileName::Anon))
 }

package/transform/Cargo.toml

@@ -0,0 +1,34 @@
+[package]
+authors = ["강동윤 <kdy1997.dev@gmail.com>"]
+description = "AST transforms visitor for styled-jsx"
+edition = "2021"
+license = "Apache-2.0"
+name = "styled_jsx"
+version = "0.23.0"
+
+[features]
+custom_transform = ["swc_core/common_concurrent"]
+
+[dependencies]
+easy-error = "1.0.0"
+tracing = "0.1.32"
+
+swc_core = { version = "0.38.1", features = [
+  "common",
+  "ecma_ast",
+  "css_ast",
+  "css_codegen",
+  "css_parser",
+  "css_prefixer",
+  "css_visit",
+  "ecma_parser",
+  "ecma_minifier",
+  "ecma_utils",
+  "ecma_visit"
+] }
+
+[dev-dependencies]
+testing = "0.31.8"
+swc_core = { features = [
+  "testing_transform"
+], version = "0.38.1" }

package/transform/src/lib.rs

@@ -0,0 +1,5 @@
+#![feature(box_patterns)]
+pub mod style;
+mod transform_css;
+mod utils;
+pub mod visitor;

package/{src → transform/src}/transform_css.rs

@@ -12,7 +12,10 @@ use swc_core::{
             writer::basic::{BasicCssWriter, BasicCssWriterConfig},
             CodeGenerator, CodegenConfig, Emit,
         },
-        parser::{parse_str, parse_tokens, parser::ParserConfig},
+        parser::{
+            parse_str, parse_tokens,
+            parser::{input::Tokens, ParserConfig},
+        },
         prefixer::prefixer,
         visit::{VisitMut, VisitMutWith},
     },
@@ -42,6 +45,7 @@ pub fn transform_css(
         style_info.css_span.hi,
         ParserConfig {
             allow_wrong_line_comments: true,
+            ..Default::default()
         },
         // We ignore errors because we inject placeholders for expressions which is
         // not a valid css.
@@ -234,6 +238,7 @@ impl Namespacer {
                             PseudoClassSelectorChildren::ForgivingRelativeSelectorList(v) => {
                                 to_tokens(v).tokens
                             }
+                            PseudoClassSelectorChildren::ComplexSelector(v) => to_tokens(v).tokens,
                         })
                         .collect::<Vec<_>>();
 
@@ -286,6 +291,7 @@ impl Namespacer {
                         &args,
                         ParserConfig {
                             allow_wrong_line_comments: true,
+                            ..Default::default()
                         },
                         // TODO(kdy1): We might be able to report syntax errors.
                         &mut vec![],
@@ -523,6 +529,7 @@ where
         StringInput::new(&s, span.lo, span.hi),
         ParserConfig {
             allow_wrong_line_comments: true,
+            ..Default::default()
         },
     );
 

package/{tests → transform/tests}/fixture.rs

@@ -1,5 +1,6 @@
 use std::path::PathBuf;
 
+use styled_jsx::visitor::styled_jsx;
 use swc_core::{
     common::{chain, FileName, Mark, Span, DUMMY_SP},
     ecma::{
@@ -10,7 +11,6 @@ use swc_core::{
         },
     },
 };
-use swc_plugin_styled_jsx::visitor::styled_jsx;
 use testing::fixture;
 
 fn syntax() -> Syntax {