Preparing better lockFileContents for Pyodide 0.28.1

esm/interpreter/pyodide.js

@@ -69,7 +69,7 @@ const indexURLs = new WeakMap();
 
 export default {
     type,
-    module: (version = '0.27.7') =>
+    module: (version = '0.28.1') =>
         `https://cdn.jsdelivr.net/pyodide/v${version}/full/pyodide.mjs`,
     async engine({ loadPyodide, version }, config, url, baseURL) {
         progress('Loading Pyodide');
@@ -99,17 +99,22 @@ export default {
                 // packages are uniquely stored as JSON key
                 const key = stringify(packages);
                 if (storage.has(key)) {
-                    const blob = new Blob(
-                        [storage.get(key)],
-                        { type: 'application/json' },
-                    );
-                    // this should be used to bootstrap loadPyodide
-                    options.lockFileURL = URL.createObjectURL(blob);
+                    const value = storage.get(key);
+
                     // versions are not currently understood by pyodide when
                     // a lockFileURL is used instead of micropip.install(packages)
                     // https://github.com/pyodide/pyodide/issues/5135#issuecomment-2441038644
                     // https://github.com/pyscript/pyscript/issues/2245
                     options.packages = packages.map(name => name.split(/[>=<]=/)[0]);
+
+                    if (version.startsWith('0.27')) {
+                        const blob = new Blob([value], { type: 'application/json' });
+                        options.lockFileURL = URL.createObjectURL(blob);
+                    }
+                    else {
+                      options.lockFileContents = value;
+                    }
+
                     packages = null;
                 }
             }

esm/interpreter/webr.js

@@ -19,7 +19,7 @@ const run = async (interpreter, code) => {
 export default {
     type,
     experimental: true,
-    module: (version = '0.5.5-dev') =>
+    module: (version = '0.5.4') =>
         `https://cdn.jsdelivr.net/npm/webr@${version}/dist/webr.mjs`,
     async engine(module, config, _, baseURL) {
         const { get } = stdio();

node.importmap

@@ -1,7 +1,7 @@
 {
     "imports": {
         "http://pyodide": "./test/mocked/pyodide.mjs",
-        "https://cdn.jsdelivr.net/pyodide/v0.27.7/full/pyodide.mjs": "./test/mocked/pyodide.mjs",
+        "https://cdn.jsdelivr.net/pyodide/v0.28.1/full/pyodide.mjs": "./test/mocked/pyodide.mjs",
         "https://cdn.jsdelivr.net/npm/@micropython/[email protected]/micropython.mjs": "./test/mocked/micropython.mjs",
         "./3rd-party/toml.js": "./test/mocked/toml.mjs"
     }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "polyscript",
-    "version": "0.18.7",
+    "version": "0.18.9",
     "description": "PyScript single core to rule them all",
     "main": "./esm/index.js",
     "types": "./types/polyscript/esm/index.d.ts",
@@ -47,17 +47,17 @@
     "license": "APACHE-2.0",
     "devDependencies": {
         "@node-loader/import-maps": "^1.1.0",
-        "@playwright/test": "^1.54.1",
+        "@playwright/test": "^1.54.2",
         "@rollup/plugin-node-resolve": "^16.0.1",
         "@rollup/plugin-terser": "^0.4.4",
-        "@zip.js/zip.js": "^2.7.70",
+        "@zip.js/zip.js": "^2.7.72",
         "c8": "^10.1.3",
         "chokidar": "^4.0.3",
         "eslint": "^9.32.0",
         "linkedom": "^0.18.11",
         "rollup": "^4.46.2",
         "static-handler": "^0.5.3",
-        "typescript": "^5.8.3"
+        "typescript": "^5.9.2"
     },
     "type": "module",
     "module": "./dist/index.js",
@@ -95,6 +95,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-/ijN208Vut7w0/RQg848GbrzMVJWIAXyHNY5JK81MCI="
+        "blob": "sha256-AXShINMvVZpHtkidZMDhr0GyDeHHI3ubeK5sWCJAZYY="
     }
 }

test/index.js

@@ -76,7 +76,7 @@ import("../esm/index.js").then(async polyscript => {
     // all tests
     for (const test of [
         async function versionedRuntime() {
-            document.head.innerHTML = `<script type="pyodide" version="0.27.7">${content}</script>`;
+            document.head.innerHTML = `<script type="pyodide" version="0.28.1">${content}</script>`;
             await tick();
             assert(pyodide.content, dedent(content));
             assert(pyodide.target.tagName, "PYODIDE-SCRIPT");

versions/pyodide

@@ -1 +1 @@
-0.27.7
+0.28.1

versions/webr

@@ -1 +1 @@
-0.5.5-dev
+0.5.4