@remix_labs/machine-starter 1.1937.0-dev → 2.1838.0-dev

package/node.js

@@ -1,7 +1,31 @@
-import Worker from "web-worker";
-global.Worker = Worker;
-import WT from "worker_threads";
-global.MessageChannel = WT.MessageChannel;
 import Process from "process";
 global.Process = Process;
-export * from "./index.js";
+
+// NB: The only way I've made this work in node+webpack is if:
+//
+// * we use Worker from worker_threads directly
+// * we build each worker's module with webpack as an ESM .mjs bundle
+// * we put all the bundles in one directory
+// * we load the worker with a URL('./foo.mjs')
+//
+// Other ways to package/load might work, but definitely seems like
+// using worker_threads.Worker directly is needed (rather than through,
+// say, the web-worker packages that wraps either worker_threads.Worker
+// or the browser Worker to give the same interface). Webpack says ESM
+// is necessary but I'm not sure if this is true for either the main
+// script or the workers.
+import { Worker } from "worker_threads";
+
+function GetMachineWASMWorker() {
+    return new Worker(new URL("./machine-wasm.mjs", import.meta.url));
+}
+global.GetMachineWASMWorker = GetMachineWASMWorker;
+
+// Can't just `export *` because we need hub-client below in common.js
+import * as Hub from "@remix_labs/hub-client";
+export { Hub };
+
+import { fileURLToPath } from 'url';
+global.__filename = fileURLToPath(import.meta.url);
+
+export * from "./common.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/machine-starter",
-  "version": "1.1937.0-dev",
+  "version": "2.1838.0-dev",
   "description": "start the groove",
   "main": "node.js",
   "browser": "index.js",
@@ -11,7 +11,7 @@
   "author": "Remixlabs staff",
   "license": "ISC",
   "dependencies": {
-    "@remix_labs/hub-client": "1.1937.0-dev",
+    "@remix_labs/hub-client": "2.1838.0-dev",
     "nanoid": "^3.1.12",
     "web-worker": "^1.2.0"
   },

package/start.js

@@ -1,6 +1,6 @@
 import Process from "process";
-import { StartWASM2 } from "./node.js";
-import * as Hub from "@remix_labs/hub-client";
+import { StartWASM2, Hub } from "./node.js";
+
 if (Process.stdout._handle)
     Process.stdout._handle.setBlocking(true);
 if (Process.stderr._handle)

package/webpack.config.js

@@ -0,0 +1,66 @@
+import path from 'path';
+
+import {fileURLToPath} from 'url'
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default [
+    {
+        name: 'web',
+        entry: './index.js',
+        mode: "production",
+        output: {
+            filename: 'machine-starter.js',
+            path: path.resolve(__dirname, '../dist')
+        },
+        optimization: {
+            minimize: false
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.worker.js$/,
+                    type: 'asset/source'
+                },
+                {
+                    // Needed for import.meta.url unless we bundle the web workers
+                    // themselves as separate entries in this bundle.
+                    test: /\.js$/,
+                    loader: '@open-wc/webpack-import-meta-loader'
+                }
+            ]
+        }
+    },
+    {
+        name: 'node',
+        target: 'node',
+        mode: "production",
+        entry: {
+            node: './start.js',
+        },
+        optimization: {
+            minimize: false,
+        },
+        module: {
+            rules: [
+                {
+                    // Needed for import.meta.url unless we bundle the web workers
+                    // themselves as separate entries in this bundle.
+                    test: /\.js$/,
+                    loader: '@open-wc/webpack-import-meta-loader'
+                }
+            ]
+        },
+        experiments: {
+            outputModule: true
+        },
+        output: {
+            chunkFormat: 'module',
+            filename: 'machine-starter.node.mjs',
+            library : {
+                type: 'module',
+            },
+            path: path.resolve(__dirname, '../dist'),
+        }
+    }
+]