Update mambajs and untarjs (#159)

* Update mambajs, pulling the latest untarjs * Remove waitrundependencies * Fixup
jupyterlite · Jan 20, 2025 · c49850a · c49850a
1 parent 3c52847
commit c49850a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 29 deletions.
diff --git a/packages/xeus/package.json b/packages/xeus/package.json
@@ -36,7 +36,7 @@
         "watch:src": "tsc -w --sourceMap"
     },
     "dependencies": {
-        "@emscripten-forge/mambajs": "^0.3.0",
+        "@emscripten-forge/mambajs": "^0.3.1",
         "@jupyterlab/coreutils": "^6",
         "@jupyterlab/services": "^7.3.4",
         "@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.5 || ^0.5.0",

diff --git a/packages/xeus/src/worker.ts b/packages/xeus/src/worker.ts
@@ -10,7 +10,8 @@ import {
   bootstrapEmpackPackedEnvironment,
   bootstrapPython,
   getPythonVersion,
-  loadShareLibs
+  loadShareLibs,
+  waitRunDependencies
 } from '@emscripten-forge/mambajs';
 globalThis.Module = {};
 
@@ -50,22 +51,6 @@ async function fetchJson(url: string): Promise<any> {
 
 (self as any).get_stdin = get_stdin;
 
-async function waitRunDependency() {
-  const promise = new Promise<void>(resolve => {
-    globalThis.Module.monitorRunDependencies = (n: number) => {
-      if (n === 0) {
-        resolve();
-      }
-    };
-  });
-  // If there are no pending dependencies left, monitorRunDependencies will
-  // never be called. Since we can't check the number of dependencies,
-  // manually trigger a call.
-  globalThis.Module.addRunDependency('dummy');
-  globalThis.Module.removeRunDependency('dummy');
-  return promise;
-}
-
 globalThis.ready = new Promise(resolve => {
   kernelReady = resolve;
 });
@@ -152,7 +137,7 @@ export class XeusRemoteKernel {
       }
     });
     try {
-      await waitRunDependency();
+      await waitRunDependencies(globalThis.Module);
       if (
         globalThis.Module.FS !== undefined &&
         globalThis.Module.loadDynamicLibrary !== undefined

diff --git a/yarn.lock b/yarn.lock
@@ -58,23 +58,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emscripten-forge/mambajs@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@emscripten-forge/mambajs@npm:0.3.0"
+"@emscripten-forge/mambajs@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@emscripten-forge/mambajs@npm:0.3.1"
   dependencies:
-    "@emscripten-forge/untarjs": ^5.0.0
-  checksum: 1fecd2181706323b3ee9244444d1a1015452657746e3c8ca8a3431ec93193868533f111a877a654073cd54a6c7d8a5d72113fb338dbf58464bb4096edd7e6d89
+    "@emscripten-forge/untarjs": ^5.1.0
+  checksum: bb051759a544051e599b95f997d1d644e34b0d86c24b2747fe057123c4f48688b673640d1fade53c2f29b825034e7acccdffdd51070b710cefcf06929843d625
   languageName: node
   linkType: hard
 
-"@emscripten-forge/untarjs@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@emscripten-forge/untarjs@npm:5.0.0"
+"@emscripten-forge/untarjs@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "@emscripten-forge/untarjs@npm:5.1.0"
   dependencies:
     assert: ^2.1.0
     process: ^0.11.10
     url: ^0.11.4
-  checksum: 9d11e24023097614fe1707cf4e4c10705e2d5cec00be840fd22b68b9d132d76e33760f5bedd0c1735f940801138aaed8a3167457e3e9dd2e7113911b255938fa
+  checksum: da92ff14f0dd521aa5bbceaa1b19aafa9656f8f607125bc9c5cfb40bf822315659e9e33900e02dc2fea2852343a58e0e93daab0bd71c7b18ab2be637e040c0dc
   languageName: node
   linkType: hard
 
@@ -526,7 +526,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@jupyterlite/xeus@workspace:packages/xeus"
   dependencies:
-    "@emscripten-forge/mambajs": ^0.3.0
+    "@emscripten-forge/mambajs": ^0.3.1
     "@jupyterlab/builder": ^4.1.0
     "@jupyterlab/coreutils": ^6
     "@jupyterlab/services": ^7.3.4