Merge pull request #130 from pyscript/pyscript-issue-2302

Pyscript issue 2302 - Unable to resolve relative wheels

Author: WebReflection

Diff for: docs/index.js

@@ -3,7 +3,7 @@ import fetch from '@webreflection/fetch';
 import { createProgress, writeFile } from './_utils.js';
 import { getFormat, loader, loadProgress, registerJSModule, run, runAsync, runEvent } from './_python.js';
 import { stdio, buffered } from './_io.js';
-import { absoluteURL } from '../utils.js';
+import { absoluteURL, fixedRelative } from '../utils.js';
 import mip from '../python/mip.js';
 import { zip } from '../3rd-party.js';
 
@@ -44,7 +44,7 @@ export default {
         this.writeFile(interpreter, './mip.py', mip);
         if (config.packages) {
             progress('Loading packages');
-            await py_imports(config.packages);
+            await py_imports(config.packages.map(fixedRelative, baseURL));
             progress('Loaded packages');
         }
         progress('Loaded MicroPython');

Diff for: docs/index.js.map

@@ -3,7 +3,7 @@ import { create } from 'gc-hook';
 import { RUNNING_IN_WORKER, createProgress, writeFile } from './_utils.js';
 import { getFormat, loader, loadProgress, registerJSModule, run, runAsync, runEvent } from './_python.js';
 import { stdio } from './_io.js';
-import { IDBMapSync, isArray } from '../utils.js';
+import { IDBMapSync, isArray, fixedRelative } from '../utils.js';
 
 const type = 'pyodide';
 const toJsOptions = { dict_converter: Object.fromEntries };
@@ -90,6 +90,7 @@ export default {
             applyOverride();
         progress('Loading Pyodide');
         let { packages, index_urls } = config;
+        if (packages) packages = packages.map(fixedRelative, baseURL);
         progress('Loading Storage');
         const indexURL = url.slice(0, url.lastIndexOf('/'));
         // each pyodide version shares its own cache
@@ -101,7 +102,7 @@ export default {
         if (!save) storage.clear();
         // otherwise check if cache is known
         else if (packages) {
-            packages = packages.slice(0).sort();
+            packages = packages.sort();
             // packages are uniquely stored as JSON key
             const key = stringify(packages);
             if (storage.has(key)) {

Diff for: docs/zip-CFEEYRfx.js

@@ -20,6 +20,11 @@ const { all, resolve } = new Proxy(Promise, {
 const absoluteURL = (path, base = location.href) =>
     new URL(path, base.replace(/^blob:/, '')).href;
 
+function fixedRelative(path) {
+    'use strict';
+    return path.startsWith('.') ? absoluteURL(path, this) : path;
+}
+
 /* c8 ignore start */
 let id = 0;
 const nodeInfo = (node, type) => ({
@@ -144,5 +149,6 @@ export {
     all,
     resolve,
     absoluteURL,
+    fixedRelative,
     nodeInfo,
 };

Diff for: docs/zip-CFEEYRfx.js.map

@@ -1,6 +1,6 @@
 {
     "name": "polyscript",
-    "version": "0.16.15",
+    "version": "0.16.17",
     "description": "PyScript single core to rule them all",
     "main": "./esm/index.js",
     "types": "./types/polyscript/esm/index.d.ts",
@@ -94,6 +94,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-fH3KC/dEPpvYJaLteD5BhwHUo3eOXk+xcMrnO0EdlL0="
+        "blob": "sha256-odSpqB8aMfMygAA/w4HACJlJ6oY/otMHtCZmVUbUkIk="
     }
 }