Merge pull request #118 from pyscript/fixed-unresolved-config

Fixed unresolved config in workers
pyscript · Sep 24, 2024 · 763fd1d · 763fd1d
2 parents 92c15b1 + 4d0e83e
commit 763fd1d
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 281 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/custom.js b/esm/custom.js
@@ -63,15 +63,17 @@ export const handleCustomType = async (node) => {
                 const worker = workerURL(node);
                 if (worker) {
                     let v = version;
-                    const cfg = node.getAttribute('config') || config || {};
-                    if (!v) {
-                        const [o] = resolveConfig(cfg, configURL);
-                        const details = await o;
-                        v = details.version || details.interpreter;
+                    let url = configURL;
+                    let cfg = node.getAttribute('config') || config || {};
+                    if (!v || !cfg) {
+                        const [o, u] = resolveConfig(cfg, configURL);
+                        cfg = await o;
+                        url = u;
+                        v = cfg.version || cfg.interpreter;
                     }
                     const xworker = XW.call(new Hook(null, hooks), worker, {
                         ...nodeInfo(node, type),
-                        configURL,
+                        configURL: url,
                         version: v,
                         type: runtime,
                         custom: type,