Merge branch 'main' into patch-1

.changeset/perfect-vans-grab.md

@@ -0,0 +1,5 @@
+---
+"@swc/plugin-transform-imports": patch
+---
+
+feat: Support dynamic imports from `transform-imports` plugin

crates/swc_icu_messageformat_parser/Cargo.toml

@@ -8,7 +8,7 @@ edition = { workspace = true }
 license = { workspace = true }
 name = "swc_icu_messageformat_parser"
 repository = { workspace = true }
-version = "3.0.0"
+version = "3.0.1"
 
 
 [features]

crates/swc_icu_messageformat_parser/src/parser.rs

@@ -832,7 +832,16 @@ impl<'s> Parser<'s> {
             self.bump();
         }
 
-        &self.message[start_offset..self.offset()]
+        let length = self.offset() - start_offset;
+        #[cfg(feature = "utf16")]
+        let (start_offset, length) = (
+            self.message_utf16[..start_offset].to_string().len(),
+            self.message_utf16[start_offset..start_offset + length]
+                .to_string()
+                .len(),
+        );
+
+        &self.message[start_offset..start_offset + length]
     }
 
     fn parse_literal(&self, nesting_level: usize, parent_arg_type: &str) -> Result<AstElement> {
@@ -1735,9 +1744,16 @@ impl<'s> Parser<'s> {
         if self.is_eof() {
             return None;
         }
-        self.message[self.offset() + self.char().len_utf8()..]
+
+        #[cfg(feature = "utf16")]
+        return self.message_utf16[self.offset() + self.char().len_utf16()..]
             .chars()
-            .next()
+            .next();
+
+        #[cfg(not(feature = "utf16"))]
+        return self.message[self.offset() + self.char().len_utf8()..]
+            .chars()
+            .next();
     }
 
     /// Returns true if the next call to `bump` would return false.

crates/swc_icu_messageformat_parser/tests/fixtures/unicode_1

@@ -0,0 +1,43 @@
+<a>ö🚀</a>
+---
+{}
+---
+{
+  "err": null,
+  "val": [
+    {
+      "children": [
+        {
+          "location": {
+            "end": {
+              "column": 6,
+              "line": 1,
+              "offset": 6
+            },
+            "start": {
+              "column": 4,
+              "line": 1,
+              "offset": 3
+            }
+          },
+          "type": 0,
+          "value": "ö🚀"
+        }
+      ],
+      "location":  {
+        "end":  {
+          "column": 10,
+          "line": 1,
+          "offset": 10
+        },
+        "start":  {
+          "column": 1,
+          "line": 1,
+          "offset": 0
+        }
+      },
+      "type": 8,
+      "value": "a"
+    }
+  ]
+}

crates/swc_icu_messageformat_parser/tests/run_parser_e2e.rs

@@ -38,6 +38,7 @@ fn read_sections(file: PathBuf) -> TestFixtureSections {
     fixture("tests/fixtures/treat_unicode_nbsp_as_whitespace")
 )]
 #[cfg_attr(feature = "utf16", fixture("tests/fixtures/trivial_2"))]
+#[cfg_attr(feature = "utf16", fixture("tests/fixtures/unicode_1"))]
 #[fixture("tests/fixtures/uppercase_tag_1")]
 #[fixture("tests/fixtures/expect_number_arg_skeleton_token_1")]
 #[fixture("tests/fixtures/self_closing_tag_1")]

packages/emotion/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/emotion"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/formatjs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @swc/plugin-formatjs
 
+## 2.0.4
+
+### Patch Changes
+
+- 2ae5319: Fix parsing of unicode
+
 ## 2.0.3
 
 ### Patch Changes

packages/formatjs/README.md

@@ -4,6 +4,12 @@ FormatJS SWC plugin, maintained by SWC team.
 
 # @swc/plugin-formatjs
 
+## 2.0.4
+
+### Patch Changes
+
+- 2ae5319: Fix parsing of unicode
+
 ## 2.0.3
 
 ### Patch Changes

packages/formatjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swc/plugin-formatjs",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "FormatJS SWC plugin",
   "main": "swc_plugin_formatjs.wasm",
   "scripts": {
@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/formatjs"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/formatjs/transform/Cargo.toml

@@ -8,7 +8,7 @@ edition = { workspace = true }
 license = { workspace = true }
 name = "swc_formatjs_transform"
 repository = { workspace = true }
-version = "3.0.0"
+version = "3.0.1"
 
 [features]
 custom_transform = []

packages/jest/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/jest"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/loadable-components/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/loadable-components"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/noop/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/noop"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/prefresh/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/prefresh"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/react-remove-properties/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/react-remove-properties"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/relay/package.json

@@ -10,7 +10,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/relay"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/remove-console/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/remove-console"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/styled-components/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/styled-components"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/styled-jsx/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/styled-jsx"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/swc-confidential/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/swc-confidential"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/swc-magic/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/swc-magic"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/swc-sdk/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/swc-sdk"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/transform-imports/package.json

@@ -9,7 +9,8 @@
   "homepage": "https://swc.rs",
   "repository": {
     "type": "git",
-    "url": "+https://github.com/swc-project/plugins.git"
+    "url": "git+https://github.com/swc-project/plugins.git",
+    "directory": "packages/transform-imports"
   },
   "bugs": {
     "url": "https://github.com/swc-project/plugins/issues"

packages/transform-imports/transform/src/lib.rs

@@ -9,7 +9,7 @@ use swc_atoms::Atom;
 use swc_cached::regex::CachedRegex;
 use swc_common::DUMMY_SP;
 use swc_ecma_ast::{ImportDecl, ImportSpecifier, ModuleExportName, *};
-use swc_ecma_visit::{fold_pass, noop_fold_type, Fold};
+use swc_ecma_visit::{fold_pass, noop_fold_type, Fold, FoldWith};
 
 static DUP_SLASH_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"//").unwrap());
 
@@ -323,11 +323,52 @@ impl FoldImports {
         }
         None
     }
+
+    fn handle_dynamic_import(&mut self, call: &CallExpr) -> Option<Atom> {
+        let first_arg = call.args.first()?;
+        if first_arg.spread.is_some() {
+            return None;
+        }
+
+        match &*first_arg.expr {
+            Expr::Lit(Lit::Str(s)) => {
+                let rewriter = self.should_rewrite(&s.value)?;
+
+                let new_module = rewriter.new_path(None);
+                Some(new_module)
+            }
+
+            Expr::Tpl(tpl) => {
+                if tpl.exprs.is_empty() {
+                    let cooked = tpl.quasis[0].cooked.as_ref()?;
+                    let rewriter = self.should_rewrite(cooked)?;
+
+                    let new_module = rewriter.new_path(None);
+                    Some(new_module)
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        }
+    }
 }
 
 impl Fold for FoldImports {
     noop_fold_type!();
 
+    fn fold_call_expr(&mut self, mut call: CallExpr) -> CallExpr {
+        call = call.fold_children_with(self);
+
+        if call.callee.is_import() {
+            if let Some(new_module) = self.handle_dynamic_import(&call) {
+                call.args.first_mut().unwrap().expr = new_module.into();
+            }
+        }
+
+        call
+    }
+
     fn fold_module(&mut self, mut module: Module) -> Module {
         let mut new_items: Vec<ModuleItem> = vec![];
         for item in module.body {
@@ -392,6 +433,7 @@ impl Fold for FoldImports {
                 }
             }
         }
+        let new_items = new_items.fold_children_with(self);
         module.body = new_items;
         module
     }