@lvce-editor/static-server 0.61.5 → 0.61.7

package/static/{98093b2 → fc03244}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -96,7 +96,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/98093b2';
+    return '/fc03244';
   }
 };
 const assetDir = getAssetDir();
@@ -2395,9 +2395,50 @@ const getTestFilePath = async href => {
   return jsPath;
 };
 
+const getConfiguredWorkerUrl$l = (preferenceKey, fallback) => {
+  let configuredWorkerUrl = get$f(preferenceKey) || '';
+  if (configuredWorkerUrl) {
+    configuredWorkerUrl = '/remote' + configuredWorkerUrl;
+  }
+  configuredWorkerUrl = configuredWorkerUrl || fallback;
+  {
+    configuredWorkerUrl = fallback;
+  }
+  return configuredWorkerUrl;
+};
+
+const state$y = {
+  ipc: undefined
+};
+const get$d = () => {
+  return state$y.ipc;
+};
+const set$d = ipc => {
+  state$y.ipc = ipc;
+};
+
+const testWorkerUrl = `${assetDir}/packages/test-worker/dist/testWorkerMain.js`;
+
+const launchTestWorker = async () => {
+  const configuredWorkerUrl = getConfiguredWorkerUrl$l('develop.testWorkerPath', testWorkerUrl);
+  const ipc = await create$14({
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    url: configuredWorkerUrl,
+    name: 'Test Worker'
+  });
+  handleIpc(ipc);
+  set$d(ipc);
+  return ipc;
+};
+
+const execute$3 = async href => {
+  const ipc = await launchTestWorker();
+  await invoke$s(ipc, 'Test.execute', href, platform);
+};
+
 const executeCurrentTest = async initData => {
   const jsPath = await getTestFilePath(initData.Location.href);
-  await execute$4('Test.execute', jsPath);
+  await execute$3(jsPath);
 };
 
 const map$2 = {
@@ -2450,25 +2491,25 @@ const contexts = Object.create(null);
 // e.g. map 'focus.explorer' -> 2
 // Context.get(1), Context.get(2)
 
-const get$d = key => {
+const get$c = key => {
   return contexts[key];
 };
-const set$d = (key, value) => {
+const set$c = (key, value) => {
   contexts[key] = value;
 };
 const remove$9 = key => {
   delete contexts[key];
 };
 
-const state$y = {
+const state$x = {
   // TODO use numeric focus key
   currentFocus: ''
 };
-const get$c = () => {
-  return state$y.currentFocus;
+const get$b = () => {
+  return state$x.currentFocus;
 };
-const set$c = value => {
-  state$y.currentFocus = value;
+const set$b = value => {
+  state$x.currentFocus = value;
 };
 
 const warn = (...args) => {
@@ -2478,7 +2519,7 @@ const error = (...args) => {
   console.error(...args);
 };
 
-const state$x = {
+const state$w = {
   keyBindingSets: Object.create(null),
   /**
    * @type {Uint32Array}
@@ -2490,7 +2531,7 @@ const state$x = {
   matchingKeyBindings: []
 };
 const getKeyBinding = identifier => {
-  for (const keyBinding of state$x.matchingKeyBindings) {
+  for (const keyBinding of state$w.matchingKeyBindings) {
     if (keyBinding.key === identifier) {
       return keyBinding;
     }
@@ -2504,7 +2545,7 @@ const matchesContext = keyBinding => {
   if (!keyBinding.when) {
     return true;
   }
-  return get$d(keyBinding.when);
+  return get$c(keyBinding.when);
 };
 const getMatchingKeyBindings = keyBindingSets => {
   return Object.values(keyBindingSets).reverse().flat(1).filter(matchesContext);
@@ -2513,26 +2554,26 @@ const getAvailableKeyBindings = keyBindings => {
   return new Uint32Array(keyBindings.map(getKey$1));
 };
 const update = () => {
-  const matchingKeyBindings = getMatchingKeyBindings(state$x.keyBindingSets);
+  const matchingKeyBindings = getMatchingKeyBindings(state$w.keyBindingSets);
   const keyBindingIdentifiers = getAvailableKeyBindings(matchingKeyBindings);
   invoke$r('KeyBindings.setIdentifiers', keyBindingIdentifiers);
-  state$x.matchingKeyBindings = matchingKeyBindings;
-  state$x.keyBindingIdentifiers = keyBindingIdentifiers;
+  state$w.matchingKeyBindings = matchingKeyBindings;
+  state$w.keyBindingIdentifiers = keyBindingIdentifiers;
 };
 const addKeyBindings$1 = (id, keyBindings) => {
   string(id);
   array(keyBindings);
-  if (id in state$x.keyBindingSets) {
+  if (id in state$w.keyBindingSets) {
     warn(`cannot add keybindings multiple times: ${id}`);
     return;
   }
-  state$x.keyBindingSets[id] = keyBindings;
+  state$w.keyBindingSets[id] = keyBindings;
   update();
 };
 const removeKeyBindings = id => {
   const {
     keyBindingSets
-  } = state$x;
+  } = state$w;
   if (!(id in keyBindingSets)) {
     warn(`cannot remove keybindings that are not registered: ${id}`);
     return;
@@ -2564,11 +2605,11 @@ const FocusConfirm = 40;
  */
 const setFocus = focusKey => {
   number(focusKey);
-  if (get$c()) {
-    remove$9(get$c());
+  if (get$b()) {
+    remove$9(get$b());
   }
-  set$c(focusKey);
-  set$d(get$c(), true);
+  set$b(focusKey);
+  set$c(get$b(), true);
   update();
 };
 
@@ -2576,7 +2617,7 @@ const setFocus = focusKey => {
  * @param {number} key
  */
 const setAdditionalFocus = key => {
-  set$d(key, true);
+  set$c(key, true);
   update();
 };
 
@@ -2604,7 +2645,7 @@ const hydrate$6 = async () => {
   // maybe in env file / env service
   const browser = getBrowser();
   const key = getBrowserContextString(browser);
-  set$d(key, true);
+  set$c(key, true);
   update();
 };
 
@@ -2704,14 +2745,14 @@ class CancelationError extends Error {
   }
 }
 
-const state$w = {
+const state$v = {
   idMap: Object.create(null)
 };
 const register$1 = (id, module) => {
-  state$w.idMap[id] = module;
+  state$v.idMap[id] = module;
 };
-const get$b = id => {
-  return state$w.idMap[id];
+const get$a = id => {
+  return state$v.idMap[id];
 };
 
 const registry = Object.create(null);
@@ -2721,7 +2762,7 @@ const add$2 = (uid, mouseActions) => {
 const matchesMouseAction = (item, button, modifiers) => {
   return item.button === button && Boolean(item.modifiers.ctrl) === modifiers.ctrl && Boolean(item.modifiers.shift) === modifiers.shift;
 };
-const get$a = (uid, button, modifiers) => {
+const get$9 = (uid, button, modifiers) => {
   const items = registry[uid];
   for (const item of items) {
     if (matchesMouseAction(item, button, modifiers)) {
@@ -2831,18 +2872,35 @@ const serializeInstances = async instances => {
   return serialized;
 };
 
-const state$v = {
+// TODO instances should be keyed by numeric id
+// to allow having multiple instances of the same
+// type. for example multiple editors
+
+const state$u = {
   instances: Object.create(null)};
-const set$b = (key, value) => {
+const set$a = (key, value) => {
   // TODO separate factories from state
   object(value);
   object(value.factory);
   object(value.state);
   object(value.renderedState);
-  state$v.instances[key] = value;
+  state$u.instances[key] = value;
+};
+const getByUid = uid => {
+  console.log({
+    instances: {
+      ...state$u.instances
+    }
+  });
+  for (const value of Object.values(state$u.instances)) {
+    if (value.renderedState.uid === uid) {
+      return value;
+    }
+  }
+  return undefined;
 };
 const getInstance = key => {
-  const fast = state$v.instances[key];
+  const fast = state$u.instances[key];
   if (fast) {
     return fast;
   }
@@ -2855,7 +2913,7 @@ const getInstance = key => {
   if (key === 'EditorCompletion') {
     key = 'Editor';
   }
-  for (const value of Object.values(state$v.instances)) {
+  for (const value of Object.values(state$u.instances)) {
     if (value.moduleId === key) {
       return value;
     }
@@ -2863,16 +2921,16 @@ const getInstance = key => {
   return undefined;
 };
 const hasInstance = key => {
-  return key in state$v.instances;
+  return key in state$u.instances;
 };
 const remove$8 = key => {
-  delete state$v.instances[key];
+  delete state$u.instances[key];
 };
 const getAllInstances = () => {
-  return state$v.instances;
+  return state$u.instances;
 };
 const getValues = () => {
-  return Object.values(state$v.instances);
+  return Object.values(state$u.instances);
 };
 const getState$1 = key => {
   const instance = getInstance(key);
@@ -3031,7 +3089,7 @@ const ViewletManagerVisitorCss = {
 
 const fileSearchWorkerUrl = `${assetDir}/packages/file-search-worker/dist/fileSearchWorkerMain.js`;
 
-const getConfiguredWorkerUrl$l = () => {
+const getConfiguredWorkerUrl$k = () => {
   let configuredWorkerUrl = get$f('develop.fileSearchWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -3047,7 +3105,7 @@ const launchFileSearchWorker = async () => {
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
-    url: getConfiguredWorkerUrl$l()
+    url: getConfiguredWorkerUrl$k()
   });
   handleIpc(ipc);
   return ipc;
@@ -3056,17 +3114,17 @@ const launchFileSearchWorker = async () => {
 const {
   invoke: invoke$n} = getOrCreateWorker(launchFileSearchWorker);
 
-const state$u = {
+const state$t = {
   /**
    * @type {any[]}
    */
   menuEntries: []
 };
 const getAll = () => {
-  return state$u.menuEntries;
+  return state$t.menuEntries;
 };
 const add$1 = async menuEntries => {
-  state$u.menuEntries = [...state$u.menuEntries, ...menuEntries];
+  state$t.menuEntries = [...state$t.menuEntries, ...menuEntries];
   // TODO store menu entries here or in file search worker?
   // Usually don't want to start worker for the menu entries
   // But also quickpick menu entries would be better stored there
@@ -3220,7 +3278,7 @@ const ViewletModuleId = {
 };
 
 // @ts-nocheck
-const state$t = {
+const state$s = {
   pendingModules: Object.create(null)
 };
 const ViewletState = {
@@ -3554,10 +3612,10 @@ const actuallyLoadModule = async (getModule, id) => {
   return module;
 };
 const loadModule = (getModule, id) => {
-  if (!(id in state$t.pendingModules)) {
-    state$t.pendingModules[id] = actuallyLoadModule(getModule, id);
+  if (!(id in state$s.pendingModules)) {
+    state$s.pendingModules[id] = actuallyLoadModule(getModule, id);
   }
-  return state$t.pendingModules[id];
+  return state$s.pendingModules[id];
 };
 
 // TODO add lots of unit tests for this
@@ -3597,6 +3655,7 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
     console.log('viewlet must be empty');
     throw new Error('viewlet must be empty');
   }
+  const shouldRender = viewlet.render ?? true;
   let state = ViewletState.Default;
   // @ts-ignore
   const viewletUid = viewlet.uid || create$13();
@@ -3700,7 +3759,7 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
     }
     // TODO race condition: viewlet state may have been updated again in the mean time
     state = ViewletState.RendererProcessViewletLoaded;
-    set$b(viewletUid, {
+    set$a(viewletUid, {
       state: newState,
       renderedState: viewletState,
       factory: module,
@@ -3722,7 +3781,7 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
     }
     const instanceNow = getInstance(viewletUid);
     viewletState = instanceNow.renderedState;
-    if (module.hasFunctionalRender) {
+    if (module.hasFunctionalRender && shouldRender) {
       const renderCommands = getRenderCommands(module, viewletState, newState, viewletUid, parentUid);
       setRenderedState(viewletUid, newState);
       commands.push(...renderCommands);
@@ -3751,7 +3810,7 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
       commands.push(...extraCommands);
       updateDynamicFocusContext(commands);
       await invoke$r(/* Viewlet.sendMultiple */kSendMultiple, /* commands */commands);
-    } else {
+    } else if (!module.hasFunctionalEvents && shouldRender) {
       const allCommands = [...commands, ...extraCommands
       // ['Viewlet.show', viewlet.id],
       ];
@@ -3829,7 +3888,8 @@ const load$6 = async (viewlet, focus = false, restore = false, restoreState = un
   // console.timeEnd(`load/${viewlet.id}`)
 };
 const render$J = (module, oldState, newState, uid = newState.uid || module.name, parentUid = newState.parentUid) => {
-  return getRenderCommands(module, oldState, newState, uid, parentUid);
+  const commands = getRenderCommands(module, oldState, newState, uid, parentUid);
+  return commands;
 };
 
 const map$1 = Object.create(null);
@@ -3881,15 +3941,15 @@ const handleKeyBinding$1 = async identifier => {
   // }
 };
 
-const state$s = {
+const state$r = {
   isQuickPickOpen: false
 };
 const isQuickPickOpen = () => {
-  return state$s.isQuickPickOpen;
+  return state$r.isQuickPickOpen;
 };
 const closeWidgetElectronQuickPick = async () => {
   const id = QuickPick;
-  state$s.isQuickPickOpen = false;
+  state$r.isQuickPickOpen = false;
   remove$8(id);
   await disposeBrowserViewQuickPick();
   // TODO restore focus to previously focused element
@@ -4321,7 +4381,7 @@ const handleIconThemeChange$1 = async () => {
 
 const iconThemeWorkerUrl = `${assetDir}/packages/icon-theme-worker/dist/iconThemeWorkerMain.js`;
 
-const getConfiguredWorkerUrl$k = () => {
+const getConfiguredWorkerUrl$j = () => {
   let configuredWorkerUrl = get$f('develop.iconThemeWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -4337,7 +4397,7 @@ const launchIconThemeWorker = async () => {
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
-    url: getConfiguredWorkerUrl$k()
+    url: getConfiguredWorkerUrl$j()
   });
   handleIpc(ipc);
   return ipc;
@@ -4496,7 +4556,7 @@ const create$10 = (rawLines, loc, opts = {}) => {
   return frame;
 };
 
-const state$r = {
+const state$q = {
   /**
    * @type {any[]}
    */
@@ -4523,7 +4583,7 @@ const getLanguageConfigurationPathFromExtensions = (extensions, languageId) => {
   return '';
 };
 const getLanguageConfigurationFromWebExtension = async languageId => {
-  const languageConfigurationPath = getLanguageConfigurationPathFromExtensions(state$r.webExtensions, languageId);
+  const languageConfigurationPath = getLanguageConfigurationPathFromExtensions(state$q.webExtensions, languageId);
   if (!languageConfigurationPath) {
     return undefined;
   }
@@ -4578,7 +4638,7 @@ const splitLines = lines => {
 
 // TODO merge all of this with extension host languages module
 
-const state$q = {
+const state$p = {
   isHydrating: false,
   fileNameMap: Object.create(null),
   extensionMap: Object.create(null),
@@ -4593,53 +4653,53 @@ const state$q = {
   hasWarned: []
 };
 const getFirstLines = () => {
-  return state$q.firstLines;
+  return state$p.firstLines;
 };
 const hasLanguageByExtension = extension => {
-  return extension in state$q.extensionMap;
+  return extension in state$p.extensionMap;
 };
 const getLanguageByExtension = extension => {
-  return state$q.extensionMap[extension];
+  return state$p.extensionMap[extension];
 };
 const hasLanguageByFileName = fileName => {
-  return fileName in state$q.fileNameMap;
+  return fileName in state$p.fileNameMap;
 };
 const getLanguageByFileName = fileName => {
-  return state$q.fileNameMap[fileName];
+  return state$p.fileNameMap[fileName];
 };
 const getTokenizeFunctionPath$1 = languageId => {
   // TODO what if language.tokenize is not of type string? -> handle error gracefully
-  return state$q.tokenizerMap[languageId] || '';
+  return state$p.tokenizerMap[languageId] || '';
 };
 const setHydrating = value => {
-  state$q.isHydrating = value;
+  state$p.isHydrating = value;
 };
 const setLoaded = value => {
-  state$q.loaded = true;
+  state$p.loaded = true;
 };
 const addExtension = (extension, languageId) => {
-  state$q.extensionMap[extension] = languageId;
+  state$p.extensionMap[extension] = languageId;
 };
 const addFirstLine = (regex, languageId) => {
-  state$q.firstLines.push({
+  state$p.firstLines.push({
     regex,
     languageId
   });
 };
 const hasWarned = languageId => {
-  return state$q.hasWarned.includes(languageId);
+  return state$p.hasWarned.includes(languageId);
 };
 const addWarned = languageId => {
-  return state$q.hasWarned.push(languageId);
+  return state$p.hasWarned.push(languageId);
 };
 const addFileName = (fileName, languageId) => {
-  state$q.fileNameMap[fileName] = languageId;
+  state$p.fileNameMap[fileName] = languageId;
 };
 const addTokenizer = (languageId, tokenizer) => {
-  state$q.tokenizerMap[languageId] = tokenizer;
+  state$p.tokenizerMap[languageId] = tokenizer;
 };
 const hasLoaded$1 = () => {
-  return state$q.loaded;
+  return state$p.loaded;
 };
 
 // TODO merge all of this with extension host languages module
@@ -4861,27 +4921,27 @@ const Fourteen = 14;
 const Fifteen = 15;
 const Sixteen = 16;
 
-const state$p = {
+const state$o = {
   listenerMap: Object.create(null),
   phase: Zero
 };
 const once = (event, listener) => {
-  if (state$p.phase >= event) {
+  if (state$o.phase >= event) {
     listener();
   } else {
     // TODO could also statically allocate listenermap at start as array[13]
-    state$p.listenerMap[event] ||= [];
-    state$p.listenerMap[event].push(listener);
+    state$o.listenerMap[event] ||= [];
+    state$o.listenerMap[event].push(listener);
   }
 };
 const mark$1 = event => {
-  const listeners = state$p.listenerMap[event] || [];
+  const listeners = state$o.listenerMap[event] || [];
   for (const listener of listeners) {
     listener();
   }
-  state$p.phase = event;
+  state$o.phase = event;
   if (event === Twelve) {
-    state$p.listenerMap = Object.create(null);
+    state$o.listenerMap = Object.create(null);
   }
 };
 
@@ -5280,12 +5340,12 @@ const creareSessionId = () => {
   return `session-${new Date().toISOString()}`;
 };
 
-const state$o = {
+const state$n = {
   sessionId: ''
 };
 const getSessionId = () => {
-  state$o.sessionId ||= creareSessionId();
-  return state$o.sessionId;
+  state$n.sessionId ||= creareSessionId();
+  return state$n.sessionId;
 };
 
 const withResolvers = () => {
@@ -5342,7 +5402,7 @@ const addSearchParam = (href, key, value) => {
   return parsedUrl.toString();
 };
 const replayCurrentSession = async () => {
-  if (!state$o.sessionId) {
+  if (!state$n.sessionId) {
     throw new VError('session replay is disabled in settings');
   }
   // TODO
@@ -6416,59 +6476,59 @@ const IpcParentWithNodeAlternate = {
 const getCacheKey$1 = colorThemeId => {
   return 'lvce-color-theme-' + colorThemeId;
 };
-const get$9 = colorThemeId => {
+const get$8 = colorThemeId => {
   const cacheKey = getCacheKey$1(colorThemeId);
   return getText$1(cacheKey);
 };
-const set$a = (colorThemeId, data) => {
+const set$9 = (colorThemeId, data) => {
   const cacheKey = getCacheKey$1(colorThemeId);
   return setText(cacheKey, data);
 };
 
 const GetColorThemeCssCachedLocalStorage = {
   __proto__: null,
-  get: get$9,
-  set: set$a
+  get: get$8,
+  set: set$9
 };
 
 // TODO high memory usage in idb because of transactionDoneMap
 
-const set$9 = async (key, value) => {
+const set$8 = async (key, value) => {
   await invoke$o('IndexedDb.set', key, value);
 };
-const get$8 = async key => {
+const get$7 = async key => {
   return invoke$o('IndexedDb.get', key);
 };
 
 const getCacheKey = colorThemeId => {
   return 'color-theme-' + colorThemeId;
 };
-const get$7 = colorThemeId => {
+const get$6 = colorThemeId => {
   const cacheKey = getCacheKey(colorThemeId);
-  return get$8(cacheKey);
+  return get$7(cacheKey);
 };
-const set$8 = (colorThemeId, data) => {
+const set$7 = (colorThemeId, data) => {
   const cacheKey = getCacheKey(colorThemeId);
-  return set$9(cacheKey, data);
+  return set$8(cacheKey, data);
 };
 
 const GetColorThemeCssCachedIndexedDb = {
   __proto__: null,
-  get: get$7,
-  set: set$8
+  get: get$6,
+  set: set$7
 };
 
-const get$6 = colorThemeId => {
+const get$5 = colorThemeId => {
   return '';
 };
-const set$7 = (colorThemeId, data) => {
+const set$6 = (colorThemeId, data) => {
   //  noop
 };
 
 const GetColorThemeCssCachedNoop = {
   __proto__: null,
-  get: get$6,
-  set: set$7
+  get: get$5,
+  set: set$6
 };
 
 const BraceCompletionExecuteBraceCompletionProvider = 'ExtensionHostBraceCompletion.executeBraceCompletionProvider';
@@ -6495,14 +6555,14 @@ const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompl
 const TextSearchExecuteTextSearchProvider = 'ExtensionHostTextSearch.executeTextSearchProvider';
 const TypeDefinitionExecuteTypeDefinitionProvider = 'ExtensionHostTypeDefinition.executeTypeDefinitionProvider';
 
-const state$n = {
+const state$m = {
   webViews: []
 };
 const addMany = webViews => {
-  state$n.webViews = [...state$n.webViews, ...webViews];
+  state$m.webViews = [...state$m.webViews, ...webViews];
 };
-const get$5 = () => {
-  return state$n.webViews;
+const get$4 = () => {
+  return state$m.webViews;
 };
 
 const addWebExtension = async path => {
@@ -6514,7 +6574,7 @@ const addWebExtension = async path => {
     }
   }
   manifest.status = Resolved;
-  state$r.webExtensions.push(manifest);
+  state$q.webExtensions.push(manifest);
   if (manifest.languages) {
     // TODO handle case when languages is not of type array
     await addLanguages(manifest.languages);
@@ -6652,7 +6712,7 @@ const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, orig
 
 const origin = typeof location === 'undefined' ? '' : location.origin;
 
-const state$m = {
+const state$l = {
   cachedActivationEvents: Object.create(null),
   /**
    * @type {any}
@@ -6660,11 +6720,11 @@ const state$m = {
   activatedExtensions: Object.create(null)
 };
 const actuallyActivateExtension = async (extension, event) => {
-  if (!(extension.id in state$m.activatedExtensions)) {
+  if (!(extension.id in state$l.activatedExtensions)) {
     const absolutePath = getExtensionAbsolutePath(extension.id, extension.isWeb, extension.builtin, extension.path, extension.browser, origin, platform);
-    state$m.activatedExtensions[extension.id] = invoke$o(ExtensionActivate, extension, absolutePath, event);
+    state$l.activatedExtensions[extension.id] = invoke$o(ExtensionActivate, extension, absolutePath, event);
   }
-  return state$m.activatedExtensions[extension.id];
+  return state$l.activatedExtensions[extension.id];
 };
 const actuallyActivateByEvent = async event => {
   // TODO should not query extensions multiple times
@@ -6684,7 +6744,7 @@ const actuallyActivateByEvent = async event => {
   for (const extension of extensionsToActivate) {
     await actuallyActivateExtension(extension, event);
   }
-  const additionalExtensions = state$r.webExtensions;
+  const additionalExtensions = state$q.webExtensions;
   const additionalExtensionsToActivate = filterByMatchingEvent(additionalExtensions, event);
   for (const extension of additionalExtensionsToActivate) {
     await actuallyActivateExtension(extension);
@@ -6695,14 +6755,14 @@ const actuallyActivateByEvent = async event => {
 const activateByEvent = async event => {
   string(event);
   if (event === 'none') {
-    const all = await Promise.all(Object.values(state$m.cachedActivationEvents));
+    const all = await Promise.all(Object.values(state$l.cachedActivationEvents));
     const flatAll = all.flat(1);
     return [flatAll[0]];
   }
-  if (!(event in state$m.cachedActivationEvents)) {
-    state$m.cachedActivationEvents[event] = actuallyActivateByEvent(event);
+  if (!(event in state$l.cachedActivationEvents)) {
+    state$l.cachedActivationEvents[event] = actuallyActivateByEvent(event);
   }
-  return state$m.cachedActivationEvents[event];
+  return state$l.cachedActivationEvents[event];
 };
 
 const executeProviders = async ({
@@ -6727,7 +6787,7 @@ const executeProvider = async ({
   const result = invoke$o(method, ...params);
   return result;
 };
-const execute$3 = async ({
+const execute$2 = async ({
   method,
   params
 }) => {
@@ -7017,18 +7077,18 @@ const Unknown$1 = 12;
 // FileSystemError
 
 const name$2r = 'Web';
-const state$l = {
+const state$k = {
   watchers: Object.create(null),
   saveListeners: [],
   files: Object.create(null)
 };
-state$l.files['/languages/index.dart'] = `void main() {
+state$k.files['/languages/index.dart'] = `void main() {
   print('Hello, World!');
 }`;
-state$l.files['/languages/index.js'] = `const add = (a, b) => {
+state$k.files['/languages/index.js'] = `const add = (a, b) => {
   return a + b;
 }`;
-state$l.files['/languages/scrolling.txt'] = `line 1
+state$k.files['/languages/scrolling.txt'] = `line 1
 line 2
 line 3
 line 4
@@ -7129,8 +7189,8 @@ line 98
 line 99
 line 100
 `;
-state$l.files['/languages/index.html'] = '<h1 class="abc">hello world</h1>';
-state$l.files['/languages/index.css'] = `h1 {
+state$k.files['/languages/index.html'] = '<h1 class="abc">hello world</h1>';
+state$k.files['/languages/index.css'] = `h1 {
   font-size: 24px;
 }
 
@@ -7150,7 +7210,7 @@ state$l.files['/languages/index.css'] = `h1 {
   tab-size: 2;
 }
 `;
-state$l.files['/languages/index.ex'] = `defmodule RealWorld do
+state$k.files['/languages/index.ex'] = `defmodule RealWorld do
   @moduledoc """
   RealWorld keeps the contexts that define your domain
   and business logic.
@@ -7158,7 +7218,7 @@ state$l.files['/languages/index.ex'] = `defmodule RealWorld do
   if it comes from the database, an external API or others.
   """
 end`;
-state$l.files['/languages/index.jl'] = `function mandelbrot(a)
+state$k.files['/languages/index.jl'] = `function mandelbrot(a)
 z = 0
 for i=1:50
 z = z^2 + a
@@ -7172,7 +7232,7 @@ abs(mandelbrot(complex(x, y))) < 2 ? print("*") : print(" ")
 end
 println()
 end`;
-state$l.files['/languages/index.pl'] = `#!/usr/bin/perl
+state$k.files['/languages/index.pl'] = `#!/usr/bin/perl
 #
 # The traditional first program.
 
@@ -7182,15 +7242,15 @@ use warnings;
 
 # Print a message.
 print "Hello, World!\n";`;
-state$l.files['/languages/index.kt'] = `fun main(args : Array<String>) {
+state$k.files['/languages/index.kt'] = `fun main(args : Array<String>) {
   println("Hello, World!")
 }`;
-state$l.files['/languages/index.java'] = `class HelloWorld {
+state$k.files['/languages/index.java'] = `class HelloWorld {
   public static void main(String[] args) {
       System.out.println("Hello, World!");
   }
 }`;
-state$l.files['/languages/index.cpp'] = `using namespace std;
+state$k.files['/languages/index.cpp'] = `using namespace std;
 
 template <class ANYTYPE>
 void thing(int a, Blah other_thing, double c=10, ANYTYPE f) {
@@ -7209,17 +7269,17 @@ int main(char arg_num, char** vargs) {
 
     #error I should be able to write single quotes in here: Don't make errors
 }`;
-state$l.files['/languages/index.env'] = 'KEY=42';
-state$l.files['/sample-folder/a.txt'] = '';
-state$l.files['/sample-folder/b.txt'] = '';
-state$l.files['/sample-folder/c.txt'] = '';
+state$k.files['/languages/index.env'] = 'KEY=42';
+state$k.files['/sample-folder/a.txt'] = '';
+state$k.files['/sample-folder/b.txt'] = '';
+state$k.files['/sample-folder/c.txt'] = '';
 
 // const getRelativePath = (path) => {
 //   return path.slice('/workspace'.length)
 // }
 
 const readFile$a = async path => {
-  const file = state$l.files[path];
+  const file = state$k.files[path];
   if (file === undefined) {
     throw new Error(`file not found ${path}`);
   }
@@ -7241,7 +7301,7 @@ const createFolder = async path => {
   throw new Error('not implemented');
 };
 const writeFile$a = async (path, content) => {
-  state$l.files[path] = content;
+  state$k.files[path] = content;
 };
 const getDirent$1 = (path, relativePath) => {
   const rest = path.slice(relativePath.length + 1);
@@ -7258,7 +7318,7 @@ const getDirent$1 = (path, relativePath) => {
 };
 const readDirWithFileTypes$4 = path => {
   const dirents = [];
-  for (const key in state$l.files) {
+  for (const key in state$k.files) {
     if (key.startsWith(path)) {
       const dirent = getDirent$1(key, path);
       if (!dirents.some(otherDirent => otherDirent.name === dirent.name)) {
@@ -7300,7 +7360,7 @@ const FileSystemWeb = {
   readFile: readFile$a,
   remove: remove$3,
   rename: rename$2,
-  state: state$l,
+  state: state$k,
   unwatch,
   unwatchAll,
   watch,
@@ -7309,7 +7369,7 @@ const FileSystemWeb = {
 
 const fileSystemWorkerUrl = `${assetDir}/packages/file-system-worker/dist/fileSystemWorkerMain.js`;
 
-const getConfiguredWorkerUrl$j = () => {
+const getConfiguredWorkerUrl$i = () => {
   let configuredWorkerUrl = get$f('develop.fileSystemWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -7325,7 +7385,7 @@ const launchFileSystemWorker = async () => {
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
-    url: getConfiguredWorkerUrl$j()
+    url: getConfiguredWorkerUrl$i()
   });
   handleIpc(ipc);
   await invoke$s(ipc, 'Initialize.initialize', platform);
@@ -7340,7 +7400,7 @@ const {
 
 const canBeRestored$3 = true;
 const name$2q = 'Fetch';
-const state$k = {
+const state$j = {
   files: Object.create(null)
 };
 const readFile$9 = async uri => {
@@ -7395,7 +7455,7 @@ const FileSystemFetch = {
   readFile: readFile$9,
   readJson: readJson$3,
   remove: remove$2,
-  state: state$k,
+  state: state$j,
   writeFile: writeFile$9
 };
 
@@ -7854,7 +7914,7 @@ const FileSystemHtml = {
 
 const debugWorkerUrl = `${assetDir}/packages/debug-worker/dist/debugWorkerMain.js`;
 
-const getConfiguredWorkerUrl$i = () => {
+const getConfiguredWorkerUrl$h = () => {
   let configuredWorkerUrl = get$f('develop.debugWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -7870,7 +7930,7 @@ const launchDebugWorker = async () => {
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
-    url: getConfiguredWorkerUrl$i()
+    url: getConfiguredWorkerUrl$h()
   });
   handleIpc(ipc);
   await invoke$s(ipc, 'Initialize.initialize');
@@ -7997,17 +8057,17 @@ class ContentSecurityPolicyError extends Error {
   }
 }
 
-const state$j = {
+const state$i = {
   /**
    * @type {any[]}
    */
   errors: []
 };
 const hasRecentErrors = () => {
-  return state$j.errors.length > 0;
+  return state$i.errors.length > 0;
 };
 const getRecentError = () => {
-  return state$j.errors.at(-1);
+  return state$i.errors.at(-1);
 };
 
 const getLineAndColumn = (text, start, end) => {
@@ -8269,7 +8329,7 @@ const TryToGetActualImportErrorMessage = {
 
 const aboutViewWorkerUrl = `${assetDir}/packages/about-view-worker/dist/aboutWorkerMain.js`;
 
-const getConfiguredWorkerUrl$h = () => {
+const getConfiguredWorkerUrl$g = () => {
   let configuredWorkerUrl = get$f('develop.aboutViewWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -8285,7 +8345,7 @@ const launchAboutViewWorker = async () => {
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
-    url: getConfiguredWorkerUrl$h()
+    url: getConfiguredWorkerUrl$g()
   });
   handleIpc(ipc);
   return ipc;
@@ -8536,21 +8596,21 @@ const GetActiveEditor_ipc = {
 
 const cache = Object.create(null);
 const id$m = 1;
-const get$4 = () => {
+const get$3 = () => {
   return cache[id$m];
 };
 const has$1 = () => {
   return id$m in cache;
 };
-const set$6 = value => {
+const set$5 = value => {
   cache[id$m] = value;
 };
 
 const getExtensions = () => {
   if (!has$1()) {
-    set$6(getExtensions$1());
+    set$5(getExtensions$1());
   }
-  return get$4();
+  return get$3();
 };
 
 const getCodeActionsFromExtension = extension => {
@@ -9033,7 +9093,7 @@ const Chrome_ipc = {
 
 const clipBoardWorkerUrl = `${assetDir}/packages/clipboard-worker/dist/clipBoardWorkerMain.js`;
 
-const getConfiguredWorkerUrl$g = () => {
+const getConfiguredWorkerUrl$f = () => {
   let configuredWorkerUrl = get$f('develop.clipBoardWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -9049,7 +9109,7 @@ const launchClipBoardWorker = async () => {
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     name,
-    url: getConfiguredWorkerUrl$g()
+    url: getConfiguredWorkerUrl$f()
   });
   handleIpc(ipc);
   await invoke$s(ipc, 'ClipBoard.initialize', platform);
@@ -9189,19 +9249,9 @@ const ok = () => {
   return i18nString(UiStrings$h.Ok);
 };
 
-const state$i = {
-  ipc: undefined
-};
-const get$3 = () => {
-  return state$i.ipc;
-};
-const set$5 = ipc => {
-  state$i.ipc = ipc;
-};
-
 let _mockId$1 = 0;
 const showMockConfirmPrompt = async (message, options) => {
-  const ipc = get$3();
+  const ipc = get$d();
   const result = await invoke$s(ipc, 'Test.executeMock', _mockId$1, message, options);
   return result;
 };
@@ -11048,7 +11098,7 @@ const doShowSaveFilePicker = async options => {
 };
 let _mockId = 0;
 const doShowMockSaveFilePicker = async () => {
-  const ipc = get$3();
+  const ipc = get$d();
   const result = await invoke$s(ipc, 'Test.executeMock', _mockId);
   return result;
 };
@@ -11283,7 +11333,7 @@ const getCompletionWorkerUrl = () => {
 
 const extensionHostSubWorkerUrl = `${assetDir}/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js`;
 
-const getConfiguredWorkerUrl$f = () => {
+const getConfiguredWorkerUrl$e = () => {
   let configuredWorkerUrl = get$f('develop.extensionHostSubWorkerPath') || '';
   if (configuredWorkerUrl) {
     configuredWorkerUrl = '/remote' + configuredWorkerUrl;
@@ -11295,7 +11345,7 @@ const getConfiguredWorkerUrl$f = () => {
   return configuredWorkerUrl;
 };
 const getExtensionHostSubWorkerUrl = () => {
-  return getConfiguredWorkerUrl$f();
+  return getConfiguredWorkerUrl$e();
 };
 
 const findWidgetWorkerUrl = `${assetDir}/packages/find-widget-worker/dist/findWidgetWorkerMain.js`;
@@ -11448,7 +11498,7 @@ const register = listener => {
   state$c[id] = listener;
   return id;
 };
-const execute$2 = (id, ...args) => {
+const execute$1 = (id, ...args) => {
   number(id);
   const listener = state$c[id];
   if (!listener) {
@@ -11459,7 +11509,7 @@ const execute$2 = (id, ...args) => {
 };
 
 const Commands$1A = {
-  3444: execute$2
+  3444: execute$1
 };
 
 const Listener_ipc = {
@@ -11535,7 +11585,7 @@ const load$1 = id => {
 };
 
 const getModule = id => {
-  const module = get$b(id);
+  const module = get$a(id);
   if (module) {
     return module;
   }
@@ -11554,7 +11604,7 @@ const getMenuEntries$h = async (id, ...args) => {
 };
 
 const addKeyBindings = menuEntries => {
-  const keyBindings = state$x.matchingKeyBindings;
+  const keyBindings = state$w.matchingKeyBindings;
   const newMenuEntries = [];
   for (const menuEntry of menuEntries) {
     const keyBinding = getCommandKeyBinding(keyBindings, menuEntry.command, menuEntry.args);
@@ -13023,40 +13073,9 @@ const SessionStorage_ipc = {
   name: name$1q
 };
 
-const getConfiguredWorkerUrl$e = (preferenceKey, fallback) => {
-  let configuredWorkerUrl = get$f(preferenceKey) || '';
-  if (configuredWorkerUrl) {
-    configuredWorkerUrl = '/remote' + configuredWorkerUrl;
-  }
-  configuredWorkerUrl = configuredWorkerUrl || fallback;
-  {
-    configuredWorkerUrl = fallback;
-  }
-  return configuredWorkerUrl;
-};
-
-const testWorkerUrl = `${assetDir}/packages/test-worker/dist/testWorkerMain.js`;
-
-const launchTestWorker = async () => {
-  const configuredWorkerUrl = getConfiguredWorkerUrl$e('develop.testWorkerPath', testWorkerUrl);
-  const ipc = await create$14({
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: configuredWorkerUrl,
-    name: 'Test Worker'
-  });
-  handleIpc(ipc);
-  set$5(ipc);
-  return ipc;
-};
-
-const execute$1 = async href => {
-  const ipc = await launchTestWorker();
-  await invoke$s(ipc, 'Test.execute', href);
-};
-
 const name$1p = 'Test';
 const Commands$1h = {
-  execute: execute$1
+  execute: execute$3
 };
 
 const Test_ipc = {
@@ -13364,7 +13383,7 @@ const Timeout_ipc = {
 const name$1a = 'MouseActions';
 const Commands$12 = {
   add: add$2,
-  get: get$a
+  get: get$9
 };
 
 const MouseActions_ipc = {
@@ -13658,7 +13677,7 @@ const ExtensionHostHover_ipc = {
 const editorWorkerUrl = `${assetDir}/packages/editor-worker/dist/editorWorkerMain.js`;
 
 const launchEditorWorker = async () => {
-  const configuredWorkerUrl = getConfiguredWorkerUrl$e('developer.editorWorkerPath', editorWorkerUrl);
+  const configuredWorkerUrl = getConfiguredWorkerUrl$l('developer.editorWorkerPath', editorWorkerUrl);
   const id = create$13();
   let ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
@@ -13876,7 +13895,7 @@ const getWebViewsDefault = async () => {
 };
 const getWebViews$1 = async () => {
   const nodeWebViews = await getWebViewsDefault();
-  const registeredWebViews = get$5();
+  const registeredWebViews = get$4();
   const allWebViews = [...nodeWebViews, ...registeredWebViews];
   return allWebViews;
 };
@@ -15120,7 +15139,7 @@ const loadContent$K = async state => {
   };
 };
 
-const getDom = overview => {
+const getDom$1 = overview => {
   const dom = [];
   dom.push({
     type: Div,
@@ -15137,7 +15156,7 @@ const renderOverview = {
   },
   apply(oldState, newState) {
     const browserViewString = JSON.stringify(newState.browserViewMap, null, 2);
-    const dom = getDom(browserViewString);
+    const dom = getDom$1(browserViewString);
     return ['setDom', dom];
   }
 };
@@ -15673,7 +15692,7 @@ const renderFocus$1 = {
     return ['focus'];
   }
 };
-const renderDom$2 = {
+const renderDom$4 = {
   isEqual(oldState, newState) {
     return oldState.message === newState.message;
   },
@@ -15682,7 +15701,7 @@ const renderDom$2 = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render$C = [renderDom$2, renderValue, renderFocus$1];
+const render$C = [renderDom$4, renderValue, renderFocus$1];
 
 const ViewletDefineKeyBinding_ipc = {
   __proto__: null,
@@ -17819,7 +17838,7 @@ const ViewletEmptyEditor_ipc = {
 const explorerWorkerUrl = `${assetDir}/packages/explorer-worker/dist/explorerViewWorkerMain.js`;
 
 const launchExplorerWorker = async () => {
-  const configuredWorkerUrl = getConfiguredWorkerUrl$e('develop.explorerWorkerPath', explorerWorkerUrl);
+  const configuredWorkerUrl = getConfiguredWorkerUrl$l('develop.explorerWorkerPath', explorerWorkerUrl);
   const ipc = await create$14({
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
     url: configuredWorkerUrl,
@@ -18203,14 +18222,14 @@ const name$z = 'ExtensionDetail';
 const hasFunctionalRender$s = true;
 const hasFunctionalRootRender$i = true;
 const hasFunctionalEvents$e = true;
-const renderDom$1 = {
+const renderDom$3 = {
   isEqual(oldState, newState) {
     return false;
   },
   apply: apply,
   multiple: true
 };
-const render$s = [renderDom$1];
+const render$s = [renderDom$3];
 const renderEventListeners$d = async () => {
   const listeners = await invoke$b('ExtensionDetail.renderEventListeners');
   return listeners;
@@ -18852,7 +18871,7 @@ const loadContent$t = async (state, savedState) => {
   return loadContent$u(state, savedState);
 };
 const contentLoaded$5 = state => {
-  set$b('Locations', {
+  set$a('Locations', {
     factory: ViewletLocations,
     state
   });
@@ -19443,7 +19462,9 @@ const Main$1 = {
   kTop: MainTop,
   kLeft: MainLeft,
   kWidth: MainWidth,
-  kHeight: MainHeight
+  kHeight: MainHeight,
+  kId: 'mainId',
+  kReady: 'mainVisible'
 };
 const ActivityBar = {
   moduleId: ActivityBar$5,
@@ -19451,7 +19472,9 @@ const ActivityBar = {
   kTop: ActivityBarTop,
   kLeft: ActivityBarLeft,
   kWidth: ActivityBarWidth,
-  kHeight: ActivityBarHeight
+  kHeight: ActivityBarHeight,
+  kId: 'activityBarId',
+  kReady: 'activityBarVisible'
 };
 const SideBar = {
   moduleId: SideBar$2,
@@ -19459,7 +19482,9 @@ const SideBar = {
   kTop: SideBarTop,
   kLeft: SideBarLeft,
   kWidth: SideBarWidth,
-  kHeight: SideBarHeight
+  kHeight: SideBarHeight,
+  kId: 'sideBarId',
+  kReady: 'sideBarVisible'
 };
 const TitleBar = {
   moduleId: TitleBar$2,
@@ -19467,7 +19492,9 @@ const TitleBar = {
   kTop: TitleBarTop,
   kLeft: TitleBarTop,
   kWidth: TitleBarWidth,
-  kHeight: TitleBarHeight
+  kHeight: TitleBarHeight,
+  kId: 'titleBarId',
+  kReady: 'titleBarVisible'
 };
 const StatusBar = {
   moduleId: StatusBar$1,
@@ -19475,7 +19502,9 @@ const StatusBar = {
   kTop: StatusBarTop,
   kLeft: StatusBarLeft,
   kWidth: StatusBarWidth,
-  kHeight: StatusBarHeight
+  kHeight: StatusBarHeight,
+  kId: 'statusBarId',
+  kReady: 'statusbarVisible'
 };
 const Panel = {
   moduleId: Panel$2,
@@ -19483,7 +19512,9 @@ const Panel = {
   kTop: panelTop,
   kLeft: PanelLeft,
   kWidth: PanelWidth,
-  kHeight: PanelHeight
+  kHeight: PanelHeight,
+  kId: 'panelId',
+  kReady: 'panelVisible'
 };
 const Preview$1 = {
   moduleId: E2eTest,
@@ -19491,7 +19522,9 @@ const Preview$1 = {
   kTop: PreviewTop,
   kLeft: PreviewLeft,
   kWidth: PreviewWidth,
-  kHeight: PreviewHeight
+  kHeight: PreviewHeight,
+  kId: 'previewId',
+  kReady: 'previewVisible'
 };
 
 // TODO instead of reordering commands, have two command arrays
@@ -19675,7 +19708,29 @@ const create$p = id => {
     sideBarViewletId: '',
     [SashId]: None$7,
     sideBarLocation: Right$1,
-    uid: id
+    uid: id,
+    activityBarId: create$13(),
+    sideBarSashId: create$13(),
+    sideBarId: create$13(),
+    panelSashId: create$13(),
+    panelId: create$13(),
+    mainId: create$13(),
+    contentAreaId: create$13(),
+    mainContentsId: create$13(),
+    statusBarId: create$13(),
+    titleBarId: create$13(),
+    workbenchId: create$13(),
+    activityBarVisible: false,
+    contentAreaVisible: false,
+    mainContentsVisible: false,
+    mainVisible: false,
+    panelSashVisible: false,
+    panelVisible: false,
+    sideBarSashVisible: false,
+    sideBarVisible: false,
+    statusBarVisible: false,
+    titleBarVisible: false,
+    workbenchVisible: false
   };
 };
 const saveState$c = state => {
@@ -19755,7 +19810,11 @@ const loadContent$q = (state, savedState) => {
   return {
     ...state,
     points: newPoints,
-    sideBarLocation
+    sideBarLocation,
+    sideBarSashVisible: true,
+    panelSashVisible: true,
+    mainContentsVisible: true,
+    workbenchVisible: true
   };
 };
 const show$4 = async (state, module, currentViewletId) => {
@@ -19926,7 +19985,9 @@ const loadIfVisible = async (state, module) => {
       kLeft,
       kWidth,
       kHeight,
-      moduleId
+      moduleId,
+      kId,
+      kReady
     } = module;
     const visible = points[kVisible];
     const x = points[kLeft];
@@ -19936,7 +19997,7 @@ const loadIfVisible = async (state, module) => {
     let commands = [];
     const parentUid = state.uid;
     if (visible) {
-      const childUid = create$13();
+      const childUid = state[kId];
       commands = await load$6({
         getModule: load$4,
         id: moduleId,
@@ -19950,6 +20011,7 @@ const loadIfVisible = async (state, module) => {
         width,
         height,
         uid: childUid
+        // render: false,
       }, false, true);
       if (commands) {
         const referenceNodes = getReferenceNodes(sideBarLocation);
@@ -19957,8 +20019,15 @@ const loadIfVisible = async (state, module) => {
       }
     }
     const orderedCommands = reorderCommands(commands);
+    const latestState = getState$1(Layout);
     return {
-      newState: state,
+      newState: {
+        ...latestState,
+        [kReady]: true,
+        workbenchVisible: true,
+        contentAreaVisible: true,
+        mainContentsVisible: true
+      },
       commands: orderedCommands
     };
   } catch (error) {
@@ -19968,20 +20037,29 @@ const loadIfVisible = async (state, module) => {
 const loadMainIfVisible = state => {
   return loadIfVisible(state, Main$1);
 };
-const loadSideBarIfVisible = state => {
-  return loadIfVisible(state, SideBar);
+const loadSideBarIfVisible = async state => {
+  const updated = await loadIfVisible(state, SideBar);
+  return {
+    ...updated
+  };
 };
 const loadPanelIfVisible = state => {
   return loadIfVisible(state, Panel);
 };
-const loadActivityBarIfVisible = state => {
-  return loadIfVisible(state, ActivityBar);
+const loadActivityBarIfVisible = async state => {
+  const updated = await loadIfVisible(state, ActivityBar);
+  return {
+    ...updated
+  };
 };
 const loadStatusBarIfVisible = state => {
   return loadIfVisible(state, StatusBar);
 };
-const loadTitleBarIfVisible = state => {
-  return loadIfVisible(state, TitleBar);
+const loadTitleBarIfVisible = async state => {
+  const updated = await loadIfVisible(state, TitleBar);
+  return {
+    ...updated
+  };
 };
 const loadPreviewIfVisible = state => {
   return loadIfVisible(state, Preview$1);
@@ -20877,6 +20955,254 @@ const name$t = 'Layout';
 const Horizontal$1 = 'horizontal';
 const Vertical$1 = 'vertical';
 
+const getDom = id => {
+  const instance = getByUid(id);
+  if (!instance) {
+    console.log('not found', id);
+    return [{
+      type: Div,
+      childCount: 0,
+      className: `Element-${id}`
+    }];
+  }
+  console.log({
+    instance
+  });
+  const commands = render$J(instance.factory, instance.renderedState, instance.state, instance.state.uid);
+  const domCommand = commands.find(command => command[0] === 'Viewlet.setDom2');
+  if (domCommand) {
+    return domCommand[2];
+  }
+  console.log({
+    commands
+  });
+  // TODO ask viewlet registry to render component with that id
+  return [{
+    type: Div,
+    className: `Element-${id}`,
+    childCount: 0
+  }];
+};
+const getActivityBarCommands = (oldState, newState, commands, contentAppendIds) => {
+  if (oldState.activityBarVisible && !newState.activityBarVisible) {
+    commands.push(['Viewlet.remove', newState.activityBarId]);
+    return;
+  }
+  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 (newState.activityBarVisible) {
+    contentAppendIds.push(newState.activityBarId);
+  }
+};
+const getSideBarSashCommands = (oldState, newState, commands, contentAppendIds) => {
+  if (oldState.sideBarSashVisible && !newState.sideBarSashVisible) {
+    commands.push(['Viewlet.remove', newState.sideBarSashId]);
+    return;
+  }
+  if (!oldState.sideBarSashVisible && newState.sideBarSashVisible) {
+    commands.push(['Viewlet.createFunctionalRoot', `${newState.sideBarSashId}`, newState.sideBarSashId, true]);
+    const dom = [{
+      type: Div,
+      className: `Sash SashSideBar`,
+      childCount: 0
+    }];
+    commands.push(['Viewlet.setDom2', newState.sideBarSashId, dom]);
+  }
+  if (newState.sideBarSashVisible) {
+    contentAppendIds.push(newState.sideBarSashId);
+  }
+};
+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);
+  }
+};
+const getPanelSashCommands = (oldState, newState, commands, contentAppendIds) => {
+  if (oldState.panelSashVisible && !newState.panelSashVisible) {
+    commands.push(['Viewlet.remove', newState.panelSashId]);
+    return;
+  }
+  if (!oldState.panelSashVisible && newState.panelSashVisible) {
+    commands.push(['Viewlet.createFunctionalRoot', `${newState.panelSashId}`, newState.panelSashId, true]);
+    const dom = getDom(newState.panelSashId);
+    commands.push(['Viewlet.setDom2', newState.panelSashId, dom]);
+  }
+  if (newState.panelSashVisible) {
+    contentAppendIds.push(newState.panelSashId);
+  }
+};
+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);
+  }
+};
+const getMainContentsCommands = (oldState, newState, commands, contentAppendIds) => {
+  if (oldState.mainContentsVisible && !newState.mainContentsVisible) {
+    commands.push(['Viewlet.remove', newState.mainContentsId]);
+    return;
+  }
+  if (!oldState.mainContentsVisible && newState.mainContentsVisible) {
+    const mainContentsAppendIds = [];
+    getMainCommands(oldState, newState, commands, mainContentsAppendIds);
+    getPanelSashCommands(oldState, newState, commands, mainContentsAppendIds);
+    getPanelCommands(oldState, newState, commands, mainContentsAppendIds);
+    commands.push(['Viewlet.createFunctionalRoot', `${newState.mainContentsId}`, newState.mainContentsId, true]);
+    const dom = [{
+      type: Div,
+      className: 'MainContents',
+      childCount: 0
+    }];
+    commands.push(['Viewlet.setDom2', newState.mainContentsId, dom]);
+    commands.push(['Viewlet.replaceChildren', newState.mainContentsId, mainContentsAppendIds]);
+  }
+  if (newState.mainContentsVisible) {
+    contentAppendIds.push(newState.mainContentsId);
+  }
+};
+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);
+  }
+};
+const getContentCommands = (oldState, newState, commands, workbenchAppendIds) => {
+  // TODO support secondary side bar / chat view
+  const contentAppendIds = [];
+  if (newState.sideBarLocation === Left$1) {
+    getActivityBarCommands(oldState, newState, commands, contentAppendIds);
+    getSideBarCommands(oldState, newState, commands, contentAppendIds);
+    getSideBarSashCommands(oldState, newState, commands, contentAppendIds);
+    getMainContentsCommands(oldState, newState, commands, contentAppendIds);
+  } else {
+    getMainContentsCommands(oldState, newState, commands, contentAppendIds);
+    getSideBarSashCommands(oldState, newState, commands, contentAppendIds);
+    getSideBarCommands(oldState, newState, commands, contentAppendIds);
+    getActivityBarCommands(oldState, newState, commands, contentAppendIds);
+  }
+  if (!oldState.contentAreaVisible && newState.contentAreaVisible) {
+    commands.push(['Viewlet.createFunctionalRoot', `${newState.contentAreaId}`, newState.contentAreaId, true]);
+    const dom = [{
+      type: Div,
+      className: 'ContentArea',
+      childCount: 0
+    }];
+    commands.push(['Viewlet.setDom2', newState.contentAreaId, dom]);
+  }
+  if (newState.contentAreaVisible) {
+    commands.push(['Viewlet.replaceChildren', newState.contentAreaId, contentAppendIds]);
+    workbenchAppendIds.push(newState.contentAreaId);
+  }
+};
+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);
+  }
+};
+const getWorkbenchCommands = (oldState, newState, commands, workbenchAppendIds) => {
+  if (!oldState.workbenchVisible && newState.workbenchVisible) {
+    commands.push(['Viewlet.createFunctionalRoot', `${newState.workbenchId}`, newState.workbenchId, true]);
+    const dom = [{
+      type: Div,
+      id: 'Workbench',
+      className: 'Viewlet Layout Workbench new',
+      role: 'application',
+      childCount: 0
+    }];
+    commands.push(['Viewlet.setDom2', newState.workbenchId, dom]);
+  }
+  if (newState.workbenchVisible) {
+    commands.push(['Viewlet.replaceChildren', newState.workbenchId, workbenchAppendIds]);
+  }
+  if (!oldState.workbenchVisible && newState.workbenchVisible) {
+    commands.push(['Viewlet.appendToBody', newState.workbenchId]);
+  }
+};
+const renderDom$2 = (oldState, newState) => {
+  // const dom = (
+  //   <div class="Workbench" id="1">
+  //     <div class="TitleBar" id="2"></div>
+  //     <div class="ContentArea" id="3">
+  //       <If condition={sideBarLocation === 'left'}>
+  //         <div class="MainContents" id="4">
+  //           <div class="Main" id="5"></div>
+  //         </div>
+  //         <div class="SideBar" id="6"></div>
+  //         <div class="ActivityBar" id="7"></div>
+  //       </If>
+  //       <If condition={sideBarLocation === 'right'}>
+  //         <div class="ActivityBar" id="7"></div>
+  //         <div class="SideBar" id="6"></div>
+  //         <div class="MainContents" id="4">
+  //           <div class="Main" id="5"></div>
+  //         </div>
+  //       </If>
+  //     </div>
+  //     <div class="StatusBar" id="8"></div>
+  //   </div>
+  // )
+  const commands = [];
+  const workbenchAppendIds = [];
+  getTitleBarCommands(oldState, newState, commands, workbenchAppendIds);
+  getContentCommands(oldState, newState, commands, workbenchAppendIds);
+  getStatusBarCommands(oldState, newState, commands, workbenchAppendIds);
+  getWorkbenchCommands(oldState, newState, commands, workbenchAppendIds);
+
+  // TODO ensure focus commands are last in the commands array
+  return commands;
+};
+
 const kSideBarTop = 13;
 const kSideBarLeft = 14;
 const kSideBarHeight = 16;
@@ -20920,7 +21246,18 @@ const renderSashes = {
     }];
   }
 };
-const render$m = [renderSashes];
+const renderDom$1 = {
+  isEqual(oldState, newState) {
+    return false;
+  },
+  apply(oldState, newState) {
+    // @ts-ignore
+    renderDom$2(oldState, newState);
+    return [];
+  },
+  multiple: true
+};
+const render$m = [renderDom$1, renderSashes];
 
 const ViewletLayout_ipc = {
   __proto__: null,
@@ -24082,7 +24419,7 @@ const loadContent$i = async (state, savedState) => {
 
 // TODO side effect is not good here, find a way to call ViewletLocations
 const contentLoaded$2 = state => {
-  set$b('Locations', {
+  set$a('Locations', {
     factory: ViewletLocations,
     state,
     renderedState: state
@@ -26548,7 +26885,7 @@ const getStatusBarItems$1 = () => {
 // TODO add function to dispose listener
 const onChange = listener => {
   const id = register(listener);
-  return execute$3({
+  return execute$2({
     method: RegisterStatusBarChangeListener,
     params: [id]
   });