@jsenv/core 25.3.0 → 25.4.3

package/src/internal/compiling/transformResultToCompilationResult.js

@@ -16,8 +16,8 @@ import {
   setCssSourceMappingUrl,
   sourcemapToBase64Url,
 } from "../sourceMappingURLUtils.js"
-import { generateCompilationAssetUrl } from "./compile-directory/compile-asset.js"
-import { testFilePresence } from "./compile-directory/fs-optimized-for-cache.js"
+import { generateCompilationAssetUrl } from "./jsenv_directory/compile_asset.js"
+import { testFilePresence } from "./jsenv_directory/fs-optimized-for-cache.js"
 
 const isWindows = process.platform === "win32"
 

package/src/internal/dev_server/exploring/exploring.js

@@ -12,7 +12,7 @@ const fetchJSON = async (url, options) => {
 const groupPreference = createPreference("group")
 
 const run = async () => {
-  const { projectDirectoryUrl, explorableConfig, outDirectoryRelativeUrl } =
+  const { projectDirectoryUrl, explorableConfig, jsenvDirectoryRelativeUrl } =
     await fetchExploringJson()
 
   const files = await fetchJSON(`/.jsenv/explorables.json`, {
@@ -20,16 +20,18 @@ const run = async () => {
   })
 
   const compileServerOrigin = document.location.origin
-  const outDirectoryUrl = String(
-    new URL(outDirectoryRelativeUrl, compileServerOrigin),
+  const jsenvDirectoryServerUrl = String(
+    new URL(jsenvDirectoryRelativeUrl, compileServerOrigin),
   )
   const documentUrl = document.location.href
   let compileId
 
-  const outDirectoryIndex = documentUrl.indexOf(outDirectoryUrl)
-  if (outDirectoryIndex === 0) {
-    const afterOutDirectory = documentUrl.slice(outDirectoryUrl.length)
-    compileId = afterOutDirectory.split("/")[0]
+  const jsenvDirectoryIndex = documentUrl.indexOf(jsenvDirectoryServerUrl)
+  if (jsenvDirectoryIndex === 0) {
+    const afterJsenvDirectory = documentUrl.slice(
+      jsenvDirectoryServerUrl.length,
+    )
+    compileId = afterJsenvDirectory.split("/")[0]
   } else {
     compileId = null
   }
@@ -134,7 +136,7 @@ const run = async () => {
 
   const urlToVisitFromRelativeUrl = (relativeUrl) => {
     if (compileId) {
-      return `${compileServerOrigin}/${outDirectoryRelativeUrl}${compileId}/${relativeUrl}`
+      return `${compileServerOrigin}/${jsenvDirectoryRelativeUrl}${compileId}/${relativeUrl}`
     }
     return `${compileServerOrigin}/${relativeUrl}`
   }

package/src/internal/dev_server/toolbar/compilation/toolbar.compilation.js

@@ -1,6 +1,10 @@
-import { scanBrowserRuntimeFeatures } from "../../../browser_feature_detection/browser_feature_detection.js"
+import { scanBrowserRuntimeFeatures } from "../../../features/browser_feature_detection/browser_feature_detection.js"
 import { removeForceHideElement } from "../util/dom.js"
 import { enableVariant } from "../variant/variant.js"
+import {
+  enableWarningStyle,
+  disableWarningStyle,
+} from "../settings/toolbar.settings.js"
 
 export const renderCompilationInToolbar = ({ compileGroup }) => {
   const browserSupportRootNode = document.querySelector("#browser_support")
@@ -11,19 +15,17 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
 
   scanBrowserRuntimeFeatures().then(
     ({
-      canAvoidCompilation,
-      featuresReport,
-      customCompilerPatterns,
-      missingFeatureNames,
+      jsenvDirectoryRelativeUrl,
       inlineImportMapIntoHTML,
-      outDirectoryRelativeUrl,
+      compileProfile,
       compileId,
+      runtimeReport,
     }) => {
-      const browserSupport = canAvoidCompilation
-        ? inlineImportMapIntoHTML
-          ? "partial"
-          : "full"
-        : "no"
+      const browserSupport = compileId
+        ? "no"
+        : inlineImportMapIntoHTML
+        ? "partial"
+        : "full"
       enableVariant(browserSupportRootNode, {
         browserSupport,
       })
@@ -33,13 +35,9 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
         ).onclick = () => {
           // eslint-disable-next-line no-alert
           window.alert(
-            `Source files needs to be compiled to be executable in this browser because: ${getBrowserSupportMessage(
+            `Source files needs to be compiled to be executable in this browser because: ${listWhatIsMissing(
               {
-                missingOnly: true,
-                featuresReport,
-                customCompilerPatterns,
-                missingFeatureNames,
-                inlineImportMapIntoHTML,
+                compileProfile,
               },
             )}`,
           )
@@ -50,11 +48,8 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
         ).onclick = () => {
           // eslint-disable-next-line no-alert
           window.alert(
-            `Source files (except html) can be executed directly in this browser because: ${getBrowserSupportMessage(
+            `Source files (except html) can be executed directly in this browser because: ${listWhatIsSupported(
               {
-                featuresReport,
-                customCompilerPatterns,
-                missingFeatureNames,
                 inlineImportMapIntoHTML,
               },
             )}`,
@@ -66,11 +61,8 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
         ).onclick = () => {
           // eslint-disable-next-line no-alert
           window.alert(
-            `Source files can be executed directly in this browser because: ${getBrowserSupportMessage(
+            `Source files can be executed directly in this browser because: ${listWhatIsSupported(
               {
-                featuresReport,
-                customCompilerPatterns,
-                missingFeatureNames,
                 inlineImportMapIntoHTML,
               },
             )}`,
@@ -78,28 +70,59 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
         }
       }
 
-      const filesCompilation = compileGroup.compileId
+      const actualCompileId = compileGroup.compileId
+      const expectedCompiledId = compileId
+      const shouldSwitchCompileId =
+        expectedCompiledId &&
+        actualCompileId &&
+        actualCompileId !== expectedCompiledId
+      const shouldCompile = !actualCompileId && browserSupport === "no"
+      const filesCompilation = shouldSwitchCompileId
+        ? "mismatch"
+        : actualCompileId
         ? "yes"
         : inlineImportMapIntoHTML
         ? "html_only"
         : "no"
+      const hasWarning = shouldCompile || shouldSwitchCompileId
+
       enableVariant(filesCompilationRootNode, {
         filesCompilation,
-        compiled: compileGroup.compileId ? "yes" : "no",
+        compilation_link: shouldSwitchCompileId
+          ? "mismatch"
+          : actualCompileId
+          ? "source"
+          : expectedCompiledId
+          ? "compiled"
+          : "force",
       })
-      filesCompilationRootNode.querySelector("a.go_to_source_link").onclick =
-        () => {
-          window.parent.location = `/${compileGroup.fileRelativeUrl}`
-        }
-      filesCompilationRootNode.querySelector("a.go_to_compiled_link").onclick =
+      if (filesCompilation === "yes") {
+        document.querySelector(
+          ".files_compilation_text",
+        ).innerHTML = `Files shown are compiled for ${runtimeReport.name}@${runtimeReport.version}`
+      }
+      filesCompilationRootNode.querySelector("a.link_to_source_files").onclick =
         () => {
-          window.parent.location = `/${outDirectoryRelativeUrl}${compileId}/${compileGroup.fileRelativeUrl}`
+          window.parent.location.href = `/${compileGroup.fileRelativeUrl}`
         }
+      filesCompilationRootNode.querySelector(
+        "a.link_to_compiled_files",
+      ).onclick = () => {
+        window.parent.location.href = `/${jsenvDirectoryRelativeUrl}${expectedCompiledId}/${compileGroup.fileRelativeUrl}`
+      }
+      filesCompilationRootNode.querySelector(
+        "a.link_to_compilation_forced_files",
+      ).onclick = () => {
+        window.parent.location.href = `/${jsenvDirectoryRelativeUrl}force/${compileGroup.fileRelativeUrl}`
+      }
+      filesCompilationRootNode.querySelector(
+        "a.link_to_appropriate_files",
+      ).onclick = () => {
+        window.parent.location.href = `/${jsenvDirectoryRelativeUrl}${expectedCompiledId}/${compileGroup.fileRelativeUrl}`
+      }
 
-      const shouldCompile =
-        filesCompilation !== "yes" && browserSupport === "no"
-
-      if (shouldCompile) {
+      if (hasWarning) {
+        enableWarningStyle()
         document
           .querySelector(".files_compilation_text")
           .setAttribute("data-warning", "")
@@ -110,6 +133,7 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
           .querySelector("#settings-button")
           .setAttribute("data-warning", "")
       } else {
+        disableWarningStyle()
         document
           .querySelector(".files_compilation_text")
           .removeAttribute("data-warning")
@@ -124,63 +148,53 @@ export const renderCompilationInToolbar = ({ compileGroup }) => {
   )
 }
 
-const getBrowserSupportMessage = ({
-  missingOnly,
-  featuresReport,
-  customCompilerPatterns,
-  missingFeatureNames,
-  inlineImportMapIntoHTML,
-}) => {
+const listWhatIsSupported = ({ inlineImportMapIntoHTML }) => {
   const parts = []
-
-  if (featuresReport.importmap) {
-    if (!missingOnly) {
-      if (inlineImportMapIntoHTML) {
-        parts.push(`importmaps are supported (only when inlined in html files)`)
-      } else {
-        parts.push(`importmaps are supported`)
-      }
-    }
+  if (inlineImportMapIntoHTML) {
+    parts.push(`importmaps are supported (only when inlined in html files)`)
   } else {
-    parts.push(`importmaps are not supported`)
+    parts.push(`importmaps are supported`)
   }
+  parts.push(`dynamic imports are supported`)
+  parts.push(`top level await is supported`)
+  parts.push(`all features are natively supported`)
+  return `
+- ${parts.join(`
+- `)}`
+}
 
-  if (featuresReport.dynamicImport) {
-    if (!missingOnly) {
-      parts.push(`dynamic imports are supported`)
-    }
-  } else {
+const listWhatIsMissing = ({ compileProfile }) => {
+  const parts = []
+  const { missingFeatures } = compileProfile
+  if (missingFeatures.importmap) {
+    parts.push(`importmaps are not supported`)
+  }
+  if (missingFeatures.dynamicImport) {
     parts.push(`dynamic imports are not supported`)
   }
-
-  if (featuresReport.topLevelAwait) {
-    if (!missingOnly) {
-      parts.push(`top level await is supported`)
-    }
-  } else {
+  if (missingFeatures.topLevelAwait) {
     parts.push(`top level await is not supported`)
   }
-
+  const missingFeatureNames = Object.keys(missingFeatures).filter((name) => {
+    return (
+      name !== "importmap" &&
+      name !== "dynamicImport" &&
+      name !== "topLevelAwait" &&
+      name !== "custom_compiler_patterns"
+    )
+  })
   const missingFeatureCount = missingFeatureNames.length
-  if (missingFeatureCount === 0) {
-    if (!missingOnly) {
-      parts.push(`all features are natively supported`)
-    }
-  } else {
+  if (missingFeatureCount > 0) {
     parts.push(
       `${missingFeatureCount} features are missing: ${missingFeatureNames}`,
     )
   }
-
-  const customCompilerCount = customCompilerPatterns.length
-  if (customCompilerCount === 0) {
-    // no need to talk about something unused
-  } else {
+  const { custom_compiler_patterns } = missingFeatures
+  if (custom_compiler_patterns) {
     parts.push(
-      `${customCompilerCount} custom compilers enabled: ${customCompilerPatterns}`,
+      `${custom_compiler_patterns.length} custom compilers enabled: ${custom_compiler_patterns}`,
     )
   }
-
   return `
 - ${parts.join(`
 - `)}`

package/src/internal/dev_server/toolbar/settings/toolbar.settings.js

@@ -4,6 +4,7 @@ import {
   activateToolbarSection,
   updateIframeOverflowOnParentWindow,
 } from "../util/dom.js"
+import { enableVariant } from "../variant/variant.js"
 
 export const renderToolbarSettings = () => {
   document.querySelector("#settings-button").onclick = toggleSettings
@@ -18,6 +19,18 @@ const toggleSettings = () => {
   }
 }
 
+export const enableWarningStyle = () => {
+  enableVariant(document.querySelector("#settings-button"), {
+    has_warning: "yes",
+  })
+}
+
+export const disableWarningStyle = () => {
+  enableVariant(document.querySelector("#settings-button"), {
+    has_warning: "no",
+  })
+}
+
 export const settingsAreVisible = () => {
   return toolbarSectionIsActive(document.querySelector(`#settings`))
 }

package/src/internal/dev_server/toolbar/toolbar.html

@@ -436,38 +436,68 @@
                         >Files shown are source files, except html</span
                       >
                       <span data-when="filesCompilation:yes"
-                        >Files shown are compiled</span
+                        >Files shown are compiled for {runtime}</span
+                      >
+                      <span data-when="filesCompilation:mismatch"
+                        >Files shown are compiled for an other runtime</span
                       >
                     </div>
                     <a
-                      data-when="compiled:yes"
-                      class="go_to_source_link"
+                      data-when="compilation_link:source"
+                      class="link_to_source_files"
                       href="javascript:void(0);"
                       >Switch to source files</a
                     >
                     <a
-                      data-when="compiled:no"
-                      class="go_to_compiled_link"
+                      data-when="compilation_link:mismatch"
+                      class="link_to_appropriate_files"
+                      href="javascript:void(0);"
+                      >Switch to appropriate files</a
+                    >
+                    <a
+                      data-when="compilation_link:compiled"
+                      class="link_to_compiled_files"
                       href="javascript:void(0);"
                       >Switch to compiled files</a
                     >
+                    <a
+                      data-when="compilation_link:force"
+                      class="link_to_compilation_forced_files"
+                      href="javascript:void(0);"
+                      >Force compilation</a
+                    >
                   </div>
                 </div>
               </div>
             </div>
           </div>
           <button id="settings-button" class="toolbar-icon-wrapper">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              viewBox="0 0 24 24"
-              width="24px"
-              height="24px"
-              class="iconToolbar"
-            >
-              <path
-                d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"
-              />
-            </svg>
+            <div data-when="has_warning:yes">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 511.999 511.999"
+                width="24px"
+                height="24px"
+                class="iconToolbar"
+              >
+                <path
+                  d="M506.43 421.536 291.573 49.394c-15.814-27.391-55.327-27.401-71.147 0L5.568 421.536c-15.814 27.391 3.934 61.616 35.574 61.616h429.714c31.629.001 51.394-34.214 35.574-61.616zm-231.609-36.502c0 10.394-8.427 18.821-18.821 18.821s-18.821-8.427-18.821-18.821v-11.239c0-10.394 8.427-18.821 18.821-18.821s18.821 8.427 18.821 18.821v11.239zm0-73.332c0 10.394-8.427 18.821-18.821 18.821s-18.821-8.427-18.821-18.821v-107.89c0-10.394 8.427-18.821 18.821-18.821s18.821 8.427 18.821 18.821v107.89z"
+                />
+              </svg>
+            </div>
+            <div data-when="has_warning:no">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                width="24px"
+                height="24px"
+                class="iconToolbar"
+              >
+                <path
+                  d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"
+                />
+              </svg>
+            </div>
           </button>
         </section>
 

package/src/internal/dev_server/toolbar/toolbar.injector.js

@@ -8,18 +8,12 @@ const jsenvLogoSvgUrl = new URL("./jsenv-logo.svg", import.meta.url)
 const injectToolbar = async () => {
   await new Promise((resolve) => {
     if (window.requestIdleCallback) {
-      window.requestIdleCallback(resolve)
+      window.requestIdleCallback(resolve, { timeout: 400 })
     } else {
       window.requestAnimationFrame(resolve)
     }
   })
-
-  const { jsenvDirectoryRelativeUrl } = await fetchExploringJson()
-  const jsenvDirectoryServerUrl = resolveUrl(
-    jsenvDirectoryRelativeUrl,
-    document.location.origin,
-  )
-
+  const exploringJSON = await fetchExploringJson()
   const placeholder = getToolbarPlaceholder()
 
   const iframe = document.createElement("iframe")
@@ -43,14 +37,22 @@ const injectToolbar = async () => {
     "border": "none",
   })
   const iframeLoadedPromise = iframeToLoadedPromise(iframe)
-  const jsenvToolbarHtmlServerUrl = resolveUrl(
+  const jsenvCoreDirectoryServerUrl = new URL(
+    exploringJSON.jsenvCoreDirectoryRelativeUrl,
+    document.location.origin,
+  ).href
+  const jsenvToolbarHtmlServerUrl = new URL(
     TOOLBAR_BUILD_RELATIVE_URL,
-    jsenvDirectoryServerUrl,
+    jsenvCoreDirectoryServerUrl,
   )
   // set iframe src BEFORE putting it into the DOM (prevent firefox adding an history entry)
   iframe.setAttribute("src", jsenvToolbarHtmlServerUrl)
   placeholder.parentNode.replaceChild(iframe, placeholder)
 
+  addToolbarEventCallback(iframe, "toolbar_ready", () => {
+    sendCommandToToolbar(iframe, "renderToolbar", { exploringJSON })
+  })
+
   await iframeLoadedPromise
   iframe.removeAttribute("tabindex")
 
@@ -150,9 +152,6 @@ const injectToolbar = async () => {
       showToolbarTrigger()
     }
   })
-  addToolbarEventCallback(iframe, "toolbar_ready", () => {
-    sendCommandToToolbar(iframe, "renderToolbar")
-  })
 
   return iframe
 }
@@ -226,10 +225,13 @@ const iframeToLoadedPromise = (iframe) => {
   })
 }
 
-const resolveUrl = (url, baseUrl) => String(new URL(url, baseUrl))
-
 if (document.readyState === "complete") {
   injectToolbar()
 } else {
   window.addEventListener("load", injectToolbar)
+  // document.addEventListener("readystatechange", () => {
+  //   if (document.readyState === "complete") {
+  //     injectToolbar()
+  //   }
+  // })
 }

package/src/internal/dev_server/toolbar/toolbar.main.js

@@ -1,7 +1,6 @@
 import { urlIsInsideOf } from "@jsenv/filesystem/src/urlIsInsideOf.js"
 import { urlToRelativeUrl } from "@jsenv/filesystem/src/urlToRelativeUrl.js"
 
-import { fetchExploringJson } from "../exploring/fetchExploringJson.js"
 import { startJavaScriptAnimation } from "../toolbar/util/animation.js"
 import "./focus/toolbar.focus.js"
 import {
@@ -25,15 +24,14 @@ import { makeToolbarResponsive } from "./responsive/toolbar.responsive.js"
 
 const toolbarVisibilityPreference = createPreference("toolbar")
 
-const renderToolbar = async () => {
+const renderToolbar = async ({ exploringJSON }) => {
   const executedFileCompiledUrl = window.parent.location.href
   const compileServerOrigin = window.parent.location.origin
   // this should not block the whole toolbar rendering + interactivity
-  const exploringConfig = await fetchExploringJson()
-  const { outDirectoryRelativeUrl, livereloading } = exploringConfig
+  const { jsenvDirectoryRelativeUrl, livereloading } = exploringJSON
   const compileGroup = getCompileGroup({
     executedFileCompiledUrl,
-    outDirectoryRelativeUrl,
+    jsenvDirectoryRelativeUrl,
     compileServerOrigin,
   })
   const executedFileRelativeUrl = compileGroup.fileRelativeUrl
@@ -165,28 +163,27 @@ const showToolbar = ({ animate = true } = {}) => {
 
 const getCompileGroup = ({
   executedFileCompiledUrl,
-  outDirectoryRelativeUrl,
+  jsenvDirectoryRelativeUrl,
   compileServerOrigin,
 }) => {
-  const outDirectoryServerUrl = String(
-    new URL(outDirectoryRelativeUrl, compileServerOrigin),
-  )
-  if (urlIsInsideOf(executedFileCompiledUrl, outDirectoryServerUrl)) {
+  const jsenvDirectoryServerUrl = new URL(
+    jsenvDirectoryRelativeUrl,
+    compileServerOrigin,
+  ).href
+  if (urlIsInsideOf(executedFileCompiledUrl, jsenvDirectoryServerUrl)) {
     const afterCompileDirectory = urlToRelativeUrl(
       executedFileCompiledUrl,
-      outDirectoryServerUrl,
+      jsenvDirectoryServerUrl,
     )
     const slashIndex = afterCompileDirectory.indexOf("/")
     const fileRelativeUrl = afterCompileDirectory.slice(slashIndex + 1)
     return {
       fileRelativeUrl,
-      outDirectoryRelativeUrl,
       compileId: afterCompileDirectory.slice(0, slashIndex),
     }
   }
   return {
     fileRelativeUrl: new URL(executedFileCompiledUrl).pathname.slice(1),
-    outDirectoryRelativeUrl,
     compileId: null,
   }
 }
@@ -228,13 +225,12 @@ const sendEventToParent = (name, data) => {
 }
 
 window.toolbar = {
-  render: renderToolbar,
   show: showToolbar,
   hide: () => hideToolbar(),
 }
 
-addExternalCommandCallback("renderToolbar", () => {
-  renderToolbar()
+addExternalCommandCallback("renderToolbar", (data) => {
+  renderToolbar(data)
 })
 addExternalCommandCallback("showToolbar", () => {
   showToolbar()

package/src/internal/executing/executeConcurrently.js

@@ -215,7 +215,7 @@ export const executeConcurrently = async (
             projectDirectoryUrl,
             compileServerOrigin: compileServer.origin,
             compileServerId: compileServer.id,
-            outDirectoryRelativeUrl: compileServer.outDirectoryRelativeUrl,
+            jsenvDirectoryRelativeUrl: compileServer.jsenvDirectoryRelativeUrl,
 
             collectCoverage: coverage,
             coverageIgnorePredicate,

package/src/internal/executing/executePlan.js

@@ -1,7 +1,7 @@
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { createDetailedMessage } from "@jsenv/logger"
 
-import { mergeRuntimeSupport } from "@jsenv/core/src/internal/generateGroupMap/runtime_support.js"
+import { mergeRuntimeSupport } from "@jsenv/core/src/internal/runtime_support/runtime_support.js"
 import { startCompileServer } from "../compiling/startCompileServer.js"
 import { babelPluginInstrument } from "./coverage/babel_plugin_instrument.js"
 import { generateExecutionSteps } from "./generateExecutionSteps.js"
@@ -112,7 +112,6 @@ export const executePlan = async (
       projectDirectoryUrl,
       jsenvDirectoryRelativeUrl,
       jsenvDirectoryClean,
-      outDirectoryName: "dev",
 
       importResolutionMethod,
       importDefaultExtension,
@@ -146,7 +145,7 @@ export const executePlan = async (
       executionSteps = await generateExecutionSteps(
         {
           ...plan,
-          [compileServer.outDirectoryRelativeUrl]: null,
+          [compileServer.jsenvDirectoryRelativeUrl]: null,
         },
         {
           signal: multipleExecutionsOperation.signal,

package/src/internal/{generateGroupMap → features}/babel_plugins_compatibility.js

@@ -8,7 +8,7 @@
 // than importing it from an undocumented location.
 // Ideally it would be documented or a separate module
 
-export const jsenvBabelPluginCompatMap = {
+export const babelPluginCompatMap = {
   "proposal-numeric-separator": {
     chrome: "75",
     opera: "62",
@@ -425,14 +425,14 @@ export const jsenvBabelPluginCompatMap = {
 
 // copy of transform-async-to-generator
 // so that async is not transpiled when supported
-jsenvBabelPluginCompatMap["transform-async-to-promises"] =
-  jsenvBabelPluginCompatMap["transform-async-to-generator"]
+babelPluginCompatMap["transform-async-to-promises"] =
+  babelPluginCompatMap["transform-async-to-generator"]
 
-jsenvBabelPluginCompatMap["regenerator-transform"] =
-  jsenvBabelPluginCompatMap["transform-regenerator"]
+babelPluginCompatMap["regenerator-transform"] =
+  babelPluginCompatMap["transform-regenerator"]
 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/globalThis#browser_compatibility
-jsenvBabelPluginCompatMap["global-this-as-jsenv-import"] = {
+babelPluginCompatMap["global-this-as-jsenv-import"] = {
   edge: "79",
   firefox: "65",
   chrome: "71",
@@ -444,12 +444,12 @@ jsenvBabelPluginCompatMap["global-this-as-jsenv-import"] = {
 }
 
 // needs support for both json and css
-jsenvBabelPluginCompatMap["transform-import-assertions"] = {
+babelPluginCompatMap["transform-import-assertions"] = {
   chrome: "93",
   edge: "93",
 }
 
-jsenvBabelPluginCompatMap["new-stylesheet-as-jsenv-import"] = {
+babelPluginCompatMap["new-stylesheet-as-jsenv-import"] = {
   chrome: "93",
   edge: "93",
 }