@utoo/web 1.4.2 → 1.4.3

package/esm/project/InternalProject.d.ts

@@ -14,10 +14,7 @@ declare class InternalEndpoint implements ProjectEndpoint {
         config?: ConfigComplete;
         cleanup?: boolean;
     }): Promise<any>;
-    dev(options?: {
-        config?: ConfigComplete;
-        onUpdate?: (result: any) => void;
-    }): Promise<void>;
+    dev(config?: ConfigComplete, onUpdate?: (result: any) => void): Promise<void>;
     readFile(path: string, encoding?: "utf8"): Promise<any>;
     writeFile(path: string, content: string | Uint8Array, _encoding?: "utf8"): Promise<void>;
     copyFile(src: string, dst: string): Promise<void>;

package/esm/project/InternalProject.js

@@ -51,15 +51,15 @@ class InternalEndpoint {
         }
         return await ProjectInternal.build(buildOptions);
     }
-    async dev(options) {
+    // @ts-expect-error - Comlink delivers (config, onUpdate) as separate args, not as options object
+    async dev(config, onUpdate) {
         var _a, _b;
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.loaderWorkerUrl) && !this.loaderWorkerPoolInitialized) {
             runLoaderWorkerPool(this.options.cwd, this.options.loaderWorkerUrl, (_b = this.options) === null || _b === void 0 ? void 0 : _b.loadersImportMap);
             this.loaderWorkerPoolInitialized = true;
         }
