fix(transform-imports): FIx default behavior (#332)

Inverts #324 as it caused some problems for next.js
swc-project · Jul 11, 2024 · c34b259 · c34b259
1 parent 07b6c5a
commit c34b259
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/emotion/transform/src/lib.rs b/packages/emotion/transform/src/lib.rs
@@ -219,8 +219,8 @@ impl<C: Comments> EmotionTransformer<C> {
                 .and_then(|s| {
                     s.rfind('\\')
                         .map(|pos| &s[pos + 1..]) // if backslashes are found, take the last part
-                        .or(Some(s))              // otherwise use the whole path
-                    })
+                        .or(Some(s)) // otherwise use the whole path
+                })
                 .map(|s| s.to_owned()),
             cm,
             comments,

diff --git a/packages/transform-imports/CHANGELOG.md b/packages/transform-imports/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @swc/plugin-transform-imports
 
+## 2.0.9
+
+### Patch Changes
+
+- f39705a: Disable default/namespace import handling by default
+
 ## 2.0.8
 
 ### Patch Changes

diff --git a/packages/transform-imports/README.md b/packages/transform-imports/README.md
@@ -18,6 +18,12 @@
 
 # @swc/plugin-transform-imports
 
+## 2.0.9
+
+### Patch Changes
+
+- f39705a: Disable default/namespace import handling by default
+
 ## 2.0.8
 
 ### Patch Changes

diff --git a/packages/transform-imports/package.json b/packages/transform-imports/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-transform-imports",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "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
@@ -11,7 +11,7 @@ homepage     = { workspace = true }
 license      = { workspace = true }
 repository   = { workspace = true }
 rust-version = { workspace = true }
-version      = "0.68.18"
+version      = "0.68.19"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/packages/transform-imports/transform/src/lib.rs b/packages/transform-imports/transform/src/lib.rs
@@ -26,6 +26,10 @@ pub struct PackageConfig {
     #[serde(default)]
     pub prevent_full_import: bool,
     #[serde(default)]
+    pub handle_default_import: bool,
+    #[serde(default)]
+    pub handle_namespace_import: bool,
+    #[serde(default)]
     pub skip_default_conversion: bool,
 }
 
@@ -185,7 +189,7 @@ impl<'a> Rewriter<'a> {
                         with: None,
                     });
                 }
-                ExportSpecifier::Namespace(ns_spec) if !self.config.prevent_full_import => {
+                ExportSpecifier::Namespace(ns_spec) if self.config.handle_namespace_import => {
                     let name_str = match &ns_spec.name {
                         ModuleExportName::Ident(x) => x.as_ref(),
                         ModuleExportName::Str(x) => x.value.as_ref(),
@@ -253,7 +257,7 @@ impl<'a> Rewriter<'a> {
                         phase: Default::default(),
                     });
                 }
-                ImportSpecifier::Namespace(ns_spec) if !self.config.prevent_full_import => {
+                ImportSpecifier::Namespace(ns_spec) if self.config.handle_namespace_import => {
                     let name_str = ns_spec.local.as_ref();
                     let new_path = self.new_path(Some(name_str));
                     let specifier = ImportSpecifier::Namespace(ns_spec.clone());
@@ -266,7 +270,7 @@ impl<'a> Rewriter<'a> {
                         phase: Default::default(),
                     });
                 }
-                ImportSpecifier::Default(def_spec) if !self.config.prevent_full_import => {
+                ImportSpecifier::Default(def_spec) if self.config.handle_default_import => {
                     let name_str = def_spec.local.as_ref();
                     let new_path = self.new_path(Some(name_str));
                     let specifier = ImportSpecifier::Default(def_spec.clone());

diff --git a/packages/transform-imports/transform/tests/fixture.rs b/packages/transform-imports/transform/tests/fixture.rs
@@ -26,6 +26,8 @@ fn modularize_imports_fixture(input: PathBuf) {
                             transform: "react-bootstrap/lib/{{member}}".into(),
                             prevent_full_import: false,
                             skip_default_conversion: false,
+                            handle_default_import: true,
+                            handle_namespace_import: true,
                         },
                     ),
                     (
@@ -34,6 +36,8 @@ fn modularize_imports_fixture(input: PathBuf) {
                             transform: "my-library/{{ matches.[1] }}/{{member}}".into(),
                             prevent_full_import: false,
                             skip_default_conversion: false,
+                            handle_default_import: true,
+                            handle_namespace_import: true,
                         },
                     ),
                     (
@@ -42,6 +46,8 @@ fn modularize_imports_fixture(input: PathBuf) {
                             transform: "my-library-2/{{ camelCase member }}".into(),
                             prevent_full_import: false,
                             skip_default_conversion: true,
+                            handle_default_import: true,
+                            handle_namespace_import: true,
                         },
                     ),
                     (
@@ -50,6 +56,8 @@ fn modularize_imports_fixture(input: PathBuf) {
                             transform: "my-library-3/{{ kebabCase member }}".into(),
                             prevent_full_import: false,
                             skip_default_conversion: true,
+                            handle_default_import: true,
+                            handle_namespace_import: true,
                         },
                     ),
                     (
@@ -76,6 +84,8 @@ fn modularize_imports_fixture(input: PathBuf) {
                             .into(),
                             prevent_full_import: false,
                             skip_default_conversion: true,
+                            handle_default_import: true,
+                            handle_namespace_import: true,
                         },
                     ),
                     (
@@ -84,6 +94,8 @@ fn modularize_imports_fixture(input: PathBuf) {
                             transform: "transformed-{{matches.[1]}}".into(),
                             prevent_full_import: false,
                             skip_default_conversion: true,
+                            handle_default_import: true,
+                            handle_namespace_import: true,
                         },
                     ),
                 ]