@lvce-editor/iframe-worker 5.35.0 → 5.36.0

package/dist/iframeWorkerMain.js

@@ -1397,19 +1397,18 @@ const getWebViewHtml = (baseUrl, locationOrigin, elements, assetDir) => {
   if (!elements) {
     return '';
   }
-  const middle = [];
-  middle.push('<meta charset="utf-8">');
+  const middle = ['<meta charset="utf-8">'];
   for (const element of elements) {
     switch (element.type) {
-      case 'title':
-        middle.push(`<title>${element.value}</title>`);
+      case 'css':
+        middle.push(`<link rel="stylesheet" href="${locationOrigin}${baseUrl}/${element.path}" />`);
         break;
       case 'script':
         middle.push(`<script type="module" src="${locationOrigin}${assetDir}/js/preview-injected.js"></script>`);
         middle.push(`<script type="module" src="${locationOrigin}${baseUrl}/${element.path}"></script>`);
         break;
-      case 'css':
-        middle.push(`<link rel="stylesheet" href="${locationOrigin}${baseUrl}/${element.path}" />`);
+      case 'title':
+        middle.push(`<title>${element.value}</title>`);
         break;
     }
   }
@@ -1469,9 +1468,9 @@ const getIframeSrcRemote = (webViews, webViewPort, webViewId, locationProtocol,
   // - load webviews the same as in web using blob urls
   // - load webviews from a pattern like /webviews/:id/:fileName
   return {
+    iframeContent,
     iframeSrc,
-    webViewRoot,
-    iframeContent
+    webViewRoot
   };
 };
 
@@ -1485,8 +1484,8 @@ const getBlobUrl = (content, contentType) => {
 
 const getDefaultBaseUrl = webView => {
   const {
-    remotePath,
-    path
+    path,
+    remotePath
   } = webView;
   if (remotePath) {
     if (remotePath.endsWith('/index.html')) {
@@ -1517,9 +1516,9 @@ const getIframeSrc$1 = (webView, locationOrigin, assetDir) => {
   if (srcHtml) {
     const blobUrl = getBlobUrl(srcHtml, 'text/html');
     return {
+      iframeContent: '',
       iframeSrc: blobUrl,
-      webViewRoot: '',
-      iframeContent: ''
+      webViewRoot: ''
     };
   }
   return undefined;
@@ -1728,11 +1727,11 @@ const register$2 = async (previewServerId, webViewPort, frameAncestors, webViewR
   await create(previewServerId, useNewWebViewHandler); // TODO move this up
   await start(previewServerId, webViewPort); // TODO move this up
   await (useNewWebViewHandler ? setInfo2({
-    webViewRoot,
-    webViewId,
     contentSecurityPolicy: csp,
     iframeContent,
-    remotePathPrefix
+    remotePathPrefix,
+    webViewId,
+    webViewRoot
   }) : setHandler(previewServerId, frameAncestors, webViewRoot, csp, iframeContent));
   // TODO make this work in gitpod also
 };
@@ -1743,10 +1742,10 @@ const register$1 = async () => {
 
 const getModule = platform => {
   switch (platform) {
-    case Remote:
-      return register$2;
     case Electron:
       return register$3;
+    case Remote:
+      return register$2;
     default:
       return register$1;
   }
@@ -1758,14 +1757,14 @@ const register = async (previewServerId, webViewPort, frameAncestors, webViewRoo
 };
 
 const create2 = async ({
+  assetDir = '',
   id,
-  webViewPort,
-  webViewId,
+  isGitpod,
+  platform,
   previewServerId,
   uri,
-  platform,
-  isGitpod,
-  assetDir = '',
+  webViewId,
+  webViewPort,
   webViewScheme = WebView
 }) => {
   let root = '';
@@ -1784,9 +1783,9 @@ const create2 = async ({
 
   // TODO move all of this to iframe worker
   const {
+    iframeContent,
     iframeSrc,
-    webViewRoot,
-    iframeContent
+    webViewRoot
   } = iframeResult;
   const frameAncestors = getWebViewFrameAncestors(locationProtocol, locationHost);
   const frameTitle = getWebViewTitle(webView);
@@ -1823,11 +1822,11 @@ const create2 = async ({
   const savedState = await getSavedWebViewState(webViewId);
   await invoke$3('ExtensionHostWebView.load', webViewId, savedState);
   return {
+    csp: iframeCsp,
     iframeSrc,
-    sandbox,
-    portId,
     origin,
-    csp: iframeCsp
+    portId,
+    sandbox
   };
 };
 
@@ -1860,9 +1859,9 @@ const createWebViewConnection = async (uid, origin) => {
     port2
   } = getPortTuple();
   const rpcPromise = MessagePortRpcParent.create({
-    messagePort: port2,
+    commandMap: {},
     isMessagePortOpen: false,
-    commandMap: {}
+    messagePort: port2
   });
   const portType = 'test';
   await invokeAndTransfer('WebView.setPort', uid, port1, origin, portType);
@@ -1971,8 +1970,8 @@ const getWebViewWorkerRpc2 = async rpcInfo => {
   } = getPortTuple();
   const rpcPromise = MessagePortRpcParent.create({
     commandMap: commandMap$1,
-    messagePort: port2,
-    isMessagePortOpen: true
+    isMessagePortOpen: true,
+    messagePort: port2
   });
   // TODO
   // 1. ask extension host worker to ask renderer worker to ask renderer process to create a worker with given url
@@ -2039,11 +2038,11 @@ const proxyPorts = (port1, port2) => {
 const createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, webViewUid, origin) => {
   const rpc = await getWebViewWorkerRpc2(rpcInfo);
   const webViewInfo = {
+    origin,
+    portId: portId,
     rpc,
     webViewId: webView.id,
-    portId: portId,
-    webViewUid,
-    origin
+    webViewUid
   };
   set(portId, webViewInfo);
 
@@ -2073,8 +2072,8 @@ const createWebWorkerRpc2 = async (rpcInfo, webView, savedState, uri, portId, we
   await rpc.invoke('_WebView.create', {
     id: portId,
     savedState,
-    webViewId: webView.id,
-    uri
+    uri,
+    webViewId: webView.id
   });
 };
 
@@ -2088,8 +2087,8 @@ const getWebViewWorkerRpc = async rpcInfo => {
   } = getPortTuple();
   const rpcPromise = MessagePortRpcParent.create({
     commandMap: commandMap$1,
-    messagePort: port2,
-    isMessagePortOpen: true
+    isMessagePortOpen: true,
+    messagePort: port2
   });
   await invokeAndTransfer$2('WebView.createWebViewWorkerRpc', rpcInfo, port1);
   const rpc = await rpcPromise;
@@ -2103,11 +2102,11 @@ const createWebViewRpc$1 = async (rpcInfo, webView, savedState, uri, portId, web
   // eslint-disable-next-line @typescript-eslint/no-deprecated
   const rpc = await getWebViewWorkerRpc(rpcInfo);
   const webViewInfo = {
+    origin,
+    portId: portId,
     rpc,
     webViewId: webView.id,
-    portId: portId,
-    webViewUid,
-    origin
+    webViewUid
   };
   set(portId, webViewInfo);
   await rpc.invoke('LoadFile.loadFile', rpcInfo.url);
@@ -2123,8 +2122,8 @@ const createWebViewRpc$1 = async (rpcInfo, webView, savedState, uri, portId, web
   await rpc.invoke('_WebView.create', {
     id: portId,
     savedState,
-    webViewId: webView.id,
-    uri
+    uri,
+    webViewId: webView.id
   });
 };
 
@@ -2172,13 +2171,13 @@ const getWebViewPort = (platform, locationPort) => {
 };
 
 const create3 = async ({
+  assetDir,
   id,
-  uri,
   isGitpod,
   platform,
-  assetDir,
-  webViewScheme,
-  useNewWebViewHandler
+  uri,
+  useNewWebViewHandler,
+  webViewScheme
 }) => {
   setPlatform(platform);
   let root = '';
@@ -2199,9 +2198,9 @@ const create3 = async ({
   }
   const webView = getWebView(webViews, webViewId);
   const {
+    iframeContent,
     iframeSrc,
-    webViewRoot,
-    iframeContent
+    webViewRoot
   } = iframeResult;
   const frameAncestors = getWebViewFrameAncestors(locationProtocol, locationHost);
   const frameTitle = getWebViewTitle(webView);
@@ -2241,11 +2240,11 @@ const create3 = async ({
   }
   await createWebViewRpc(webView, savedState, uri, portId, id, origin);
   return {
+    csp: iframeCsp,
     iframeSrc,
-    sandbox,
-    portId,
     origin,
-    csp: iframeCsp
+    portId,
+    sandbox
   };
 };
 
@@ -2263,8 +2262,8 @@ const getWebViewInfo = webViewId => {
   for (const value of Object.values(rpcs)) {
     if (value.webViewId === webViewId) {
       return {
-        uid: value.webViewUid,
-        origin: value.origin
+        origin: value.origin,
+        uid: value.webViewUid
       };
     }
   }
@@ -2299,12 +2298,12 @@ const unregisterInterceptor = async id => {
 const commandMap = {
   'WebView.create2': create2,
   'WebView.create3': create3,
-  'WebView.saveState': saveState,
+  'WebView.executeExternalCommand': executeCommand,
   'WebView.getSecret': getSecret,
   'WebView.getWebViewInfo': getWebViewInfo,
   'WebView.registerInterceptor': registerInterceptor,
-  'WebView.unregisterInterceptor': unregisterInterceptor,
-  'WebView.executeExternalCommand': executeCommand
+  'WebView.saveState': saveState,
+  'WebView.unregisterInterceptor': unregisterInterceptor
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/iframe-worker",
-  "version": "5.35.0",
+  "version": "5.36.0",
   "description": "Web Worker to manage creation and lifecycle of iframes in Lvce Editor",
   "keywords": [
     "iframe"