Allow same * destination

pyscript · Nov 5, 2024 · 4f458c0 · 4f458c0
1 parent ac3f3f8
commit 4f458c0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 4 deletions.
diff --git a/docs/index.js b/docs/index.js
diff --git a/docs/index.js.map b/docs/index.js.map
diff --git a/esm/interpreter/_utils.js b/esm/interpreter/_utils.js
@@ -128,7 +128,7 @@ const calculateFilesPaths = files => {
     else {
       const url = parseTemplate(source, map);
       const path = fillName(url, parseTemplate(dest || './', map));
-      if (targets.has(path))
+      if (targets.has(path) && !path.endsWith('/*'))
         throw new SyntaxError(`Duplicated destination: ${path}`);
       targets.add(path);
       sourceDest.push({ url, path });

diff --git a/package.json b/package.json
@@ -88,6 +88,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-q3F8S0fpbtQrs9PkgOIbLQeYahmzu3z2eABsNHH1zMo="
+        "blob": "sha256-y6/jxBwsS9vdnsnAT+1dSKY8MQMctwF5QUikF6che60="
     }
 }
diff --git a/test/issue-2240/a.zip b/test/issue-2240/a.zip
diff --git a/test/issue-2240/b.zip b/test/issue-2240/b.zip
diff --git a/test/issue-2240/index.html b/test/issue-2240/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <script type="module" src="../../dist/index.js"></script>
+  <script type="micropython" config="settings.json">
+    import a, b
+  </script>
+</head>
+</html>
diff --git a/test/issue-2240/settings.json b/test/issue-2240/settings.json
@@ -0,0 +1,6 @@
+{
+    "files": {
+        "a.zip": "./*",
+        "b.zip": "./*"
+    }
+}