@lvce-editor/static-server 0.62.5 → 0.63.2

package/static/{11f000c → 5dec7e3}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2740,7 +2740,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/11f000c/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/5dec7e3/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3018,9 +3018,9 @@ const getJson = async url => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/11f000c' !== 'undefined') {
+  if (typeof '/5dec7e3' !== 'undefined') {
     // @ts-ignore
-    return '/11f000c';
+    return '/5dec7e3';
   }
   if (platform === Electron) {
     return '../../../../..';

package/static/{11f000c → 5dec7e3}/packages/icon-theme-worker/dist/iconThemeWorkerMain.js

@@ -995,12 +995,26 @@ const WebWorkerRpcClient = {
 };
 
 const Web = 1;
+const Electron = 2;
+const Remote = 3;
 
 const Dot = '.';
+const Slash = '/';
 
 const File = '_file';
 const Folder = '_folder';
 
+const getAbsoluteIconPath = (iconTheme, icon, baseUrl) => {
+  if (!iconTheme) {
+    return '';
+  }
+  const result = iconTheme.iconDefinitions[icon];
+  if (result && baseUrl) {
+    return `${baseUrl}${result}`;
+  }
+  return '';
+};
+
 const initialIconTheme = undefined;
 
 const state$1 = {
@@ -1015,9 +1029,12 @@ const hasHttpExtensionPath = iconTheme => {
   return iconTheme.extensionPath && (iconTheme.extensionPath.startsWith('http://') || iconTheme.extensionPath.startsWith('https://'));
 };
 const setTheme = iconTheme => {
+  if (!iconTheme) {
+    return;
+  }
   state$1.iconTheme = iconTheme.json;
   state$1.extensionPath = iconTheme.extensionPath;
-  state$1.extensionBaseUrl = iconTheme.extensionBaseUrl;
+  state$1.extensionBaseUrl = iconTheme.extensionRemoteUri || iconTheme.extensionBaseUrl;
   if (!state$1.extensionBaseUrl && hasHttpExtensionPath(iconTheme)) {
     state$1.extensionBaseUrl = iconTheme.extensionPath;
   }
@@ -1029,18 +1046,6 @@ const getIconTheme = () => {
   return state$1.iconTheme;
 };
 
-const getAbsoluteIconPath = (iconTheme, icon) => {
-  if (!iconTheme) {
-    return '';
-  }
-  const result = iconTheme.iconDefinitions[icon];
-  const baseUrl = getExtensionBaseUrl();
-  if (result && baseUrl) {
-    return `${baseUrl}${result}`;
-  }
-  return '';
-};
-
 const getFileExtensionIndex = file => {
   string(file);
   return file.lastIndexOf(Dot);
@@ -1084,51 +1089,55 @@ const getLanguageId = fileName => {
 };
 
 const getFileIconFromFileNames = (iconTheme, fileNameLower) => {
+  const baseUrl = getExtensionBaseUrl();
   if (iconTheme.fileNames) {
     const fileNameIcon = iconTheme.fileNames[fileNameLower];
     if (fileNameIcon) {
-      return getAbsoluteIconPath(iconTheme, fileNameIcon);
+      return getAbsoluteIconPath(iconTheme, fileNameIcon, baseUrl);
     }
   }
   return '';
 };
 const getFileIconFromFileExtensions = (iconTheme, fileNameLower) => {
+  const baseUrl = getExtensionBaseUrl();
   if (iconTheme.fileExtensions) {
     let index = -1;
     while ((index = fileNameLower.indexOf(Dot, index + 1)) !== -1) {
       const shorterExtension = fileNameLower.slice(index + 1);
       const extensionIcon = iconTheme.fileExtensions[shorterExtension];
       if (extensionIcon) {
-        return getAbsoluteIconPath(iconTheme, extensionIcon);
+        return getAbsoluteIconPath(iconTheme, extensionIcon, baseUrl);
       }
     }
   }
   return '';
 };
 const getFileIconFromLanguageIds = (iconTheme, fileNameLower) => {
+  const baseUrl = getExtensionBaseUrl();
   if (iconTheme.languageIds) {
     const languageId = getLanguageId(fileNameLower);
     const languageIcon = iconTheme.languageIds[languageId];
     if (languageId === 'jsx' && fileNameLower.endsWith('.js')) {
       const alternativeFileIcon = iconTheme.languageIds.javascript;
       if (alternativeFileIcon) {
-        return getAbsoluteIconPath(iconTheme, alternativeFileIcon);
+        return getAbsoluteIconPath(iconTheme, alternativeFileIcon, baseUrl);
       }
     }
     if (languageIcon) {
-      return getAbsoluteIconPath(iconTheme, languageIcon);
+      return getAbsoluteIconPath(iconTheme, languageIcon, baseUrl);
     }
   }
   return '';
 };
 const getFileNameIcon = file => {
   string(file);
+  const baseUrl = getExtensionBaseUrl();
   const iconTheme = getIconTheme();
   const fileNameLower = file.toLowerCase();
   if (!iconTheme) {
     return '';
   }
-  return getFileIconFromFileNames(iconTheme, fileNameLower) || getFileIconFromFileExtensions(iconTheme, fileNameLower) || getFileIconFromLanguageIds(iconTheme, fileNameLower) || getAbsoluteIconPath(iconTheme, File);
+  return getFileIconFromFileNames(iconTheme, fileNameLower) || getFileIconFromFileExtensions(iconTheme, fileNameLower) || getFileIconFromLanguageIds(iconTheme, fileNameLower) || getAbsoluteIconPath(iconTheme, File, baseUrl);
 };
 const getFileIcon = file => {
   return getFileNameIcon(file.name);
@@ -1138,25 +1147,27 @@ const getFolderNameIcon = folderName => {
   if (!iconTheme || !iconTheme.iconDefinitions) {
     return '';
   }
+  const baseUrl = getExtensionBaseUrl();
   const {
     iconDefinitions,
     folderNames
   } = iconTheme;
   if (folderNames) {
     const folderNameLower = folderName.toLowerCase();
-    const folderIcon = iconTheme.folderNames[folderNameLower];
+    const folderIcon = folderNames[folderNameLower];
     if (folderIcon) {
-      return getAbsoluteIconPath(iconTheme, folderIcon);
+      return getAbsoluteIconPath(iconTheme, folderIcon, baseUrl);
     }
   }
   if (iconDefinitions[Folder]) {
-    return getAbsoluteIconPath(iconTheme, Folder);
+    return getAbsoluteIconPath(iconTheme, Folder, baseUrl);
   }
   return '';
 };
 const getFolderIcon = folder => {
   return getFolderNameIcon(folder.name);
 };
+
 const getIcons = iconRequests => {
   const Folder = 2;
   const icons = iconRequests.map(request => {
@@ -1172,16 +1183,29 @@ const getIcons = iconRequests => {
   return icons;
 };
 
+// TODO for electron use `/file` urls
+
+const getExtensionRemoteUri = (extensionUri, extensionPath, platform) => {
+  if (platform === Remote || platform === Electron && extensionUri && extensionUri.startsWith('file://')) {
+    const rest = extensionUri.slice('file://'.length);
+    const remoteUrl = `/remote${rest}`;
+    return remoteUrl;
+  }
+  return extensionUri || extensionPath || '';
+};
+
 // TODO handle case when extension json or properties are invalid / unexpected
-const findMatchingIconThemeExtension = (extensions, iconThemeId) => {
+const findMatchingIconThemeExtension = (extensions, iconThemeId, platform) => {
   for (const extension of extensions) {
     if (extension && extension.iconThemes) {
       for (const iconTheme of extension.iconThemes) {
         if (iconTheme.id === iconThemeId) {
+          const extensionRemoteUri = getExtensionRemoteUri(extension.uri, extension.path, platform);
           return {
             ...iconTheme,
             extensionPath: extension.path,
-            extensionUri: extension.uri
+            extensionUri: extension.uri,
+            extensionRemoteUri
           };
         }
       }
@@ -1190,6 +1214,24 @@ const findMatchingIconThemeExtension = (extensions, iconThemeId) => {
   return undefined;
 };
 
+const joinPath = (...parts) => {
+  let merged = '';
+  for (const part of parts) {
+    if (merged.endsWith(Slash) && part.startsWith(Slash)) {
+      merged += part.slice(1);
+    } else if (!merged.endsWith(Slash) && !part.startsWith(Slash)) {
+      merged += Slash + part;
+    } else {
+      merged += part;
+    }
+  }
+  return merged;
+};
+
+const getIconThemeJsonUrl = iconThemeExtension => {
+  return joinPath(iconThemeExtension.extensionRemoteUri, iconThemeExtension.path);
+};
+
 const getIconThemeUrl = (assetDir, iconThemeId) => {
   return `${assetDir}/extensions/builtin.${iconThemeId}/icon-theme.json`;
 };
@@ -1212,19 +1254,24 @@ const doGetIconThemeJson = async (extensions, iconThemeId, assetDir, platform) =
     const url = getIconThemeUrl(assetDir, iconThemeId);
     const json = await getJson(url);
     return {
-      json,
+      extensionBaseUrl: `${assetDir}/extensions/builtin.${iconThemeId}`,
+      extensionRemoteUri: `${assetDir}/extensions/builtin.${iconThemeId}`,
       extensionPath: `${assetDir}/extensions/builtin.${iconThemeId}`,
-      extensionBaseUrl: `${assetDir}/extensions/builtin.${iconThemeId}`
+      extensionUri: `${assetDir}/extensions/builtin.${iconThemeId}`,
+      json
     };
   }
-  const iconTheme = findMatchingIconThemeExtension(extensions, iconThemeId);
+  const iconTheme = findMatchingIconThemeExtension(extensions, iconThemeId, platform);
   if (!iconTheme) {
     return undefined;
   }
-  const iconThemePath = `${iconTheme.extensionPath}/${iconTheme.path}`;
-  const iconThemeJson = await getJson(iconThemePath);
+  const iconThemeUrl = getIconThemeJsonUrl(iconTheme);
+  const iconThemeJson = await getJson(iconThemeUrl);
   return {
     extensionPath: iconTheme.extensionPath,
+    extensionRemoteUri: iconTheme.extensionRemoteUri || '',
+    extensionUri: iconTheme.extensionUri || '',
+    extensionBaseUrl: iconTheme.extensionRemoteUri || '',
     json: iconThemeJson
   };
 };

package/static/{11f000c → 5dec7e3}/packages/renderer-process/dist/rendererProcessMain.js

@@ -2619,7 +2619,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/11f000c';
+const assetDir = '/5dec7e3';
 
 const getConfiguredWorkerUrl = key => {
   if (typeof location === 'undefined' || typeof document === 'undefined') {

package/static/{11f000c → 5dec7e3}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -96,7 +96,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/11f000c';
+    return '/5dec7e3';
   }
 };
 const assetDir = getAssetDir();
@@ -19904,15 +19904,18 @@ const toggle = (state, module, moduleId) => {
   return show$4(state, module);
 };
 const showSideBar = state => {
+  // @ts-ignore
   return show$4(state, SideBar);
 };
 const hideSideBar = state => {
   return hide$2(state, SideBar);
 };
 const toggleSideBar = state => {
+  // @ts-ignore
   return toggle(state, SideBar);
 };
 const showPanel = state => {
+  // @ts-ignore
   return show$4(state, Panel);
 };
 const hidePanel$1 = state => {
@@ -19922,48 +19925,58 @@ const togglePanel = (state, moduleId = None$b) => {
   return toggle(state, Panel);
 };
 const showActivityBar = state => {
+  // @ts-ignore
   return show$4(state, ActivityBar);
 };
 const hideActivityBar = state => {
   return hide$2(state, ActivityBar);
 };
 const toggleActivityBar = state => {
+  // @ts-ignore
   return toggle(state, ActivityBar);
 };
 const showStatusBar = state => {
+  // @ts-ignore
   return show$4(state, StatusBar);
 };
 const hideStatusBar = state => {
   return hide$2(state, StatusBar);
 };
 const toggleStatusBar = state => {
+  // @ts-ignore
   return toggle(state, StatusBar);
 };
 const showPreview = state => {
+  // @ts-ignore
   return show$4(state, Preview$1);
 };
 const hidePreview = state => {
   return hide$2(state, Preview$1);
 };
 const togglePreview = state => {
+  // @ts-ignore
   return toggle(state, Preview$1);
 };
 const showTitleBar = state => {
+  // @ts-ignore
   return show$4(state, TitleBar);
 };
 const hideTitleBar = state => {
   return hide$2(state, TitleBar);
 };
 const toggleTitleBar = state => {
+  // @ts-ignore
   return toggle(state, TitleBar);
 };
 const showMain = state => {
+  // @ts-ignore
   return show$4(state, Main$1);
 };
 const hideMain = state => {
   return hide$2(state, Main$1);
 };
 const toggleMain = state => {
+  // @ts-ignore
   return toggle(state, Main$1);
 };
 const getReferenceNodes = sideBarLocation => {
@@ -20014,6 +20027,7 @@ const loadIfVisible = async (state, module) => {
       }, false, true);
       if (commands) {
         const referenceNodes = getReferenceNodes(sideBarLocation);
+        // @ts-ignore
         commands.push(['Viewlet.append', parentUid, childUid, referenceNodes]);
       }
     }
@@ -20187,7 +20201,9 @@ const getResizeCommands = async (oldPoints, newPoints) => {
         width: newWidth,
         height: newHeight
       });
+      // @ts-ignore
       commands.push(...resizeCommands);
+      // @ts-ignore
       commands.push(['Viewlet.setBounds', instanceUid, newLeft, newTop, newWidth, newHeight]);
     }
   }
@@ -20201,6 +20217,7 @@ const getFocusChangeCommands = isFocused => {
       moduleId
     } = module;
     const focusChangeCommands = handleFocusChange$3(moduleId, isFocused);
+    // @ts-ignore
     commands.push(...focusChangeCommands);
   }
   return commands;
@@ -20278,10 +20295,12 @@ const handleSashPointerMove = async (state, x, y) => {
       if (newPoints[kVisible]) {
         showAsync(uid, newPoints, module); // TODO avoid side effect
         const commands = showPlaceholder(uid, newPoints, module);
+        // @ts-ignore
         allCommands.push(commands);
       } else {
         await saveViewletState(moduleId);
         const commands = disposeFunctional(moduleId);
+        // @ts-ignore
         allCommands.push(...commands);
       }
     }
@@ -20440,6 +20459,7 @@ const getInitialPlaceholderCommands = state => {
       moduleId
     } = module;
     if (points[kVisible]) {
+      // @ts-ignore
       commands.push(['Viewlet.createPlaceholder', moduleId, uid, points[kTop], points[kLeft], points[kWidth], points[kHeight]]);
     }
   }
@@ -20975,20 +20995,23 @@ const getDom = id => {
     childCount: 0
   }];
 };
-const getActivityBarCommands = (oldState, newState, commands, contentAppendIds) => {
-  if (oldState.activityBarVisible && !newState.activityBarVisible) {
-    commands.push(['Viewlet.remove', newState.activityBarId]);
-    return;
+const renderComponent = (kVisible, kId, oldState, newState, commands, appendIds) => {
+  if (oldState[kVisible] && !newState[kVisible]) {
+    commands.push(['Viewlet.remove', newState[kId]]);
   }
-  if (!oldState.activityBarVisible && newState.activityBarVisible) {
-    commands.push(['Viewlet.createFunctionalRoot', `${newState.activityBarId}`, newState.activityBarId, true]);
-    const dom = getDom(newState.activityBarId);
-    commands.push(['Viewlet.setDom2', newState.activityBarId, dom]);
+  if (!oldState[kVisible] && newState[kVisible]) {
+    commands.push(['Viewlet.create', newState[kId]]);
+    const dom = getDom(newState[kId]);
+    commands.push(['Viewlet.setDom2', newState[kId], dom]);
+    return;
   }
-  if (newState.activityBarVisible) {
-    contentAppendIds.push(newState.activityBarId);
+  if (newState[kId]) {
+    appendIds.push(newState[kId]);
   }
 };
+const getActivityBarCommands = (oldState, newState, commands, contentAppendIds) => {
+  return renderComponent('activityBarVisible', 'activityBarId', oldState, newState, commands, contentAppendIds);
+};
 const getSideBarSashCommands = (oldState, newState, commands, contentAppendIds) => {
   if (oldState.sideBarSashVisible && !newState.sideBarSashVisible) {
     commands.push(['Viewlet.remove', newState.sideBarSashId]);
@@ -21008,18 +21031,10 @@ const getSideBarSashCommands = (oldState, newState, commands, contentAppendIds)
   }
 };
 const getSideBarCommands = (oldState, newState, commands, contentAppendIds) => {
-  if (oldState.sideBarVisible && !newState.sideBarVisible) {
-    commands.push(['Viewlet.remove', newState.sideBarId]);
-    return;
-  }
-  if (!oldState.sideBarVisible && newState.sideBarVisible) {
-    commands.push(['Viewlet.createFunctionalRoot', `${newState.sideBarId}`, newState.sideBarId, true]);
-    const dom = getDom(newState.sideBarId);
-    commands.push(['Viewlet.setDom2', newState.sideBarId, dom]);
-  }
-  if (newState.sideBarVisible) {
-    contentAppendIds.push(newState.sideBarId);
-  }
+  return renderComponent('sideBarVisible', 'sideBarId', oldState, newState, commands, contentAppendIds);
+};
+const getMainCommands = (oldState, newState, commands, mainContentsAppendIds) => {
+  return renderComponent('mainVisible', 'mainId', oldState, newState, commands, mainContentsAppendIds);
 };
 const getPanelSashCommands = (oldState, newState, commands, contentAppendIds) => {
   if (oldState.panelSashVisible && !newState.panelSashVisible) {
@@ -21036,32 +21051,7 @@ const getPanelSashCommands = (oldState, newState, commands, contentAppendIds) =>
   }
 };
 const getPanelCommands = (oldState, newState, commands, mainContentsAppendIds) => {
-  if (oldState.panelVisible && !newState.panelVisible) {
-    commands.push(['Viewlet.remove', newState.panelId]);
-    return;
-  }
-  if (!oldState.panelVisible && newState.panelVisible) {
-    commands.push(['Viewlet.createFunctionalRoot', `${newState.panelId}`, newState.panelId, true]);
-    const dom = getDom(newState.panelId);
-    commands.push(['Viewlet.setDom2', newState.panelId, dom]);
-  }
-  if (newState.panelVisible) {
-    mainContentsAppendIds.push(newState.panelId);
-  }
-};
-const getMainCommands = (oldState, newState, commands, mainContentsAppendIds) => {
-  if (oldState.mainVisible && !newState.mainVisible) {
-    commands.push(['Viewlet.remove', newState.mainId]);
-    return;
-  }
-  if (!oldState.mainVisible && newState.mainVisible) {
-    commands.push(['Viewlet.createFunctionalRoot', `${newState.mainId}`, newState.mainId, true]);
-    const dom = getDom(newState.mainId);
-    commands.push(['Viewlet.setDom2', newState.mainId, dom]);
-  }
-  if (newState.mainVisible) {
-    mainContentsAppendIds.push(newState.mainId);
-  }
+  return renderComponent('panelVisible', 'panelId', oldState, newState, commands, mainContentsAppendIds);
 };
 const getMainContentsCommands = (oldState, newState, commands, contentAppendIds) => {
   if (oldState.mainContentsVisible && !newState.mainContentsVisible) {
@@ -21087,18 +21077,7 @@ const getMainContentsCommands = (oldState, newState, commands, contentAppendIds)
   }
 };
 const getTitleBarCommands = (oldState, newState, commands, workbenchAppendIds) => {
-  if (oldState.titleBarVisible && !newState.titleBarVisible) {
-    commands.push(['Viewlet.remove', newState.titleBarId]);
-    return;
-  }
-  if (!oldState.titleBarVisible && newState.titleBarVisible) {
-    commands.push(['Viewlet.createFunctionalRoot', `${newState.titleBarId}`, newState.titleBarId, true]);
-    const dom = getDom(newState.titleBarId);
-    commands.push(['Viewlet.setDom2', newState.titleBarId, dom]);
-  }
-  if (newState.titleBarVisible) {
-    workbenchAppendIds.push(newState.titleBarId);
-  }
+  return renderComponent('titleBarVisible', 'titleBarId', oldState, newState, commands, workbenchAppendIds);
 };
 const getContentCommands = (oldState, newState, commands, workbenchAppendIds) => {
   // TODO support secondary side bar / chat view
@@ -21129,18 +21108,7 @@ const getContentCommands = (oldState, newState, commands, workbenchAppendIds) =>
   }
 };
 const getStatusBarCommands = (oldState, newState, commands, workbenchAppendIds) => {
-  if (oldState.statusBarVisible && !newState.statusBarVisible) {
-    commands.push(['Viewlet.remove', newState.statusBarId]);
-    return;
-  }
-  if (!oldState.statusBarVisible && newState.statusBarVisible) {
-    commands.push(['Viewlet.createFunctionalRoot', `${newState.statusBarId}`, newState.statusBarId, true]);
-    const dom = getDom(newState.statusBarId);
-    commands.push(['Viewlet.setDom2', newState.statusBarId, dom]);
-  }
-  if (newState.statusBarVisible) {
-    workbenchAppendIds.push(newState.statusBarId);
-  }
+  return renderComponent('statusBarVisible', 'statusBarId', oldState, newState, commands, workbenchAppendIds);
 };
 const getWorkbenchCommands = (oldState, newState, commands, workbenchAppendIds) => {
   if (!oldState.workbenchVisible && newState.workbenchVisible) {

package/static/index.html

@@ -6,9 +6,9 @@
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <meta name="theme-color" content="#282e2f" />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/11f000c/css/App.css" />
-    <link rel="manifest" href="/11f000c/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/11f000c/icons/pwa-icon-192.png" />
-    <script type="module" src="/11f000c/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/5dec7e3/css/App.css" />
+    <link rel="manifest" href="/5dec7e3/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/5dec7e3/icons/pwa-icon-192.png" />
+    <script type="module" src="/5dec7e3/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>