@utoo/web 1.3.4 → 1.4.1

package/esm/project/ForkedProject.d.ts

@@ -1,11 +1,18 @@
+import { type ConfigComplete } from "@utoo/pack-shared";
 import { DepsOptions, InstallOptions, PackFile, ProjectEndpoint, Stats, UpdateMessage } from "../types";
 export declare class ForkedProject implements ProjectEndpoint {
     private endpoint;
     constructor(port: MessagePort);
     deps(options?: DepsOptions): Promise<string>;
     install(packageLock: string, options?: InstallOptions): Promise<void>;
-    build(): Promise<import("..").BuildOutput>;
-    dev(onUpdate?: (result: any) => void): void;
+    build(options?: {
+        config?: ConfigComplete;
+        cleanup?: boolean;
+    }): Promise<import("..").BuildOutput>;
+    dev(options?: {
+        config?: ConfigComplete;
+        onUpdate?: (result: any) => void;
+    }): 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/ForkedProject.js

@@ -17,11 +17,11 @@ export class ForkedProject {
             maxConcurrentDownloads: options === null || options === void 0 ? void 0 : options.maxConcurrentDownloads,
         });
     }
-    async build() {
-        return await this.endpoint.build();
+    async build(options) {
+        return await this.endpoint.build(options);
     }
-    dev(onUpdate) {
-        this.endpoint.dev(onUpdate ? comlink.proxy(onUpdate) : undefined);
+    dev(options) {
+        this.endpoint.dev(options);
     }
     async hmrSubscribe(identifier, callback) {
         await this.endpoint.hmrSubscribe(identifier, comlink.proxy(callback));

package/esm/project/InternalProject.d.ts

@@ -1,4 +1,4 @@
-import { type UpdateMessage } from "@utoo/pack-shared";
+import { type ConfigComplete, type UpdateMessage } from "@utoo/pack-shared";
 import { DepsOptions, InstallOptions, PackFile, ProjectEndpoint, ProjectOptions, Stats } from "../types";
 import initWasm from "../utoo";
 declare class InternalEndpoint implements ProjectEndpoint {
@@ -10,8 +10,14 @@ declare class InternalEndpoint implements ProjectEndpoint {
     mount(opt: Omit<ProjectOptions, "workerUrl" | "serviceWorker">): Promise<void>;
     deps(options?: DepsOptions): Promise<string>;
     install(packageLock: string, options?: InstallOptions): Promise<void>;
-    build(): Promise<any>;
-    dev(onUpdate?: (result: any) => void): Promise<void>;
+    build(options?: {
+        config?: ConfigComplete;
+        cleanup?: boolean;
+    }): Promise<any>;
+    dev(options?: {
+        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

@@ -1,4 +1,4 @@
-import initWasm, { Fs, initLogFilter, Project as ProjectInternal, } from "../utoo";
+import initWasm, { BuildOptions, Fs, initLogFilter, Project as ProjectInternal, } from "../utoo";
 import { runLoaderWorkerPool } from "../webpackLoaders/loaderWorkerPool";
 class InternalEndpoint {
     constructor() {
@@ -37,23 +37,29 @@ class InternalEndpoint {
         await ProjectInternal.install(packageLock, concurrency);
         return;
     }
-    async build() {
-        var _a, _b;
+    async build(options) {
+        var _a, _b, _c;
         await this.wasmInit;
         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;
         }
-        return await ProjectInternal.build();
+        const buildOptions = new BuildOptions();
+        buildOptions.cleanup = (_c = options === null || options === void 0 ? void 0 : options.cleanup) !== null && _c !== void 0 ? _c : false;
+        if (options === null || options === void 0 ? void 0 : options.config) {
+            buildOptions.config = options.config;
+        }
+        return await ProjectInternal.build(buildOptions);
     }
-    async dev(onUpdate) {
+    async dev(options) {
         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((result) => {
-            onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate(result);
+        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);
         });
     }
     async readFile(path, encoding) {

package/esm/project/Project.d.ts

@@ -1,4 +1,4 @@
-import { type UpdateMessage } from "@utoo/pack-shared";
+import { type ConfigComplete, type UpdateMessage } from "@utoo/pack-shared";
 import { HmrClient } from "../hmr";
 import { BuildOutput, DepsOptions, Dirent, InstallOptions, PackFile, ProjectEndpoint, ProjectOptions, ServiceWorkerOptions, Stats } from "../types";
 export declare class Project implements ProjectEndpoint {
@@ -15,8 +15,14 @@ export declare class Project implements ProjectEndpoint {
     mount(): Promise<void>;
     deps(options?: DepsOptions): Promise<string>;
     install(packageLock: string, options?: InstallOptions): Promise<void>;
-    build(): Promise<BuildOutput>;
-    dev(onUpdate?: (result: BuildOutput) => void): void;
+    build(options?: {
+        config?: ConfigComplete;
+        cleanup?: boolean;
+    }): Promise<BuildOutput>;
+    dev(options?: {
+        config?: ConfigComplete;
+        onUpdate?: (result: BuildOutput) => void;
+    }): 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

@@ -10,7 +10,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _Project_mount;
-import { handleIssues } from "@utoo/pack-shared";
+import { handleIssues, } from "@utoo/pack-shared";
 import * as comlink from "comlink";
 import { HmrServer } from "../hmr";
 import { WorkerMessageType } from "../message";
@@ -75,13 +75,13 @@ export class Project {
         await __classPrivateFieldGet(this, _Project_mount, "f");
         return await this.remote.install(packageLock, options);
     }
-    async build() {
+    async build(options) {
         await __classPrivateFieldGet(this, _Project_mount, "f");
-        const res = await this.remote.build();
+        const res = await this.remote.build(options);
         handleIssues(res.issues, false, false);
         return res;
     }
-    dev(onUpdate) {
+    dev(options) {
         // Create HmrServer lazily on first dev() call
         if (!this.hmrServer) {
             this.hmrServer = new HmrServer({
@@ -92,12 +92,15 @@ export class Project {
                 },
             });
         }
-        this.remote.dev(onUpdate
-            ? comlink.proxy((result) => {
-                handleIssues(result.issues, false, false);
-                onUpdate(result);
-            })
-            : undefined);
+        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,
+        });
     }
     async hmrSubscribe(identifier, callback) {
         await this.remote.hmrSubscribe(identifier, comlink.proxy(callback));

package/esm/types.d.ts

@@ -1,4 +1,4 @@
-import { Issue, type UpdateMessage } from "@utoo/pack-shared";
+import { ConfigComplete, Issue, type UpdateMessage } from "@utoo/pack-shared";
 import initWasm, { DirEntryType } from "./utoo";
 export { type UpdateMessage } from "@utoo/pack-shared";
 export interface RawDirent {
@@ -69,9 +69,15 @@ export interface InstallOptions {
 export interface ProjectEndpoint {
     deps: (options?: DepsOptions) => Promise<string>;
     install: (packageLock: string, options?: InstallOptions) => Promise<void>;
-    build: () => Promise<BuildOutput>;
+    build: (options?: {
+        config?: ConfigComplete;
+        cleanup?: boolean;
+    }) => Promise<BuildOutput>;
     /** Start dev mode with file watching. onUpdate is called on each rebuild. */
-    dev: (onUpdate?: (result: BuildOutput) => void) => void;
+    dev: (options?: {
+        config?: ConfigComplete;
+        onUpdate?: (result: BuildOutput) => void;
+    }) => void;
     /**
      * Subscribe to HMR events for a specific identifier.
      * Returns a Promise that resolves when the subscription is set up.

package/esm/utoo/index.d.ts

@@ -67,6 +67,32 @@ export function wasm_thread_entry_point(ptr: number): void;
  * @param {number} worker_id
  */
 export function workerCreated(worker_id: number): void;
+/**
+ * Options for the build operation, exposed to JS with auto-generated typings.
+ */
+export class BuildOptions {
+    __destroy_into_raw(): number;
+    __wbg_ptr: number;
+    free(): void;
+    /**
+     * @param {any} val
+     */
+    set config(val: any);
+    /**
+     * @returns {any}
+     */
+    get config(): any;
+    /**
+     * When true, drops the existing global project and creates a fresh instance.
+     * @param {boolean} arg0
+     */
+    set cleanup(arg0: boolean);
+    /**
+     * When true, drops the existing global project and creates a fresh instance.
+     * @returns {boolean}
+     */
+    get cleanup(): boolean;
+}
 export class CreateSyncAccessHandleOptions {
     __destroy_into_raw(): number | undefined;
     __wbg_ptr: number | undefined;
@@ -234,9 +260,10 @@ export class Metadata {
 }
 export class Project {
     /**
+     * @param {BuildOptions} options
      * @returns {Promise<any>}
      */
-    static build(): Promise<any>;
+    static build(options: BuildOptions): Promise<any>;
     /**
      * @returns {string}
      */
@@ -252,10 +279,11 @@ export class Project {
      * Subscribe to entrypoints changes with HMR support.
      * This will watch for file changes and automatically rebuild.
      * Returns a RootTask that must be held by JS to keep the subscription active.
+     * @param {any} config
      * @param {Function} callback
      * @returns {Promise<RootTask>}
      */
-    static entrypointsSubscribe(callback: Function): Promise<RootTask>;
+    static entrypointsSubscribe(config: any, callback: Function): Promise<RootTask>;
     /**
      * Create a tar.gz archive and return bytes (no file I/O)
      * @param {any} files

package/esm/utoo/index.js

@@ -1,4 +1,55 @@
 /* @ts-self-types="./index.d.ts" */
+/**
+ * Options for the build operation, exposed to JS with auto-generated typings.
+ */
+export class BuildOptions {
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        BuildOptionsFinalization.unregister(this);
+        return ptr;
+    }
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_buildoptions_free(ptr, 0);
+    }
+    /**
+     * @returns {any}
+     */
+    get config() {
+        const ret = wasm.buildoptions_config(this.__wbg_ptr);
+        return takeObject(ret);
+    }
+    constructor() {
+        const ret = wasm.buildoptions_new();
+        this.__wbg_ptr = ret >>> 0;
+        BuildOptionsFinalization.register(this, this.__wbg_ptr, this);
+        return this;
+    }
+    /**
+     * @param {any} val
+     */
+    set config(val) {
+        wasm.buildoptions_set_config(this.__wbg_ptr, addHeapObject(val));
+    }
+    /**
+     * When true, drops the existing global project and creates a fresh instance.
+     * @returns {boolean}
+     */
+    get cleanup() {
+        const ret = wasm.__wbg_get_buildoptions_cleanup(this.__wbg_ptr);
+        return ret !== 0;
+    }
+    /**
+     * When true, drops the existing global project and creates a fresh instance.
+     * @param {boolean} arg0
+     */
+    set cleanup(arg0) {
+        wasm.__wbg_set_buildoptions_cleanup(this.__wbg_ptr, arg0);
+    }
+}
+if (Symbol.dispose)
+    BuildOptions.prototype[Symbol.dispose] = BuildOptions.prototype.free;
 export class CreateSyncAccessHandleOptions {
     __destroy_into_raw() {
         const ptr = this.__wbg_ptr;
@@ -632,10 +683,13 @@ export class Project {
         wasm.__wbg_project_free(ptr, 0);
     }
     /**
+     * @param {BuildOptions} options
      * @returns {Promise<any>}
      */
-    static build() {
-        const ret = wasm.project_build();
+    static build(options) {
+        _assertClass(options, BuildOptions);
+        var ptr0 = options.__destroy_into_raw();
+        const ret = wasm.project_build(ptr0);
         return takeObject(ret);
     }
     /**
@@ -674,11 +728,12 @@ export class Project {
      * Subscribe to entrypoints changes with HMR support.
      * This will watch for file changes and automatically rebuild.
      * Returns a RootTask that must be held by JS to keep the subscription active.
+     * @param {any} config
      * @param {Function} callback
      * @returns {Promise<RootTask>}
      */
-    static entrypointsSubscribe(callback) {
-        const ret = wasm.project_entrypointsSubscribe(addHeapObject(callback));
+    static entrypointsSubscribe(config, callback) {
+        const ret = wasm.project_entrypointsSubscribe(addHeapObject(config), addHeapObject(callback));
         return takeObject(ret);
     }
     /**
@@ -1066,6 +1121,10 @@ function __wbg_get_imports(memory) {
             const ret = typeof (getObject(arg0)) === 'function';
             return ret;
         },
+        __wbg___wbindgen_is_null_ac34f5003991759a: function (arg0) {
+            const ret = getObject(arg0) === null;
+            return ret;
+        },
         __wbg___wbindgen_is_object_5ae8e5880f2c1fbd: function (arg0) {
             const val = getObject(arg0);
             const ret = typeof (val) === 'object' && val !== null;
@@ -1421,7 +1480,7 @@ function __wbg_get_imports(memory) {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wasm_bindgen_func_elem_3885(a, state0.b, arg0, arg1);
+                        return __wasm_bindgen_func_elem_3879(a, state0.b, arg0, arg1);
                     }
                     finally {
                         state0.a = a;
@@ -1748,33 +1807,33 @@ function __wbg_get_imports(memory) {
             }, arguments);
         },
         __wbindgen_cast_0000000000000001: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1480, function: Function { arguments: [Externref], shim_idx: 5665, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_22106, __wasm_bindgen_func_elem_80719);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [Externref], shim_idx: 5646, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80607);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000002: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1480, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 5647, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-            const ret = makeClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_22106, __wasm_bindgen_func_elem_80558);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 5628, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
+            const ret = makeClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80437);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000003: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1480, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 5665, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_22106, __wasm_bindgen_func_elem_80719);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 5646, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80607);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000004: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1480, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 5668, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_22106, __wasm_bindgen_func_elem_80755);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 5649, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_80643);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000005: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 1480, function: Function { arguments: [], shim_idx: 1481, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_22106, __wasm_bindgen_func_elem_22107);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 1458, function: Function { arguments: [], shim_idx: 1459, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_21941, __wasm_bindgen_func_elem_21942);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000006: function (arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { dtor_idx: 5671, function: Function { arguments: [], shim_idx: 1481, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_80775, __wasm_bindgen_func_elem_22107);
+            // Cast intrinsic for `Closure(Closure { dtor_idx: 5652, function: Function { arguments: [], shim_idx: 1459, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm.__wasm_bindgen_func_elem_80663, __wasm_bindgen_func_elem_21942);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000007: function (arg0) {
@@ -1822,25 +1881,25 @@ function __wbg_get_imports(memory) {
         "./index_bg.js": import0,
     };
 }
-function __wasm_bindgen_func_elem_22107(arg0, arg1) {
-    wasm.__wasm_bindgen_func_elem_22107(arg0, arg1);
+function __wasm_bindgen_func_elem_21942(arg0, arg1) {
+    wasm.__wasm_bindgen_func_elem_21942(arg0, arg1);
 }
-function __wasm_bindgen_func_elem_80719(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_80719(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_80607(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_80607(arg0, arg1, addHeapObject(arg2));
 }
-function __wasm_bindgen_func_elem_80558(arg0, arg1, arg2) {
-    wasm.__wasm_bindgen_func_elem_80558(arg0, arg1, addHeapObject(arg2));
+function __wasm_bindgen_func_elem_80437(arg0, arg1, arg2) {
+    wasm.__wasm_bindgen_func_elem_80437(arg0, arg1, addHeapObject(arg2));
 }
-function __wasm_bindgen_func_elem_80755(arg0, arg1, arg2) {
+function __wasm_bindgen_func_elem_80643(arg0, arg1, arg2) {
     try {
-        wasm.__wasm_bindgen_func_elem_80755(arg0, arg1, addBorrowedObject(arg2));
+        wasm.__wasm_bindgen_func_elem_80643(arg0, arg1, addBorrowedObject(arg2));
     }
     finally {
         heap[stack_pointer++] = undefined;
     }
 }
-function __wasm_bindgen_func_elem_3885(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_3885(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_3879(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_3879(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 const __wbindgen_enum_DirEntryType = ["file", "directory"];
 const __wbindgen_enum_FileSystemChangeRecordType = ["appeared", "disappeared", "errored", "modified", "moved", "unknown"];
@@ -1849,6 +1908,9 @@ const __wbindgen_enum_RequestCache = ["default", "no-store", "reload", "no-cache
 const __wbindgen_enum_RequestCredentials = ["omit", "same-origin", "include"];
 const __wbindgen_enum_RequestMode = ["same-origin", "no-cors", "cors", "navigate"];
 const __wbindgen_enum_WorkerType = ["classic", "module"];
+const BuildOptionsFinalization = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => { }, unregister: () => { } }
+    : new FinalizationRegistry(ptr => wasm.__wbg_buildoptions_free(ptr >>> 0, 1));
 const CreateSyncAccessHandleOptionsFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => { }, unregister: () => { } }
     : new FinalizationRegistry(ptr => wasm.__wbg_createsyncaccesshandleoptions_free(ptr >>> 0, 1));

package/esm/webpackLoaders/cjs.js

@@ -44,7 +44,9 @@ 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")) {
+    if (moduleId.includes("node_modules") ||
+        id in importMaps ||
+        moduleId in importMaps) {
         installedModules[moduleId] = module;
     }
     if (moduleId === entrypoint) {
@@ -93,6 +95,15 @@ 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);

package/esm/webpackLoaders/polyfills/fsPolyfill/index.js

@@ -211,11 +211,7 @@ export function readFile(path, options, cb) {
     const promise = encoding
         ? fs.readToString(resolvedPath)
         : fs.read(resolvedPath);
-    promise
-        .then((data) => {
-        cb(null, encoding ? data : Buffer.from(data));
-    })
-        .catch((e) => cb(translateError(e, path, "open")));
+    promise.then((data) => cb(null, encoding ? data : Buffer.from(data)), (e) => cb(translateError(e, path, "open")));
 }
 export function readdir(path, options, cb) {
     if (typeof options === "function") {
@@ -238,8 +234,7 @@ export function readdir(path, options, cb) {
             return json.name;
         });
         cb(null, result);
-    })
-        .catch((e) => cb(translateError(e, path, "scandir")));
+    }, (e) => cb(translateError(e, path, "scandir")));
 }
 export function writeFile(path, data, options, cb) {
     if (typeof options === "function") {
@@ -251,9 +246,7 @@ export function writeFile(path, data, options, cb) {
     const promise = typeof data === "string"
         ? fs.writeString(resolvedPath, data)
         : fs.write(resolvedPath, data);
-    promise
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "open")));
+    promise.then(() => cb(null), (e) => cb(translateError(e, path, "open")));
 }
 export function mkdir(path, options, cb) {
     if (typeof options === "function") {
@@ -265,9 +258,7 @@ export function mkdir(path, options, cb) {
     const promise = (options === null || options === void 0 ? void 0 : options.recursive)
         ? fs.createDirAll(resolvedPath)
         : fs.createDir(resolvedPath);
-    promise
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "mkdir")));
+    promise.then(() => cb(null), (e) => cb(translateError(e, path, "mkdir")));
 }
 export function rm(path, options, cb) {
     if (typeof options === "function") {
@@ -286,8 +277,7 @@ export function rm(path, options, cb) {
             return fs.removeDir(resolvedPath, !!(options === null || options === void 0 ? void 0 : options.recursive));
         }
     })
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "rm")));
+        .then(() => cb(null), (e) => cb(translateError(e, path, "rm")));
 }
 export function rmdir(path, options, cb) {
     if (typeof options === "function") {
@@ -296,14 +286,12 @@ export function rmdir(path, options, cb) {
     }
     getFs()
         .removeDir(resolvePath(path), !!(options === null || options === void 0 ? void 0 : options.recursive))
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, path, "rmdir")));
+        .then(() => cb(null), (e) => cb(translateError(e, path, "rmdir")));
 }
 export function copyFile(src, dst, cb) {
     getFs()
         .copyFile(resolvePath(src), resolvePath(dst))
-        .then(() => cb(null))
-        .catch((e) => cb(translateError(e, src, "copyfile")));
+        .then(() => cb(null), (e) => cb(translateError(e, src, "copyfile")));
 }
 export function stat(p, cb) {
     getFs()
@@ -314,8 +302,7 @@ export function stat(p, cb) {
             type: json.type,
             size: Number(json.file_size || 0),
         }));
-    })
-        .catch((e) => cb(translateError(e, p, "stat")));
+    }, (e) => cb(translateError(e, p, "stat")));
 }
 export function lstat(p, cb) {
     getFs()
@@ -326,8 +313,7 @@ export function lstat(p, cb) {
             type: json.type,
             size: Number(json.file_size || 0),
         }));
-    })
-        .catch((e) => cb(translateError(e, p, "lstat")));
+    }, (e) => cb(translateError(e, p, "lstat")));
 }
 export function realpath(p, cb) {
     cb(null, p);
@@ -342,8 +328,7 @@ export function access(p, mode, cb) {
         .then(() => {
         if (cb)
             cb(null);
-    })
-        .catch((e) => {
+    }, (e) => {
         if (cb)
             cb(translateError(e, p, "access"));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/web",
-  "version": "1.3.4",
+  "version": "1.4.1",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
   "files": [
@@ -26,7 +26,7 @@
     "prepublishOnly": "turbo run build --filter=@utoo/web"
   },
   "dependencies": {
-    "@utoo/pack-shared": "1.2.0",
+    "@utoo/pack-shared": "1.3.1",
     "comlink": "^4.4.2",
     "systemjs": "^6.15.1"
   },