@utoo/web 1.2.7 → 1.2.8

package/esm/webpackLoaders/loaderWorkerPool.d.ts

@@ -1,2 +1 @@
-import { Binding } from "../types";
-export declare const runLoaderWorkerPool: (binding: Binding, projectCwd: string, loaderWorkerUrl: string, loadersImportMap?: Record<string, string>) => Promise<void>;
+export declare const runLoaderWorkerPool: (projectCwd: string, loaderWorkerUrl: string, loadersImportMap?: Record<string, string>) => Promise<void>;

package/esm/webpackLoaders/loaderWorkerPool.js

@@ -1,7 +1,7 @@
-import initWasm, { registerWorkerScheduler, workerCreated, } from "../utoo";
+import { getWasmMemory, getWasmModule, registerWorkerScheduler, workerCreated, } from "../utoo";
 let nextWorkerId = 0;
 const loaderWorkers = {};
-export const runLoaderWorkerPool = async (binding, projectCwd, loaderWorkerUrl, loadersImportMap) => {
+export const runLoaderWorkerPool = async (projectCwd, loaderWorkerUrl, loadersImportMap) => {
     registerWorkerScheduler(async (creation) => {
         const { options: { filename, cwd }, } = creation;
         nextWorkerId += 1;
@@ -38,9 +38,8 @@ export const runLoaderWorkerPool = async (binding, projectCwd, loaderWorkerUrl,
             }
         }
         worker.postMessage([
-            // @ts-ignore
-            initWasm.__wbindgen_wasm_module,
-            binding.memory,
+            getWasmModule(),
+            getWasmMemory(),
             {
                 workerData: {
                     cwd: finalCwd,
@@ -48,7 +47,7 @@ export const runLoaderWorkerPool = async (binding, projectCwd, loaderWorkerUrl,
                     threadId: workerId,
                 },
                 loaderAssets: {
-                    importMaps: { ...loadersImportMap },
+                    importMaps: loadersImportMap !== null && loadersImportMap !== void 0 ? loadersImportMap : {},
                     entrypoint: finalFilename,
                 },
             },

package/esm/webpackLoaders/worker.js

@@ -1,4 +1,4 @@
-import initWasm, { Project, recvTaskMessageInWorker, sendTaskMessage, workerCreated, } from "../utoo";
+import initWasm, { Fs, recvTaskMessageInWorker, sendTaskMessage, workerCreated, } from "../utoo";
 import { cjs } from "./cjs";
 const binding = {
     recvTaskMessageInWorker,
@@ -12,16 +12,12 @@ export function startLoaderWorker() {
             console.log(err);
             throw err;
         });
-        // Initialize the thread-local state (tokio runtime).
-        // We don't need to pass threadWorkerUrl here because it's already stored in a global static in Rust.
-        Project.init("");
-        Project.setCwd(meta.workerData.cwd);
         self.workerData = {
             threadId: meta.workerData.threadId,
             cwd: meta.workerData.cwd,
             projectRoot: meta.workerData.projectRoot,
             binding,
-            fs: Project,
+            fs: Fs,
         };
         self.process = {
             env: {},

package/esm/worker.js

@@ -1,10 +1,11 @@
 import * as comlink from "comlink";
+import { WorkerMessageType } from "./message";
 import { internalEndpoint } from "./project/InternalProject";
-import { HandShake } from "./utils/message";
 const ConnectedPorts = new Set();
 self.addEventListener("message", (e) => {
     const port = e.ports[0];
-    if (e.data === HandShake && !ConnectedPorts.has(port)) {
+    if (e.data === WorkerMessageType.InitConnection &&
+        !ConnectedPorts.has(port)) {
         comlink.expose(internalEndpoint, port);
         ConnectedPorts.add(port);
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@utoo/web",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [
     "esm"
   ],
   "scripts": {
-    "install-toolchain": "cargo install wasm-bindgen-cli@0.2.106 && brew install binaryen llvm",
+    "install-toolchain": "cargo install wasm-bindgen-cli@0.2.108 && brew install binaryen llvm",
     "build-wasm": "cargo build -p utoo-wasm --target wasm32-unknown-unknown -Z build-std=panic_abort,std",
     "build-wasm:pm": "cargo build -p utoo-wasm --target wasm32-unknown-unknown --no-default-features -Z build-std=panic_abort,std",
     "bindgen-dev": "wasm-bindgen ../../target/wasm32-unknown-unknown/wasm-dev/utoo_wasm.wasm --out-dir src/utoo --out-name index --target web --debug --keep-debug --no-demangle",

package/esm/utils/message.d.ts

@@ -1,3 +0,0 @@
-export declare const HandShake = "__handshake__";
-export declare const ServiceWorkerHandShake = "__service_worker_handshake__";
-export declare const Fork = "__fork__";

package/esm/utils/message.js

@@ -1,3 +0,0 @@
-export const HandShake = "__handshake__";
-export const ServiceWorkerHandShake = "__service_worker_handshake__";
-export const Fork = "__fork__";