@utoo/web 1.0.5 → 1.0.6

package/esm/installServiceWorker.d.ts

@@ -1 +1 @@
-export declare function installServiceWorker(url: string, scope: string, relativeDirToCwd?: string): Promise<void>;
+export declare function installServiceWorker(url: string, scope: string, targetDirToCwd?: string): Promise<void>;

package/esm/installServiceWorker.js

@@ -1,5 +1,5 @@
 import { ServiceWorkerHandShake } from "./message";
-export async function installServiceWorker(url, scope, relativeDirToCwd) {
+export async function installServiceWorker(url, scope, targetDirToCwd) {
     const registration = await navigator.serviceWorker.register(url, {
         scope: "/",
     });
@@ -8,7 +8,7 @@ export async function installServiceWorker(url, scope, relativeDirToCwd) {
             sw.postMessage({
                 [ServiceWorkerHandShake]: true,
                 scope,
-                relativeDirToCwd,
+                targetDirToCwd,
             });
             resolve();
         }

package/esm/project.js

@@ -55,9 +55,9 @@ export class Project {
     }
     async installServiceWorker() {
         if (this.serviceWorkerOptions) {
-            const { url, scope, relativeDirToCwd } = this.serviceWorkerOptions;
+            const { url, scope, targetDirToCwd } = this.serviceWorkerOptions;
             // Should add "Service-Worker-Allowed": "/" in page root response headers,
-            return await installServiceWorker(url, scope, relativeDirToCwd);
+            return await installServiceWorker(url, scope, targetDirToCwd);
         }
     }
     async mount() {

package/esm/serviceWorker.js

@@ -6,7 +6,7 @@ let _promise = new Promise((resolve) => {
 });
 let _projectEndpoint;
 let _serviceWorkerScope;
-let _relativeDirToCwd;
+let _targetDirToCwd;
 self.addEventListener("install", (event) => {
     event.waitUntil(self.skipWaiting());
 });
@@ -16,24 +16,26 @@ self.addEventListener("activate", (event) => {
 self.addEventListener("message", (event) => {
     if (event.data && event.data[ServiceWorkerHandShake] === true) {
         _serviceWorkerScope = event.data.scope;
-        _relativeDirToCwd = event.data.relativeDirToCwd;
+        _targetDirToCwd = event.data.targetDirToCwd;
         _projectEndpoint = Project.fork(new MessageChannel(), event.source);
         _resolve();
     }
 });
-self.addEventListener("fetch", async (event) => {
-    await _promise;
-    let { url: url_str, referrer } = event.request;
-    let url = new URL(url_str);
-    if (url.pathname.startsWith(_serviceWorkerScope) ||
-        (referrer && new URL(referrer).pathname.startsWith(_serviceWorkerScope))) {
-        const relateivePathToCwd = (_relativeDirToCwd !== null && _relativeDirToCwd !== void 0 ? _relativeDirToCwd : ".") +
-            url.pathname.replace(_serviceWorkerScope, "");
-        event.respondWith(readFileFromProject(relateivePathToCwd));
-    }
-    else {
-        return;
-    }
+self.addEventListener("fetch", (event) => {
+    event.respondWith((async () => {
+        await _promise;
+        let { url: url_str, referrer } = event.request;
+        let url = new URL(url_str);
+        if (url.pathname.startsWith(_serviceWorkerScope) ||
+            (referrer && new URL(referrer).pathname.startsWith(_serviceWorkerScope))) {
+            const relativePathToCwd = (_targetDirToCwd !== null && _targetDirToCwd !== void 0 ? _targetDirToCwd : ".") +
+                url.pathname.replace(_serviceWorkerScope, "");
+            return readFileFromProject(relativePathToCwd);
+        }
+        else {
+            return fetch(event.request);
+        }
+    })());
 });
 async function readFileFromProject(projectPath) {
     try {

package/esm/type.d.ts

@@ -52,6 +52,6 @@ export interface ProjectOptions {
 export interface ServiceWorkerOptions {
     url: string;
     scope: string;
-    relativeDirToCwd?: string;
+    targetDirToCwd?: string;
 }
 export type Binding = Awaited<ReturnType<typeof initWasm>>;

package/esm/utoo/index.js

@@ -315,8 +315,8 @@ function passArray8ToWasm0(arg, malloc) {
 export function wasm_thread_entry_point(ptr) {
     wasm.wasm_thread_entry_point(ptr);
 }
-function __wbg_adapter_6(arg0, arg1, arg2) {
-    wasm.__wbindgen_export_6(arg0, arg1, addHeapObject(arg2));
+function __wbg_adapter_10(arg0, arg1) {
+    wasm.__wbindgen_export_6(arg0, arg1);
 }
 let stack_pointer = 128;
 function addBorrowedObject(obj) {
@@ -325,7 +325,7 @@ function addBorrowedObject(obj) {
     heap[--stack_pointer] = obj;
     return stack_pointer;
 }
-function __wbg_adapter_9(arg0, arg1, arg2) {
+function __wbg_adapter_15(arg0, arg1, arg2) {
     try {
         wasm.__wbindgen_export_7(arg0, arg1, addBorrowedObject(arg2));
     }
@@ -333,10 +333,10 @@ function __wbg_adapter_9(arg0, arg1, arg2) {
         heap[stack_pointer++] = undefined;
     }
 }
-function __wbg_adapter_12(arg0, arg1) {
-    wasm.__wbindgen_export_8(arg0, arg1);
+function __wbg_adapter_18(arg0, arg1, arg2) {
+    wasm.__wbindgen_export_8(arg0, arg1, addHeapObject(arg2));
 }
-function __wbg_adapter_15(arg0, arg1, arg2) {
+function __wbg_adapter_27(arg0, arg1, arg2) {
     wasm.__wbindgen_export_9(arg0, arg1, addHeapObject(arg2));
 }
 function __wbg_adapter_94(arg0, arg1, arg2, arg3) {
@@ -1627,12 +1627,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_228b11ff07fcd80f = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8687, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8687, __wbg_adapter_12);
+        const ret = makeMutClosure(arg0, arg1, 8687, __wbg_adapter_10);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_3255823a0b603d96 = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8661, function: Function { arguments: [Ref(NamedExternref("MessageEvent"))], shim_idx: 8685, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8661, __wbg_adapter_9);
+        const ret = makeMutClosure(arg0, arg1, 8661, __wbg_adapter_15);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function (arg0) {
@@ -1642,12 +1642,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_4c807b347a3d0cbf = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 599, function: Function { arguments: [], shim_idx: 600, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 599, __wbg_adapter_12);
+        const ret = makeMutClosure(arg0, arg1, 599, __wbg_adapter_10);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_535e935a655d72df = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8680, function: Function { arguments: [Externref], shim_idx: 8681, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_6);
+        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_18);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_76322aab70622876 = function (arg0, arg1) {
@@ -1676,12 +1676,12 @@ function __wbg_get_imports() {
     };
     imports.wbg.__wbindgen_cast_ded0188a991d8b3c = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8680, function: Function { arguments: [NamedExternref("MessageEvent")], shim_idx: 8681, ret: Unit, inner_ret: Some(Unit) }, mutable: true }) -> Externref`.
-        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_6);
+        const ret = makeMutClosure(arg0, arg1, 8680, __wbg_adapter_18);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_cast_ffa04fbd359d627f = function (arg0, arg1) {
         // Cast intrinsic for `Closure(Closure { dtor_idx: 8661, function: Function { arguments: [NamedExternref("Array<any>")], shim_idx: 8662, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`.
-        const ret = makeClosure(arg0, arg1, 8661, __wbg_adapter_15);
+        const ret = makeClosure(arg0, arg1, 8661, __wbg_adapter_27);
         return addHeapObject(ret);
     };
     imports.wbg.__wbindgen_link_dd5153a359f2e504 = function (arg0) {

package/esm/webpackLoaders/loaders/less-loader/index.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", {
-    value: true
+    value: true,
 });
 exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _options = _interopRequireDefault(require("./options.json"));
 var _utils = require("./utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireDefault(e) {
+    return e && e.__esModule ? e : { default: e };
+}
 async function lessLoader(source) {
     const options = this.getOptions(_options.default);
     const callback = this.async();
@@ -26,12 +28,15 @@ async function lessLoader(source) {
     const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
     if (useSourceMap) {
         lessOptions.sourceMap = {
-            outputSourceFiles: true
+            outputSourceFiles: true,
         };
     }
     let data = source;
     if (typeof options.additionalData !== "undefined") {
-        data = typeof options.additionalData === "function" ? `${await options.additionalData(data, this)}` : `${options.additionalData}\n${data}`;
+        data =
+            typeof options.additionalData === "function"
+                ? `${await options.additionalData(data, this)}`
+                : `${options.additionalData}\n${data}`;
     }
     const logger = this.getLogger("less-loader");
     const loaderContext = this;
@@ -59,7 +64,7 @@ async function lessLoader(source) {
         },
         debug(message) {
             logger.debug(message);
-        }
+        },
     };
     implementation.logger.addListener(loggerListener);
     let result;
@@ -82,7 +87,7 @@ async function lessLoader(source) {
         delete lessOptions.pluginManager;
     }
     const { css, imports } = result;
-    imports.forEach(item => {
+    imports.forEach((item) => {
         if ((0, _utils.isUnsupportedUrl)(item)) {
             return;
         }
@@ -100,4 +105,4 @@ async function lessLoader(source) {
     }
     callback(null, css, map);
 }
-var _default = exports.default = lessLoader;
+var _default = (exports.default = lessLoader);

package/esm/webpackLoaders/loaders/less-loader/options.json

@@ -41,7 +41,9 @@
                 },
                 {
                     "type": "string",
-                    "enum": ["only"]
+                    "enum": [
+                        "only"
+                    ]
                 }
             ]
         },

package/esm/webpackLoaders/loaders/less-loader/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 const { type } = require("os");
 Object.defineProperty(exports, "__esModule", {
-    value: true
+    value: true,
 });
 exports.errorFactory = errorFactory;
 exports.getLessImplementation = getLessImplementation;
@@ -9,7 +9,9 @@ exports.getLessOptions = getLessOptions;
 exports.isUnsupportedUrl = isUnsupportedUrl;
 exports.normalizeSourceMap = normalizeSourceMap;
 var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _interopRequireDefault(e) {
+    return e && e.__esModule ? e : { default: e };
+}
 /* eslint-disable class-methods-use-this */
 const trailingSlash = /[/\\]$/;
 // This somewhat changed in Less 3.x. Now the file name comes without the
@@ -42,7 +44,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
         mainFields: ["less", "style", "main", "..."],
         mainFiles: ["index", "..."],
         extensions: [".less", ".css"],
-        preferRelative: true
+        preferRelative: true,
     });
     class WebpackFileManager extends implementation.FileManager {
         supports(filename) {
@@ -95,7 +97,8 @@ function createWebpackLessPlugin(loaderContext, implementation) {
         async loadFile(filename, ...args) {
             let result;
             try {
-                if (IS_SPECIAL_MODULE_IMPORT.test(filename) || lessOptions.webpackImporter === "only") {
+                if (IS_SPECIAL_MODULE_IMPORT.test(filename) ||
+                    lessOptions.webpackImporter === "only") {
                     const error = new Error();
                     error.type = "Next";
                     throw error;
@@ -110,13 +113,18 @@ function createWebpackLessPlugin(loaderContext, implementation) {
                     result = await this.resolveFilename(filename, ...args);
                 }
                 catch (webpackResolveError) {
-                    error.message = `Less resolver error:\n${error.message}\n\n` + `Webpack resolver error details:\n${webpackResolveError.details}\n\n` + `Webpack resolver error missing:\n${webpackResolveError.missing}\n\n`;
+                    error.message =
+                        `Less resolver error:\n${error.message}\n\n` +
+                            `Webpack resolver error details:\n${webpackResolveError.details}\n\n` +
+                            `Webpack resolver error missing:\n${webpackResolveError.missing}\n\n`;
                     return Promise.reject(error);
                 }
                 loaderContext.addDependency(result);
                 return super.loadFile(result, ...args);
             }
-            const absoluteFilename = _path.default.isAbsolute(result.filename) ? result.filename : _path.default.resolve(".", result.filename);
+            const absoluteFilename = _path.default.isAbsolute(result.filename)
+                ? result.filename
+                : _path.default.resolve(".", result.filename);
             loaderContext.addDependency(_path.default.normalize(absoluteFilename));
             return result;
         }
@@ -125,7 +133,7 @@ function createWebpackLessPlugin(loaderContext, implementation) {
         install(lessInstance, pluginManager) {
             pluginManager.addFileManager(new WebpackFileManager());
         },
-        minVersion: [3, 0, 0]
+        minVersion: [3, 0, 0],
     };
 }
 /**
@@ -137,16 +145,21 @@ function createWebpackLessPlugin(loaderContext, implementation) {
  * @returns {Object}
  */
 function getLessOptions(loaderContext, loaderOptions, implementation) {
-    const options = typeof loaderOptions.lessOptions === "function" ? loaderOptions.lessOptions(loaderContext) || {} : loaderOptions.lessOptions || {};
+    const options = typeof loaderOptions.lessOptions === "function"
+        ? loaderOptions.lessOptions(loaderContext) || {}
+        : loaderOptions.lessOptions || {};
     const lessOptions = {
         plugins: [],
         relativeUrls: true,
         // We need to set the filename because otherwise our WebpackFileManager will receive an undefined path for the entry
         filename: loaderContext.resourcePath,
-        ...options
+        ...options,
     };
     const plugins = lessOptions.plugins.slice();
-    const shouldUseWebpackImporter = typeof loaderOptions.webpackImporter === "boolean" || loaderOptions.webpackImporter === "only" ? loaderOptions.webpackImporter : true;
+    const shouldUseWebpackImporter = typeof loaderOptions.webpackImporter === "boolean" ||
+        loaderOptions.webpackImporter === "only"
+        ? loaderOptions.webpackImporter
+        : true;
     if (shouldUseWebpackImporter) {
         plugins.unshift(createWebpackLessPlugin(loaderContext, implementation));
     }
@@ -155,7 +168,7 @@ function getLessOptions(loaderContext, loaderOptions, implementation) {
             // eslint-disable-next-line no-param-reassign
             pluginManager.webpackLoaderContext = loaderContext;
             lessOptions.pluginManager = pluginManager;
-        }
+        },
     });
     lessOptions.plugins = plugins;
     return lessOptions;
@@ -179,7 +192,7 @@ function normalizeSourceMap(map) {
     newMap.sourceRoot = "";
     // `less` returns POSIX paths, that's why we need to transform them back to native paths.
     // eslint-disable-next-line no-param-reassign
-    newMap.sources = newMap.sources.map(source => _path.default.normalize(source));
+    newMap.sources = newMap.sources.map((source) => _path.default.normalize(source));
     return newMap;
 }
 function getLessImplementation(loaderContext, implementation) {
@@ -208,9 +221,16 @@ function getFileExcerptIfPossible(error) {
     return excerpt;
 }
 function errorFactory(error) {
-    const message = ["\n", ...getFileExcerptIfPossible(error), error.message.charAt(0).toUpperCase() + error.message.slice(1), error.filename ? `      Error in ${_path.default.normalize(error.filename)} (line ${error.line}, column ${error.column})` : ""].join("\n");
+    const message = [
+        "\n",
+        ...getFileExcerptIfPossible(error),
+        error.message.charAt(0).toUpperCase() + error.message.slice(1),
+        error.filename
+            ? `      Error in ${_path.default.normalize(error.filename)} (line ${error.line}, column ${error.column})`
+            : "",
+    ].join("\n");
     const obj = new Error(message, {
-        cause: error
+        cause: error,
     });
     obj.stack = null;
     return obj;

package/esm/webpackLoaders/worker/cjs.js

@@ -39,7 +39,7 @@ export async function cjs(entrypoint, importMaps) {
         const module = { exports: finalExports };
         const exports = module.exports;
         try {
-            new Function('require', 'exports', 'module', moduleCode)(require, exports, module);
+            new Function("require", "exports", "module", moduleCode)(require, exports, module);
             finalExports = module.exports;
         }
         catch (e) {

package/esm/webpackLoaders/worker/index.js

@@ -1,14 +1,14 @@
+import initWasm, { notifyWorkerAck, recvMessageInWorker, recvWorkerRequest, sendTaskMessage, } from "../../utoo";
 import { cjs } from "./cjs";
-import initWasm, { recvMessageInWorker, recvWorkerRequest, sendTaskMessage, notifyWorkerAck } from "../../utoo";
 const binding = {
     recvWorkerRequest,
     recvMessageInWorker,
     notifyWorkerAck,
-    sendTaskMessage
+    sendTaskMessage,
 };
 self.process = {
     env: {},
-    cwd: () => self.workerData.cwd
+    cwd: () => self.workerData.cwd,
 };
 self.onmessage = async (event) => {
     let [module, memory, meta] = event.data;
@@ -23,8 +23,8 @@ self.onmessage = async (event) => {
         binding,
         readFile: async (path) => {
             // TODO: if we want that, just connect to @utoo/web internalProject endpoint port with comlink
-            throw new Error('readFile in loader not supported on browser ');
-        }
+            throw new Error("readFile in loader not supported on browser ");
+        },
     };
     cjs(meta.loaderAssets.entrypoint, meta.loaderAssets.importMaps);
 };

package/esm/webpackLoaders/worker/nodePolyFills.js

@@ -1,9 +1,9 @@
-const assert = require('assert');
-const buffer = require('buffer');
-const constants = require('constants');
-const path = require('path');
-const url = require('url');
-const util = require('util');
+const assert = require("assert");
+const buffer = require("buffer");
+const constants = require("constants");
+const path = require("path");
+const url = require("url");
+const util = require("util");
 const less = require("less/lib/less-node/index.js").default;
 const lessLoader = require("../loaders/less-loader");
 export default {
@@ -20,5 +20,5 @@ export default {
     url,
     util,
     less,
-    "less-loader": lessLoader
+    "less-loader": lessLoader,
 };