@lvce-editor/iframe-worker 3.3.0 → 3.5.0

package/dist/iframeWorkerMain.js

@@ -267,14 +267,14 @@ const readyMessage = 'ready';
 const getData$2 = event => {
   return event.data;
 };
-const listen$6 = () => {
+const listen$7 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$6 = global => {
+const signal$7 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -300,7 +300,7 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$d = global => {
+const wrap$e = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const withResolvers = () => {
@@ -325,10 +325,10 @@ const waitForFirstMessage = async port => {
   // @ts-ignore
   return event.data;
 };
-const listen$5 = async () => {
-  const parentIpcRaw = listen$6();
-  signal$6(parentIpcRaw);
-  const parentIpc = wrap$d(parentIpcRaw);
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$7(parentIpcRaw);
+  const parentIpc = wrap$e(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -373,13 +373,13 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$c = port => {
+const wrap$d = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$5,
-  wrap: wrap$c
+  listen: listen$6,
+  wrap: wrap$d
 };
 
 const Two = '2.0';
@@ -404,9 +404,6 @@ let id = 0;
 const create$3 = () => {
   return ++id;
 };
-const warn = (...args) => {
-  console.warn(...args);
-};
 const registerPromise = () => {
   const id = create$3();
   const {
@@ -419,16 +416,6 @@ const registerPromise = () => {
     promise
   };
 };
-const resolve = (id, response) => {
-  const fn = get(id);
-  if (!fn) {
-    console.log(response);
-    warn(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(response);
-  remove(id);
-};
 const create$2$1 = (method, params) => {
   const {
     id,
@@ -576,6 +563,19 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
+const warn = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get(id);
+  if (!fn) {
+    console.log(response);
+    warn(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove(id);
+};
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
   if (prettyError && prettyError.type) {
@@ -953,7 +953,9 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
   // TODO either
   // - load webviews the same as in web using blob urls
   // - load webviews from a pattern like /webviews/:id/:fileName
-  iframeContent = iframeContent.replaceAll('/media/', '/').replaceAll('//', '/');
+  if (!webView.path) {
+    iframeContent = iframeContent.replaceAll('/media/', '/').replaceAll('//', '/');
+  }
   return {
     srcDoc: '',
     iframeSrc,
@@ -989,13 +991,16 @@ const getDefaultBaseUrl = webView => {
   }
   return '';
 };
-const getWebViewBaseUrl = webView => {
+const getWebViewBaseUrl = (webView, locationOrigin) => {
   const defaultBaseUrl = getDefaultBaseUrl(webView);
+  if (defaultBaseUrl.startsWith(locationOrigin)) {
+    return defaultBaseUrl.slice(locationOrigin.length);
+  }
   return defaultBaseUrl;
 };
 
 const getIframeSrc$1 = (webView, locationOrigin, assetDir) => {
-  const baseUrl = getWebViewBaseUrl(webView);
+  const baseUrl = getWebViewBaseUrl(webView, locationOrigin);
   const srcHtml = getWebViewHtml(baseUrl, locationOrigin, webView.elements, assetDir);
   if (srcHtml) {
     const blobUrl = getBlobUrl(srcHtml, 'text/html');
@@ -1210,6 +1215,7 @@ const getModule = platform => {
       return register$1;
   }
 };
+
 const register = async (previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent) => {
   const fn = getModule(platform);
   return fn(previewServerId, webViewPort, frameAncestors, webViewRoot, csp, iframeContent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/iframe-worker",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "Web Worker to manage creation and lifecycle of iframes in Lvce Editor",
   "main": "dist/iframeWorkerMain.js",
   "type": "module",