Working setup

jupyterlite · May 16, 2022 · bacb984 · bacb984
1 parent fa52cf5
commit bacb984
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/jupyterlite_xeus_python/env_build_addon.py b/jupyterlite_xeus_python/env_build_addon.py
@@ -54,8 +54,6 @@ def output_extensions(self):
 
     def pre_build(self, manager):
         """yield a doit task to create the emscripten-32 env and grab anything we need from it"""
-        print("-- XeusPythonEnvBuildAddon.pre-build")
-
         # Bail early if there is nothing to do
         if not self.packages:
             return []

diff --git a/src/worker.ts b/src/worker.ts
@@ -2,22 +2,14 @@
 // Copyright (c) JupyterLite Contributors
 // Distributed under the terms of the Modified BSD License.
 
-declare namespace globalThis {
-  let Module: any;
-}
-globalThis.Module = {};
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import createXeusModule from './xpython_wasm.js';
-
 // We alias self to ctx and give it our newly created type
 const ctx: Worker = self as any;
 let raw_xkernel: any;
 let raw_xserver: any;
 
 async function waitRunDependency() {
   const promise = new Promise((r: any) => {
+    // @ts-ignore
     globalThis.Module.monitorRunDependencies = (n: number) => {
       if (n === 0) {
         console.log('all `RunDependencies` loaded');
@@ -28,7 +20,9 @@ async function waitRunDependency() {
   // 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.
+  // @ts-ignore
   globalThis.Module.addRunDependency('dummy');
+  // @ts-ignore
   globalThis.Module.removeRunDependency('dummy');
   return promise;
 }
@@ -50,19 +44,29 @@ let resolveInputReply: any;
 
 async function loadCppModule(moduleFactory: any): Promise<any> {
   const options: any = {};
+  // @ts-ignore
   globalThis.Module = await moduleFactory(options);
 
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  await require('./python_data');
+  importScripts(require('./python_data'));
 
   await waitRunDependency();
+  // @ts-ignore
   raw_xkernel = new globalThis.Module.xkernel();
   raw_xserver = raw_xkernel.get_server();
   raw_xkernel!.start();
 }
 
-const loadCppModulePromise = loadCppModule(createXeusModule);
+async function load() {
+  // @ts-ignore
+  let xpython = importScripts(require('./xpython_wasm.js'));
+
+  // @ts-ignore
+  return loadCppModule(createXeusModule);
+}
+
+const loadCppModulePromise = load();
 
 ctx.onmessage = async (event: MessageEvent): Promise<void> => {
   await loadCppModulePromise;

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,21 +1,31 @@
 const CopyPlugin = require('copy-webpack-plugin');
 
 module.exports = {
+  module: {
+    rules: [
+      {
+        test: /python_data\.js/,
+        type: 'asset',
+        generator : {
+          filename : 'python_data.js',
+        }
+      },
+      {
+        test: /xpython_wasm\.js/,
+        type: 'asset',
+        generator : {
+          filename : 'xpython_wasm.js',
+        }
+      },
+    ],
+  },
   plugins: [
     new CopyPlugin({
       patterns: [
-        {
-          from: 'src/xpython_wasm.js',
-          to: '.'
-        },
         {
           from: 'src/xpython_wasm.wasm',
           to: '.'
         },
-        {
-          from: 'src/python_data.js',
-          to: '.'
-        },
         {
           from: 'src/python_data.data',
           to: '.'