fix(styled-jsx): Allow importing styled from styled-components (#225

) Closes #224
swc-project · Oct 30, 2023 · 9cf7bb9 · 9cf7bb9
1 parent dc992bb
commit 9cf7bb9
Show file tree

Hide file tree

Showing 27 changed files with 80 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/constify/package.json b/packages/constify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-constify",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "SWC plugin for optimization",
   "main": "swc_plugin_constify.wasm",
   "scripts": {

diff --git a/packages/constify/transform/Cargo.toml b/packages/constify/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_constify"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.19.0"
+version = "0.20.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/emotion/package.json b/packages/emotion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-emotion",
-  "version": "2.5.94",
+  "version": "2.5.95",
   "description": "SWC plugin for emotion css-in-js library",
   "main": "swc_plugin_emotion.wasm",
   "scripts": {

diff --git a/packages/emotion/transform/Cargo.toml b/packages/emotion/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_emotion"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.55.0"
+version = "0.56.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/jest/package.json b/packages/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-jest",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for jest",
   "main": "swc_plugin_jest.wasm",
   "scripts": {

diff --git a/packages/loadable-components/package.json b/packages/loadable-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-loadable-components",
-  "version": "0.3.94",
+  "version": "0.3.95",
   "description": "SWC plugin for `@loadable/components`",
   "main": "swc_plugin_loadable_components.wasm",
   "scripts": {

diff --git a/packages/noop/package.json b/packages/noop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-noop",
-  "version": "1.5.92",
+  "version": "1.5.93",
   "description": "Noop SWC plugin, for debugging",
   "main": "swc_plugin_noop.wasm",
   "scripts": {

diff --git a/packages/react-remove-properties/package.json b/packages/react-remove-properties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-react-remove-properties",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for https://www.npmjs.com/package/babel-plugin-react-remove-properties",
   "main": "swc_plugin_react_remove_properties.wasm",
   "scripts": {

diff --git a/packages/react-remove-properties/transform/Cargo.toml b/packages/react-remove-properties/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "react_remove_properties"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.7.0"
+version = "0.8.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/relay/package.json b/packages/relay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-relay",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for relay",
   "main": "swc_plugin_relay.wasm",
   "types": "./types.d.ts",

diff --git a/packages/relay/transform/Cargo.toml b/packages/relay/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "swc_relay"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.27.0"
+version = "0.28.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/remove-console/package.json b/packages/remove-console/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-remove-console",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for https://www.npmjs.com/package/babel-plugin-remove-console",
   "main": "swc_plugin_remove_console.wasm",
   "scripts": {

diff --git a/packages/remove-console/transform/Cargo.toml b/packages/remove-console/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "remove_console"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.8.0"
+version = "0.9.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/styled-components/package.json b/packages/styled-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-styled-components",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for styled-components",
   "main": "swc_plugin_styled_components.wasm",
   "scripts": {

diff --git a/packages/styled-components/transform/Cargo.toml b/packages/styled-components/transform/Cargo.toml
@@ -6,7 +6,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0"
 name = "styled_components"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.79.0"
+version = "0.80.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/styled-components/transform/src/utils/analyzer.rs b/packages/styled-components/transform/src/utils/analyzer.rs
@@ -93,8 +93,6 @@ impl Visit for Analyzer<'_> {
     }
 
     fn visit_import_decl(&mut self, i: &ImportDecl) {
-        let is_custom = !self.config.top_level_import_paths.is_empty();
-
         let is_styled = if self.config.top_level_import_paths.is_empty() {
             &*i.src.value == "styled-components" || i.src.value.starts_with("styled-components/")
         } else {
@@ -105,15 +103,14 @@ impl Visit for Analyzer<'_> {
             for s in &i.specifiers {
                 match s {
                     ImportSpecifier::Named(s) => {
-                        if is_custom
-                            && s.imported
-                                .as_ref()
-                                .map(|v| match v {
-                                    ModuleExportName::Ident(v) => &*v.sym,
-                                    ModuleExportName::Str(v) => &*v.value,
-                                })
-                                .unwrap_or(&*s.local.sym)
-                                == "styled"
+                        if s.imported
+                            .as_ref()
+                            .map(|v| match v {
+                                ModuleExportName::Ident(v) => &*v.sym,
+                                ModuleExportName::Str(v) => &*v.value,
+                            })
+                            .unwrap_or(&*s.local.sym)
+                            == "styled"
                         {
                             self.state.imported_local_name = Some(s.local.to_id());
                         }

diff --git a/packages/styled-components/transform/tests/fixtures/issue-224/code.js b/packages/styled-components/transform/tests/fixtures/issue-224/code.js
@@ -0,0 +1,11 @@
+import { styled } from 'styled-components';
+
+
+const Test = styled.div`
+  width: 100%;
+`
+const Test2 = true ? styled.div`` : styled.div``
+const styles = { One: styled.div`` }
+let Component
+Component = styled.div``
+const WrappedComponent = styled(Inner)``
diff --git a/packages/styled-components/transform/tests/fixtures/issue-224/config.json b/packages/styled-components/transform/tests/fixtures/issue-224/config.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/styled-components/transform/tests/fixtures/issue-224/output.js b/packages/styled-components/transform/tests/fixtures/issue-224/output.js
@@ -0,0 +1,29 @@
+import { styled } from 'styled-components';
+const Test = styled.div.withConfig({
+    displayName: "code__Test",
+    componentId: "sc-8043c6cb-0"
+})`
+  width: 100%;
+`;
+const Test2 = true ? styled.div.withConfig({
+    displayName: "code__Test2",
+    componentId: "sc-8043c6cb-1"
+})`` : styled.div.withConfig({
+    displayName: "code__Test2",
+    componentId: "sc-8043c6cb-2"
+})``;
+const styles = {
+    One: styled.div.withConfig({
+        displayName: "code__One",
+        componentId: "sc-8043c6cb-3"
+    })``
+};
+let Component;
+Component = styled.div.withConfig({
+    displayName: "code__Component",
+    componentId: "sc-8043c6cb-4"
+})``;
+const WrappedComponent = styled(Inner).withConfig({
+    displayName: "code__WrappedComponent",
+    componentId: "sc-8043c6cb-5"
+})``;
diff --git a/packages/styled-jsx/package.json b/packages/styled-jsx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-styled-jsx",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for styled-jsx",
   "main": "swc_plugin_styled_jsx.wasm",
   "scripts": {

diff --git a/packages/styled-jsx/transform/Cargo.toml b/packages/styled-jsx/transform/Cargo.toml
@@ -4,7 +4,7 @@ description = "AST transforms visitor for styled-jsx"
 edition = "2021"
 license = "Apache-2.0"
 name = "styled_jsx"
-version = "0.56.0"
+version = "0.57.0"
 
 [features]
 custom_transform = ["swc_common/concurrent"]

diff --git a/packages/swc-magic/package.json b/packages/swc-magic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-swc-magic",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for swc-magic",
   "main": "swc_plugin_swc_magic.wasm",
   "scripts": {

diff --git a/packages/swc-magic/transform/Cargo.toml b/packages/swc-magic/transform/Cargo.toml
@@ -4,7 +4,7 @@ description = "AST transforms visitor for swc-magic"
 edition = "2021"
 license = "Apache-2.0"
 name = "swc_magic"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies]
 serde = { version = "1.0.189", features = ["derive"] }

diff --git a/packages/transform-imports/package.json b/packages/transform-imports/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-transform-imports",
-  "version": "1.5.94",
+  "version": "1.5.95",
   "description": "SWC plugin for https://www.npmjs.com/package/babel-plugin-transform-imports",
   "main": "swc_plugin_transform_imports.wasm",
   "scripts": {

diff --git a/packages/transform-imports/transform/Cargo.toml b/packages/transform-imports/transform/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "modularize_imports"
 repository = "https://github.com/swc-project/plugins.git"
-version = "0.52.0"
+version = "0.53.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -2,6 +2,7 @@
 name = "xtask"
 version = "0.2.0"
 edition = "2021"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html