fix(core): fixes ES Module detection for default imports with relativ…

…e paths or scoped packages (#2380)
tauri-apps · Aug 10, 2021 · b2b36cf · b2b36cf
1 parent 8e48029
commit b2b36cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changes/fix-esm-detection.md b/.changes/fix-esm-detection.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Fix ES Module detection for default imports with relative paths or scoped packages.
diff --git a/core/tauri-codegen/src/embedded_assets.rs b/core/tauri-codegen/src/embedded_assets.rs
@@ -196,7 +196,7 @@ impl EmbeddedAssets {
           "import \\*",
           "import (\"|');?$",
           "import\\(",
-          "import (.|\n)+ from (\"|')([A-Za-z\\-]+)(\"|')",
+          "import (.|\n)+ from (\"|')([A-Za-z/\\.@-]+)(\"|')",
           // export keywords
           "export\\{",
           "export \\{",