@lvce-editor/static-server 0.77.6 → 0.77.8

package/static/{101c327 → fa4105b}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2851,7 +2851,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/101c327/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/fa4105b/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3071,9 +3071,9 @@ const getJson = async url => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/101c327' !== 'undefined') {
+  if (typeof '/fa4105b' !== 'undefined') {
     // @ts-ignore
-    return '/101c327';
+    return '/fa4105b';
   }
   if (platform === Electron) {
     return '../../../../..';

package/static/{101c327 → fa4105b}/packages/preview-sandbox-worker/dist/previewSandBoxWorkerMain.js

@@ -1066,6 +1066,7 @@ const Span$1 = 8;
 const Table$1 = 9;
 const TBody$1 = 10;
 const Td$1 = 11;
+const Text = 12;
 const Th$1 = 13;
 const THead$1 = 14;
 const Tr$1 = 15;
@@ -1177,8 +1178,6 @@ const set$1 = (uid, instance) => {
   states$1.set(uid, instance);
 };
 
-const Text = 12;
-
 const text = data => {
   return {
     childCount: 0,

package/static/{101c327 → fa4105b}/packages/preview-worker/dist/previewWorkerMain.js

@@ -1055,9 +1055,6 @@ const create$3 = async ({
   return rpc;
 };
 
-const EditorWorker = 99;
-const RendererWorker = 1;
-
 const createMockRpc = ({
   commandMap
 }) => {
@@ -1126,6 +1123,72 @@ const create$2 = rpcId => {
   };
 };
 
+const Button$1 = 1;
+const Div$1 = 4;
+const H1$1 = 5;
+const Input$1 = 6;
+const Span$1 = 8;
+const Table$1 = 9;
+const TBody$1 = 10;
+const Td$1 = 11;
+const Text$1 = 12;
+const Th$1 = 13;
+const THead$1 = 14;
+const Tr$1 = 15;
+const Img$1 = 17;
+const Del$1 = 21;
+const H2$1 = 22;
+const H3$1 = 23;
+const H4$1 = 24;
+const H5$1 = 25;
+const H6$1 = 26;
+const Article$1 = 27;
+const Aside$1 = 28;
+const Footer$1 = 29;
+const Header$1 = 30;
+const Nav$1 = 40;
+const Section$1 = 41;
+const Search$1 = 42;
+const Dd$1 = 43;
+const Dl$1 = 44;
+const Figcaption$1 = 45;
+const Figure$1 = 46;
+const Hr$1 = 47;
+const Li$1 = 48;
+const Ol$1 = 49;
+const P$1 = 50;
+const Pre$1 = 51;
+const A$1 = 53;
+const Abbr$1 = 54;
+const Br$1 = 55;
+const Cite$1 = 56;
+const Data$1 = 57;
+const Time$1 = 58;
+const Tfoot$1 = 59;
+const Ul$1 = 60;
+const TextArea$1 = 62;
+const Select$1 = 63;
+const Option$1 = 64;
+const Code$1 = 65;
+const Label$1 = 66;
+const Dt$1 = 67;
+const Iframe$1 = 68;
+const Style = 72;
+const Html$1 = 73;
+const Canvas$1 = 77;
+const Reference = 100;
+
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const Key = 'event.key';
+const TargetValue = 'event.target.value';
+
+const EditorWorker = 99;
+const RendererWorker = 1;
+
+const SetDom2 = 'Viewlet.setDom2';
+const SetPatches = 'Viewlet.setPatches';
+
 const {
   invoke: invoke$1,
   set: set$2
@@ -1520,6 +1583,78 @@ const isTsxUri = uri => {
   return path.endsWith('.tsx') || path.endsWith('.jsx');
 };
 
+const isBlockedScriptSrc = src => {
+  if (/^\/\//.test(src)) {
+    return true;
+  }
+  if (isAbsoluteFileSystemPath(src)) {
+    return true;
+  }
+  if (/^(?:data|javascript|blob):/i.test(src)) {
+    return true;
+  }
+  if (/^(?:file):/i.test(src)) {
+    return true;
+  }
+  return false;
+};
+
+const resolveScriptUri = (documentUri, src) => {
+  if (!src || src.startsWith('#') || isBlockedScriptSrc(src)) {
+    return '';
+  }
+  try {
+    const baseUrl = toBaseUrl(documentUri);
+    const resolved = new URL(src, baseUrl);
+    if (resolved.protocol === 'file:' && !hasScheme(documentUri)) {
+      return decodeURIComponent(resolved.pathname);
+    }
+    return resolved.href;
+  } catch {
+    return '';
+  }
+};
+
+const loadRemoteScript = async uri => {
+  const response = await fetch(uri);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch ${uri}`);
+  }
+  return response.text();
+};
+const loadLinkedScript = async (documentUri, src) => {
+  const scriptUri = resolveScriptUri(documentUri, src);
+  if (!scriptUri) {
+    return '';
+  }
+  try {
+    if (/^https?:\/\//i.test(scriptUri)) {
+      return loadRemoteScript(scriptUri);
+    }
+    return await readFile(scriptUri);
+  } catch (error) {
+    console.error(error);
+    return '';
+  }
+};
+
+const loadScriptTags = async (documentUri, scriptTags) => {
+  const scripts = [];
+  for (const scriptTag of scriptTags) {
+    if (scriptTag.type === 'inline') {
+      if (scriptTag.content.trim()) {
+        scripts.push(scriptTag.content);
+      }
+      continue;
+    }
+    const loadedScript = await loadLinkedScript(documentUri, scriptTag.src);
+    if (loadedScript.trim()) {
+      scripts.push(loadedScript);
+    }
+  }
+  return scripts;
+};
+
 const loadLinkedStyleSheet = async (documentUri, href) => {
   const stylesheetUri = resolveStylesheetUri(documentUri, href);
   if (!stylesheetUri) {
@@ -1790,11 +1925,6 @@ const loadTsx = async (state, content) => {
   }
 };
 
-const Div$2 = 4;
-const H1$2 = 5;
-const Text$1 = 12;
-const Reference = 100;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -2095,67 +2225,6 @@ const diffTree = (oldNodes, newNodes) => {
   return removeTrailingNavigationPatches(patches);
 };
 
-const Button$1 = 1;
-const Div$1 = 4;
-const H1$1 = 5;
-const Input$1 = 6;
-const Span$1 = 8;
-const Table$1 = 9;
-const TBody$1 = 10;
-const Td$1 = 11;
-const Th$1 = 13;
-const THead$1 = 14;
-const Tr$1 = 15;
-const Img$1 = 17;
-const Del$1 = 21;
-const H2$1 = 22;
-const H3$1 = 23;
-const H4$1 = 24;
-const H5$1 = 25;
-const H6$1 = 26;
-const Article$1 = 27;
-const Aside$1 = 28;
-const Footer$1 = 29;
-const Header$1 = 30;
-const Nav$1 = 40;
-const Section$1 = 41;
-const Search$1 = 42;
-const Dd$1 = 43;
-const Dl$1 = 44;
-const Figcaption$1 = 45;
-const Figure$1 = 46;
-const Hr$1 = 47;
-const Li$1 = 48;
-const Ol$1 = 49;
-const P$1 = 50;
-const Pre$1 = 51;
-const A$1 = 53;
-const Abbr$1 = 54;
-const Br$1 = 55;
-const Cite$1 = 56;
-const Data$1 = 57;
-const Time$1 = 58;
-const Tfoot$1 = 59;
-const Ul$1 = 60;
-const TextArea$1 = 62;
-const Select$1 = 63;
-const Option$1 = 64;
-const Code$1 = 65;
-const Label$1 = 66;
-const Dt$1 = 67;
-const Iframe$1 = 68;
-const Style = 72;
-const Html$1 = 73;
-const Canvas$1 = 77;
-
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const Key = 'event.key';
-const TargetValue = 'event.target.value';
-
-const SetDom2 = 'Viewlet.setDom2';
-const SetPatches = 'Viewlet.setPatches';
-
 const Div = 'div';
 const H1 = 'h1';
 const H2 = 'h2';
@@ -2821,6 +2890,7 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
   const dom = [];
   const css = [];
   const scripts = [];
+  const scriptTags = [];
   const styleSheets = [];
   const stylesheets = [];
   const root = {
@@ -2837,6 +2907,8 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
   let cssContent = ''; // Accumulate CSS content
   let captureJs = false; // Track if we're inside a script tag
   let jsContent = ''; // Accumulate JavaScript content
+  let captureScriptAttributes = false;
+  let scriptSrc = '';
   let captureStylesheetLink = false;
   let stylesheetHref = '';
   let stylesheetRel = '';
@@ -2859,16 +2931,25 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
     stylesheetHref = '';
     stylesheetRel = '';
   };
+  const setScriptAttribute = (name, value) => {
+    if (name === 'src') {
+      scriptSrc = value;
+    }
+  };
   for (const token of tokens) {
     switch (token.type) {
       case AttributeName:
-        if (skipDepth === 0 && !captureCss && !captureJs) {
+        if (captureScriptAttributes) {
+          attributeName = token.text;
+        } else if (skipDepth === 0 && !captureCss && !captureJs) {
           attributeName = token.text;
         }
         break;
       case AttributeValue:
         if (captureStylesheetLink) {
           setStylesheetAttribute(attributeName, token.text);
+        } else if (captureScriptAttributes) {
+          setScriptAttribute(attributeName, token.text);
         } else if (skipDepth === 0 && !captureCss && !captureJs && (allAllowedAttributes.has(attributeName) || useBuiltInDefaults && isDefaultAllowedAttribute(attributeName, defaultAllowedAttributes))) {
           const finalAttributeName = normalizeAttributeName(attributeName);
           current[finalAttributeName] = token.text;
@@ -2876,6 +2957,13 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
         attributeName = '';
         break;
       case ClosingAngleBracket:
+        if (captureScriptAttributes) {
+          if (attributeName) {
+            setScriptAttribute(attributeName, attributeName);
+          }
+          captureScriptAttributes = false;
+          attributeName = '';
+        }
         if (captureStylesheetLink && lastTagWasSelfClosing) {
           finalizeStylesheetLink();
         }
@@ -2921,11 +3009,22 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
           captureCss = false;
         } else if (TAGS_TO_CAPTURE_AS_JS.has(tagNameToClose)) {
           // Finished capturing JavaScript
-          if (jsContent.trim()) {
+          if (scriptSrc.trim()) {
+            scriptTags.push({
+              src: scriptSrc,
+              type: 'external'
+            });
+          } else if (jsContent.trim()) {
             scripts.push(jsContent);
+            scriptTags.push({
+              content: jsContent,
+              type: 'inline'
+            });
           }
           jsContent = '';
+          scriptSrc = '';
           captureJs = false;
+          captureScriptAttributes = false;
         } else if (tagNameToClose === 'link' && captureStylesheetLink) {
           finalizeStylesheetLink();
         } else if (TAGS_TO_SKIP_COMPLETELY.has(tagNameToClose)) {
@@ -2953,6 +3052,8 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
         else if (TAGS_TO_CAPTURE_AS_JS.has(tagNameLower)) {
           captureJs = true;
           jsContent = '';
+          scriptSrc = '';
+          captureScriptAttributes = true;
           tagStack.push(token.text);
         } else if (tagNameLower === 'link') {
           captureStylesheetLink = true;
@@ -2996,6 +3097,8 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
       case WhitespaceInsideOpeningTag:
         if (captureStylesheetLink && attributeName) {
           setStylesheetAttribute(attributeName, attributeName);
+        } else if (captureScriptAttributes && attributeName) {
+          setScriptAttribute(attributeName, attributeName);
         } else if (skipDepth === 0 && !captureCss && !captureJs &&
         // Handle boolean attributes (attributes without values)
         attributeName && (allAllowedAttributes.has(attributeName) || useBuiltInDefaults && isDefaultAllowedAttribute(attributeName, defaultAllowedAttributes))) {
@@ -3019,6 +3122,7 @@ const parseHtml = (html, allowedAttributes = [], defaultAllowedAttributes = [])
     css,
     dom,
     scripts,
+    scriptTags,
     styleSheets,
     stylesheets
   };
@@ -3033,13 +3137,14 @@ const getUpdatedStateFromContent = async (state, content) => {
   }
   const parseResult = parseHtml(content, []);
   const css = await loadStyleSheets(state.uri, parseResult.styleSheets, state.loadExternalStyleSheets, state.loadStyleElements);
+  const scripts = state.loadJavaScript ? await loadScriptTags(state.uri, parseResult.scriptTags) : [];
   return {
     ...state,
     content,
     css,
     errorMessage: '',
     parsedDom: parseResult.dom,
-    scripts: state.loadJavaScript ? parseResult.scripts : [],
+    scripts,
     styleSheets: parseResult.styleSheets
   };
 };
@@ -3201,7 +3306,7 @@ const updateContent = async (state, uri) => {
     const parseResult = parseHtml(content);
     const parsedDom = parseResult.dom;
     const css = await loadStyleSheets(uri, parseResult.styleSheets, loadExternalStyleSheets, loadStyleElements);
-    const scripts = loadJavaScript ? parseResult.scripts : [];
+    const scripts = loadJavaScript ? await loadScriptTags(uri, parseResult.scriptTags) : [];
     if (scripts.length > 0) {
       return loadScripts(state, content, css, scripts);
     }
@@ -3856,20 +3961,46 @@ const getEmptyPreviewDom = () => {
   return [{
     childCount: 1,
     className: mergeClassNames(Viewlet, Preview),
-    type: Div$2
+    type: Div$1
   }, {
     childCount: 1,
     className: Html,
-    type: Div$2
+    type: Div$1
   }, {
     childCount: 1,
-    type: H1$2
+    type: H1$1
   }, {
     text: 'No URI has been specified',
     type: Text$1
   }];
 };
 
+const getPreviewUninitializedVirtualDom = () => {
+  return [{
+    childCount: 1,
+    className: mergeClassNames(Viewlet, Preview),
+    onClick: HandleClick,
+    onInput: HandleInput,
+    onKeyDown: HandleKeydown,
+    onKeyUp: HandleKeyup,
+    onMouseDown: HandleMousedown,
+    onMouseMove: HandleMousemove,
+    onMouseUp: HandleMouseup,
+    tabIndex: 0,
+    type: Div$1
+  }, {
+    childCount: 1,
+    className: Html,
+    type: Div$1
+  }, {
+    childCount: 1,
+    type: H1$1
+  }, {
+    text: 'Edit the file on the left to get started.',
+    type: Text$1
+  }];
+};
+
 const getPreviewDom = state => {
   const {
     parsedDom,
@@ -3893,36 +4024,14 @@ const getPreviewDom = state => {
       onMouseMove: HandleMousemove,
       onMouseUp: HandleMouseup,
       tabIndex: 0,
-      type: Div$2
+      type: Div$1
     }, {
       childCount: parsedNodesChildNodeCount,
       className: Html,
-      type: Div$2
+      type: Div$1
     }, ...parsedDom];
   }
-  return [{
-    childCount: 1,
-    className: mergeClassNames(Viewlet, Preview),
-    onClick: HandleClick,
-    onInput: HandleInput,
-    onKeyDown: HandleKeydown,
-    onKeyUp: HandleKeyup,
-    onMouseDown: HandleMousedown,
-    onMouseMove: HandleMousemove,
-    onMouseUp: HandleMouseup,
-    tabIndex: 0,
-    type: Div$2
-  }, {
-    childCount: 1,
-    className: Html,
-    type: Div$2
-  }, {
-    childCount: 1,
-    type: H1$2
-  }, {
-    text: 'Edit the file on the left to get started.',
-    type: Text$1
-  }];
+  return getPreviewUninitializedVirtualDom();
 };
 
 const renderItems = (oldState, newState) => {

package/static/{101c327 → fa4105b}/packages/quick-pick-worker/dist/quickPickWorkerMain.js

@@ -2037,8 +2037,7 @@ const handleBeforeInput = (state, inputType, data, selectionStart, selectionEnd)
 };
 
 const handleBlur = async state => {
-  // TODO fix virtual dom diffing so that input isn't destroyed and loses focus when rerendering
-  // await CloseWidget.closeWidget(state.uid)
+  await closeWidget(state.uid);
   return state;
 };
 

package/static/{101c327 → fa4105b}/packages/renderer-process/dist/rendererProcessMain.js

@@ -1167,12 +1167,14 @@ const SetReferenceNodeUid = 11;
 const applyPatch = ($Element, patches, eventMap = {}, id = 0) => {
   const events = getEventListenerMap(id) || eventMap;
   let $Current = $Element;
+  let hasAppliedMutation = false;
   for (let patchIndex = 0; patchIndex < patches.length; patchIndex++) {
     const patch = patches[patchIndex];
     try {
       switch (patch.type) {
         case Add:
           add($Current, patch.nodes, events);
+          hasAppliedMutation = true;
           break;
         case NavigateChild:
           {
@@ -1217,7 +1219,11 @@ const applyPatch = ($Element, patches, eventMap = {}, id = 0) => {
               });
               return;
             }
-            $Current = $Parent.childNodes[patch.index];
+            let $Sibling = $Parent.childNodes[patch.index];
+            if (!$Sibling && !hasAppliedMutation && $Current !== $Element) {
+              $Sibling = $Element.childNodes[patch.index];
+            }
+            $Current = $Sibling;
             if (!$Current) {
               console.error('Cannot navigate to sibling: sibling not found at index', {
                 $Parent,
@@ -1230,15 +1236,19 @@ const applyPatch = ($Element, patches, eventMap = {}, id = 0) => {
           }
         case RemoveAttribute:
           removeAttribute($Current, patch.key);
+          hasAppliedMutation = true;
           break;
         case RemoveChild:
           removeChild($Current, patch.index);
+          hasAppliedMutation = true;
           break;
         case Replace:
           $Current = replace($Current, patch.nodes, events);
+          hasAppliedMutation = true;
           break;
         case SetAttribute:
           setProp($Current, patch.key, patch.value, events);
+          hasAppliedMutation = true;
           break;
         case SetReferenceNodeUid:
           {
@@ -1255,10 +1265,12 @@ const applyPatch = ($Element, patches, eventMap = {}, id = 0) => {
             // @ts-ignore
             $Current.replaceWith($NewNode);
             $Current = $NewNode;
+            hasAppliedMutation = true;
             break;
           }
         case SetText:
           setText$3($Current, patch.value);
+          hasAppliedMutation = true;
           break;
         default:
           break;
@@ -2941,7 +2953,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/101c327';
+const assetDir = '/fa4105b';
 
 const getConfiguredWorkerUrl = key => {
   if (typeof location === 'undefined' || typeof document === 'undefined') {

package/static/{101c327 → fa4105b}/packages/renderer-process/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "24.4.0",
+  "version": "24.5.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"

package/static/{101c327 → fa4105b}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -108,7 +108,7 @@ const getAssetDir$1 = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/101c327';
+    return '/fa4105b';
   }
 };
 const assetDir = getAssetDir$1();
@@ -9964,8 +9964,8 @@ const attachDebugger = async pid => {
   await invoke$B('AttachDebugger.attachDebugger', pid);
 };
 
-const version = '0.77.6';
-const commit$1 = '101c327';
+const version = '0.77.8';
+const commit$1 = 'fa4105b';
 const productNameLong = 'Lvce Editor - OSS';
 const getPid = () => {
   return invoke$B('Process.getPid');
@@ -19059,7 +19059,7 @@ const ViewletKeyBindings_ipc = {
   saveState: saveState$a
 };
 
-const commit = '101c327';
+const commit = 'fa4105b';
 
 const getDefaultTitleBarHeight = () => {
   switch (getPlatform$1()) {
@@ -21434,6 +21434,7 @@ const getSashSideBarDom = () => {
   return [{
     type: Button$1,
     className: 'Viewlet Sash SashVertical SashSideBar',
+    tabIndex: -1,
     role: 'none',
     onPointerDown: HandleSashSideBarPointerDown,
     childCount: 1
@@ -21446,6 +21447,7 @@ const getSashSecondarySideBarDom = () => {
   return [{
     type: Button$1,
     className: 'Viewlet Sash SashVertical SashSecondarySideBar',
+    tabIndex: -1,
     role: 'none',
     onPointerDown: HandleSashSecondarySideBarPointerDown,
     childCount: 1
@@ -21458,6 +21460,7 @@ const getSashPreviewDom = () => {
   return {
     type: Div,
     className: 'Viewlet Sash SashVertical',
+    tabIndex: -1,
     role: 'none',
     onPointerDown: HandleSashPreviewPointerDown
   };