-        this.rootTask = await ProjectInternal.entrypointsSubscribe(options === null || options === void 0 ? void 0 : options.config, (result) => {
-            var _a;
-            (_a = options === null || options === void 0 ? void 0 : options.onUpdate) === null || _a === void 0 ? void 0 : _a.call(options, result);
+        this.rootTask = await ProjectInternal.entrypointsSubscribe(config, (result) => {
+            onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(result);
         });
     }
     async readFile(path, encoding) {

package/esm/project/Project.d.ts

@@ -22,7 +22,7 @@ export declare class Project implements ProjectEndpoint {
     dev(options?: {
         config?: ConfigComplete;
         onUpdate?: (result: BuildOutput) => void;
-    }): void;
+    }): Promise<void>;
     hmrSubscribe(identifier: string, callback: (update: unknown) => void): Promise<void>;
     updateInfoSubscribe(aggregationMs: number, callback: (message: UpdateMessage) => void): void;
     readFile(path: string, encoding?: "utf8"): Promise<any>;

package/esm/project/Project.js

@@ -81,7 +81,8 @@ export class Project {
         handleIssues(res.issues, false, false);
         return res;
     }
-    dev(options) {
+    async dev(options) {
+        await __classPrivateFieldGet(this, _Project_mount, "f");
         // Create HmrServer lazily on first dev() call
         if (!this.hmrServer) {
             this.hmrServer = new HmrServer({
@@ -92,15 +93,13 @@ export class Project {
                 },
             });
         }
-        this.remote.dev({
-            onUpdate: (options === null || options === void 0 ? void 0 : options.onUpdate)
-                ? comlink.proxy((result) => {
-                    handleIssues(result.issues, false, false);
-                    options.onUpdate(result);
-                })
-                : undefined,
-            config: options === null || options === void 0 ? void 0 : options.config,
-        });
+        // Pass config and onUpdate as separate top-level args for Comlink serialization
+        this.remote.dev(options === null || options === void 0 ? void 0 : options.config, (options === null || options === void 0 ? void 0 : options.onUpdate)
+            ? comlink.proxy((result) => {
+                handleIssues(result.issues, false, false);
+                options.onUpdate(result);
+            })
+            : undefined);
     }
     async hmrSubscribe(identifier, callback) {
         await this.remote.hmrSubscribe(identifier, comlink.proxy(callback));

package/esm/webpackLoaders/cjs.js

@@ -3,7 +3,6 @@ import nodePolyFills from "./polyfills/nodePolyFills";
 const fs = nodePolyFills.fs;
 const path = nodePolyFills.path;
 const installedModules = {};
-const statCache = {};
 const pkgJsonCache = {};
 const resolutionCache = {};
 const searchPathsCache = {};
@@ -35,7 +34,7 @@ const resolveWithExtensions = (p, skipIndexJsIfJs = false) => {
     }
     return null;
 };
-const executeModule = (moduleCode, moduleId, id, importMaps, entrypoint) => {
+const executeModule = (moduleId, moduleCode, importMaps, entrypoint) => {
     if (installedModules[moduleId]) {
         return installedModules[moduleId].exports;
     }
@@ -44,9 +43,7 @@ const executeModule = (moduleCode, moduleId, id, importMaps, entrypoint) => {
     const moduleRequire = (childId) => loadModule(childId, context, importMaps, entrypoint);
     moduleRequire.resolve = (request) => request;
     const module = { exports: finalExports, require: moduleRequire };
-    if (moduleId.includes("node_modules") ||
-        id in importMaps ||
-        moduleId in importMaps) {
+    if (moduleId.includes("node_modules") || moduleId in importMaps) {
         installedModules[moduleId] = module;
     }
     if (moduleId === entrypoint) {
@@ -69,23 +66,12 @@ const executeModule = (moduleCode, moduleId, id, importMaps, entrypoint) => {
         console.error(`Worker: Error executing module ${moduleId}:`, e);
         throw new Error(`Failed to load dependency ${moduleId}: ${e.message}`);
     }
-    const originalWarn = console.warn;
-    console.warn = (...args) => {
-        var _a;
-        const msg = ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.toString()) || "";
-        if (!msg.includes("(SystemJS Error#W3")) {
-            originalWarn.apply(console, args);
-        }
-    };
     try {
         System.set(moduleId, { default: finalExports });
     }
     catch (_a) {
         // ignore
     }
-    finally {
-        console.warn = originalWarn;
-    }
     return finalExports;
 };
 const loadModule = (id, context, importMaps, entrypoint) => {
@@ -95,19 +81,6 @@ const loadModule = (id, context, importMaps, entrypoint) => {
         const cachedId = resolutionCache[cacheKey];
         if (installedModules[cachedId])
             return installedModules[cachedId].exports;
-        const sysCached = System.get(cachedId) || (id !== cachedId && System.get(id));
-        if (sysCached)
-            return sysCached.default;
-        // importMaps takes priority over cached FS path
-        const importMapCode = importMaps[cachedId] || importMaps[id];
-        if (importMapCode) {
-            const mid = importMaps[cachedId] ? cachedId : id;
-            return executeModule(importMapCode, mid, id, importMaps, entrypoint);
-        }
-        const code = tryReadFile(cachedId);
-        if (code !== null) {
-            return executeModule(code, cachedId, id, importMaps, entrypoint);
-        }
     }
     // 1. Resolve
     let resolvedId = id.startsWith(".") ? path.join(context, id) : id;
@@ -120,30 +93,9 @@ const loadModule = (id, context, importMaps, entrypoint) => {
         return nodePolyFills[id];
     if (resolvedId in nodePolyFills)
         return nodePolyFills[resolvedId];
-    // 4. Check importMaps & FS
-    let moduleCode = importMaps[resolvedId] || importMaps[id];
-    let moduleId = importMaps[resolvedId] ? resolvedId : id;
-    if (!moduleCode) {
-        let longestMatch = null;
-        for (const key in importMaps) {
-            const sanitized = key.replace(/^\.?\//, "");
-            if (!sanitized)
-                continue;
-            const isMatch = [id, resolvedId].some((p) => p.startsWith("/") &&
-                p.endsWith(sanitized) &&
-                p[p.length - sanitized.length - 1] === "/");
-            if (isMatch && (!longestMatch || key.length > longestMatch.key.length)) {
-                longestMatch = { key, sanitized };
-            }
-        }
-        if (longestMatch) {
-            moduleCode = importMaps[longestMatch.key];
-            moduleId =
-                id.startsWith("/") && id.endsWith(longestMatch.sanitized)
-                    ? id
-                    : resolvedId;
-        }
-    }
+    // 4. Check importMaps
+    let moduleCode = importMaps[id];
+    let moduleId = moduleCode ? id : resolvedId;
     // Fallback: Try resolving from node_modules
     if (!moduleCode && !id.startsWith(".") && !id.startsWith("/")) {
         let searchPaths = searchPathsCache[context];
@@ -185,7 +137,7 @@ const loadModule = (id, context, importMaps, entrypoint) => {
                 const res = resolveWithExtensions(pkgMain);
                 if (res) {
                     moduleCode = res.code;
-                    moduleId = resolvedId = res.id;
+                    moduleId = res.id;
                     break;
                 }
             }
@@ -193,7 +145,7 @@ const loadModule = (id, context, importMaps, entrypoint) => {
             const res = resolveWithExtensions(nodeModulesPath);
             if (res) {
                 moduleCode = res.code;
-                moduleId = resolvedId = res.id;
+                moduleId = res.id;
                 break;
             }
         }
@@ -203,14 +155,14 @@ const loadModule = (id, context, importMaps, entrypoint) => {
         const res = resolveWithExtensions(resolvedId, id.endsWith(".js"));
         if (res) {
             moduleCode = res.code;
-            moduleId = resolvedId = res.id;
+            moduleId = res.id;
         }
     }
     if (moduleCode) {
         resolutionCache[`${context}:${id}`] = moduleId;
-        return executeModule(moduleCode, moduleId, id, importMaps, entrypoint);
+        return executeModule(moduleId, moduleCode, importMaps, entrypoint);
     }
-    const error = new Error(`Worker: Dependency ${id} (resolved: ${resolvedId}) not found. Context: ${context}. ` +
+    const error = new Error(`Worker: Dependency ${id} (resolved: ${moduleId}) not found. Context: ${context}. ` +
         `ImportMaps count: ${Object.keys(importMaps).length}. ` +
         `CWD: ${nodePolyFills.process.cwd()}. ` +
         `Sample ImportMaps keys: ${Object.keys(importMaps).slice(0, 5).join(", ")}`);
@@ -218,7 +170,7 @@ const loadModule = (id, context, importMaps, entrypoint) => {
     throw error;
 };
 export async function cjs(entrypoint, importMaps) {
-    [statCache, pkgJsonCache, resolutionCache, searchPathsCache].forEach((c) => {
+    [pkgJsonCache, resolutionCache, searchPathsCache].forEach((c) => {
         for (const key in c)
             delete c[key];
     });
@@ -240,6 +192,15 @@ export async function cjs(entrypoint, importMaps) {
             }
         }
     }));
+    // Suppress SystemJS W3 warnings during module loading
+    const originalWarn = console.warn;
+    console.warn = (...args) => {
+        var _a;
+        const msg = ((_a = args[0]) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+        if (!msg.includes("(SystemJS Error#W3")) {
+            originalWarn.apply(console, args);
+        }
+    };
     // @ts-ignore
     self.__systemjs_require__ = (id) => loadModule(id, path.dirname(entrypoint), importMaps, entrypoint);
     // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/web",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [