@jsenv/core 29.8.6 → 29.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "29.8.6",
+  "version": "29.9.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -73,7 +73,7 @@
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.3.1",
-    "@jsenv/node-esm-resolution": "1.0.0",
+    "@jsenv/node-esm-resolution": "1.0.1",
     "@jsenv/server": "14.1.10",
     "@jsenv/sourcemap": "1.0.7",
     "@jsenv/uneval": "1.6.0",

package/src/build/build.js

@@ -669,43 +669,43 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           }
           if (rawUrlInfo.isEntryPoint) {
             addToBundlerIfAny(rawUrlInfo)
-            if (rawUrlInfo.type === "html") {
-              rawUrlInfo.dependencies.forEach((dependencyUrl) => {
-                const dependencyUrlInfo = rawGraph.getUrlInfo(dependencyUrl)
-                if (dependencyUrlInfo.isInline) {
-                  if (dependencyUrlInfo.type === "js_module") {
-                    // bundle inline script type module deps
-                    dependencyUrlInfo.references.forEach((inlineScriptRef) => {
-                      if (inlineScriptRef.type === "js_import") {
-                        const inlineUrlInfo = rawGraph.getUrlInfo(
-                          inlineScriptRef.url,
-                        )
-                        addToBundlerIfAny(inlineUrlInfo)
-                      }
-                    })
-                  }
-                  // inline content cannot be bundled
-                  return
+          }
+          if (rawUrlInfo.type === "html") {
+            rawUrlInfo.dependencies.forEach((dependencyUrl) => {
+              const dependencyUrlInfo = rawGraph.getUrlInfo(dependencyUrl)
+              if (dependencyUrlInfo.isInline) {
+                if (dependencyUrlInfo.type === "js_module") {
+                  // bundle inline script type module deps
+                  dependencyUrlInfo.references.forEach((inlineScriptRef) => {
+                    if (inlineScriptRef.type === "js_import") {
+                      const inlineUrlInfo = rawGraph.getUrlInfo(
+                        inlineScriptRef.url,
+                      )
+                      addToBundlerIfAny(inlineUrlInfo)
+                    }
+                  })
                 }
-                addToBundlerIfAny(dependencyUrlInfo)
-              })
-              rawUrlInfo.references.forEach((reference) => {
+                // inline content cannot be bundled
+                return
+              }
+              addToBundlerIfAny(dependencyUrlInfo)
+            })
+            rawUrlInfo.references.forEach((reference) => {
+              if (
+                reference.isResourceHint &&
+                reference.expectedType === "js_module"
+              ) {
+                const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
                 if (
-                  reference.isResourceHint &&
-                  reference.expectedType === "js_module"
+                  referencedUrlInfo &&
+                  // something else than the resource hint is using this url
+                  referencedUrlInfo.dependents.size > 0
                 ) {
-                  const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
-                  if (
-                    referencedUrlInfo &&
-                    // something else than the resource hint is using this url
-                    referencedUrlInfo.dependents.size > 0
-                  ) {
-                    addToBundlerIfAny(referencedUrlInfo)
-                  }
+                  addToBundlerIfAny(referencedUrlInfo)
                 }
-              })
-              return
-            }
+              }
+            })
+            return
           }
           // File referenced with new URL('./file.js', import.meta.url)
           // are entry points that should be bundled

package/src/plugins/plugins.js

@@ -83,8 +83,8 @@ export const getCorePlugins = ({
     jsenvPluginHttpUrls(),
     jsenvPluginUrlResolution({
       runtimeCompat,
-      urlResolution,
       clientMainFileUrl,
+      urlResolution,
     }),
     jsenvPluginUrlVersion(),
     jsenvPluginCommonJsGlobals(),

package/src/plugins/ribbon/jsenv_plugin_ribbon.js

@@ -14,7 +14,9 @@ export const jsenvPluginRibbon = ({
   const ribbonClientFileUrl = new URL("./client/ribbon.js", import.meta.url)
   const associations = URL_META.resolveAssociations(
     {
-      ribbon: { [htmlInclude]: true },
+      ribbon: {
+        [htmlInclude]: true,
+      },
     },
     rootDirectoryUrl,
   )
@@ -23,6 +25,9 @@ export const jsenvPluginRibbon = ({
     appliesDuring: "dev",
     transformUrlContent: {
       html: (urlInfo, context) => {
+        if (urlInfo.data.noribbon) {
+          return null
+        }
         const { ribbon } = URL_META.applyAssociations({
           url: asUrlWithoutSearch(urlInfo.url),
           associations,

package/src/plugins/url_resolution/jsenv_plugin_url_resolution.js

@@ -70,10 +70,11 @@ export const jsenvPluginUrlResolution = ({
     }
     if (node_esm) {
       if (node_esm === true) node_esm = {}
-      const { packageConditions } = node_esm
+      const { packageConditions, preservesSymlink } = node_esm
       resolvers[urlType] = createNodeEsmResolver({
         runtimeCompat,
         packageConditions,
+        preservesSymlink,
       })
     } else if (web) {
       resolvers[urlType] = resolveUrlUsingWebResolution
@@ -81,7 +82,10 @@ export const jsenvPluginUrlResolution = ({
   })
 
   if (!resolvers.js_module) {
-    resolvers.js_module = createNodeEsmResolver({ runtimeCompat })
+    resolvers.js_module = createNodeEsmResolver({
+      runtimeCompat,
+      preservesSymlink: true,
+    })
   }
   if (!resolvers["*"]) {
     resolvers["*"] = resolveUrlUsingWebResolution

package/src/plugins/url_resolution/node_esm_resolver.js

@@ -16,7 +16,11 @@ import {
   defaultReadPackageJson,
 } from "@jsenv/node-esm-resolution"
 
-export const createNodeEsmResolver = ({ runtimeCompat, packageConditions }) => {
+export const createNodeEsmResolver = ({
+  runtimeCompat,
+  packageConditions,
+  preservesSymlink,
+}) => {
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node")
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   packageConditions = packageConditions || [
@@ -37,6 +41,7 @@ export const createNodeEsmResolver = ({ runtimeCompat, packageConditions }) => {
       conditions: packageConditions,
       parentUrl,
       specifier: reference.specifier,
+      preservesSymlink,
     })
     if (context.dev) {
       const dependsOnPackageJson =

package/dist/js/html_src_set.js

@@ -1,20 +0,0 @@
-const parseSrcSet = srcset => {
-  const srcCandidates = [];
-  srcset.split(",").forEach(set => {
-    const [specifier, descriptor] = set.trim().split(" ");
-    srcCandidates.push({
-      specifier,
-      descriptor
-    });
-  });
-  return srcCandidates;
-};
-const stringifySrcSet = srcCandidates => {
-  const srcset = srcCandidates.map(({
-    specifier,
-    descriptor
-  }) => `${specifier} ${descriptor}`).join(", ");
-  return srcset;
-};
-
-export { parseSrcSet as p, stringifySrcSet as s };

package/src/plugins/toolbar/client/animation/toolbar_animation.js

@@ -1,39 +0,0 @@
-import { createPreference } from "../util/preferences.js"
-
-const animationPreference = createPreference("animation")
-
-export const renderToolbarAnimation = () => {
-  const animCheckbox = document.querySelector("#toggle-anims")
-  animCheckbox.checked = getAnimationPreference()
-  animCheckbox.onchange = () => {
-    setAnimationPreference(animCheckbox.checked)
-    onPreferenceChange(animCheckbox.checked)
-  }
-  onPreferenceChange()
-
-  // enable toolbar transition only after first render
-  setTimeout(() => {
-    document.querySelector("#toolbar").setAttribute("data-animate", "")
-  })
-}
-
-const onPreferenceChange = (value = getAnimationPreference()) => {
-  if (value) {
-    enableAnimation()
-  } else {
-    disableAnimation()
-  }
-}
-
-const getAnimationPreference = () =>
-  animationPreference.has() ? animationPreference.get() : true
-
-const setAnimationPreference = (value) => animationPreference.set(value)
-
-const enableAnimation = () => {
-  document.documentElement.removeAttribute("data-animation-disabled")
-}
-
-const disableAnimation = () => {
-  document.documentElement.setAttribute("data-animation-disabled", "")
-}

package/src/plugins/toolbar/client/eventsource/eventsource.css

@@ -1,83 +0,0 @@
-#eventsource-indicator button {
-  position: relative;
-}
-
-#eventsource-indicator button svg {
-  width: 40px;
-  height: 40px;
-}
-
-#eventsource-indicator .event-source-autoreload {
-  position: absolute;
-  width: 32px;
-  height: 32px;
-  margin: 4px;
-  left: 0;
-  top: 0;
-}
-
-.event-source-autoreload[data-variant="enabled"] {
-  color: green;
-}
-
-#eventsource-indicator .event-source-icon {
-  width: 40px;
-  height: 40px;
-}
-
-.eventsource-circle {
-  stroke: black;
-  stroke-width: 0;
-}
-
-.eventsource-circle[data-variant="off"] {
-  fill: #cecece;
-}
-
-.eventsource-circle[data-variant="connecting"] {
-  fill: #cecece;
-  animation: wink 1.2s ease-out infinite;
-  transform-origin: center;
-}
-
-@keyframes wink {
-  0% {
-    opacity: 0;
-  }
-  80% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
-
-.eventsource-ring {
-  stroke: rgba(206, 206, 206, 0.46);
-  stroke-width: 4;
-  fill: transparent;
-  animation: pulse 1.2s ease-out infinite;
-  transform-origin: center;
-}
-
-@keyframes pulse {
-  0% {
-    transform: scale(0);
-    opacity: 0;
-  }
-  50% {
-    opacity: 1;
-  }
-  100% {
-    transform: scale(1);
-    opacity: 0;
-  }
-}
-
-.eventsource-circle[data-variant="connected"] {
-  fill: green;
-}
-
-.eventsource-circle[data-variant="failed"] {
-  fill: #cc0000;
-}

package/src/plugins/toolbar/client/eventsource/toolbar_eventsource.js

@@ -1,57 +0,0 @@
-import { removeForceHideElement } from "../util/dom.js"
-import { enableVariant } from "../variant/variant.js"
-import {
-  toggleTooltip,
-  removeAutoShowTooltip,
-  autoShowTooltip,
-} from "../tooltip/tooltip.js"
-
-const parentEventSourceClient = window.parent.__jsenv_event_source_client__
-
-export const initToolbarEventSource = () => {
-  removeForceHideElement(document.querySelector("#eventsource-indicator"))
-  if (!parentEventSourceClient) {
-    disableAutoreloadSetting()
-    return
-  }
-  parentEventSourceClient.status.onchange = () => {
-    updateEventSourceIndicator()
-  }
-  updateEventSourceIndicator()
-}
-
-const updateEventSourceIndicator = () => {
-  const eventSourceIndicator = document.querySelector("#eventsource-indicator")
-  const eventSourceConnectionState = parentEventSourceClient.status.value
-  enableVariant(eventSourceIndicator, {
-    eventsource: eventSourceConnectionState,
-  })
-  const variantNode = document.querySelector(
-    "#eventsource-indicator > [data-when-active]",
-  )
-  variantNode.querySelector("button").onclick = () => {
-    toggleTooltip(eventSourceIndicator)
-  }
-  if (eventSourceConnectionState === "connecting") {
-    variantNode.querySelector("a").onclick = () => {
-      parentEventSourceClient.disconnect()
-    }
-  } else if (eventSourceConnectionState === "connected") {
-    removeAutoShowTooltip(eventSourceIndicator)
-  } else if (eventSourceConnectionState === "disconnected") {
-    autoShowTooltip(eventSourceIndicator)
-    variantNode.querySelector("a").onclick = () => {
-      parentEventSourceClient.connect()
-    }
-  }
-}
-
-const disableAutoreloadSetting = () => {
-  document
-    .querySelector(".settings-autoreload")
-    .setAttribute("data-disabled", "true")
-  document
-    .querySelector(".settings-autoreload")
-    .setAttribute("title", `Autoreload not available: disabled by server`)
-  document.querySelector("#toggle-autoreload").disabled = true
-}

package/src/plugins/toolbar/client/execution/execution.css

@@ -1,79 +0,0 @@
-/* Loader icon */
-#loader-icon {
-  width: 20px;
-  height: 20px;
-  margin: 10px;
-  transform: scaleX(-1);
-  color: #cecece;
-}
-#loader-icon[data-animate] {
-  opacity: 0;
-  transform-origin: center;
-  animation: rotateLoader 1s linear infinite !important;
-}
-@keyframes rotateLoader {
-  0% {
-    transform: scaleX(-1) rotate(360deg);
-    opacity: 1;
-  }
-  50% {
-    opacity: 0;
-  }
-  100% {
-    transform: scaleX(-1) rotate(0deg);
-    opacity: 1;
-  }
-}
-
-/* Check icon */
-#check-icon {
-  width: 25px;
-  height: 25px;
-  margin: 7px;
-  opacity: 0;
-  stroke-width: 5;
-}
-#check-icon[data-animate] {
-  opacity: 1;
-}
-#check-icon[data-animate] path {
-  transform-origin: 50% 50%;
-  stroke-dasharray: 48;
-  stroke-dashoffset: 48;
-  animation: stroke 0.5s cubic-bezier(0.65, 0, 0.45, 1) forwards;
-  stroke: green;
-}
-@keyframes stroke {
-  100% {
-    stroke-dashoffset: 0;
-  }
-}
-
-/* Cross icon */
-#cross-icon {
-  width: 20px;
-  height: 20px;
-  margin: 10px;
-  opacity: 0;
-  stroke-width: 5;
-}
-#cross-icon rect {
-  width: 33px;
-  height: 0;
-  fill: #d74640;
-}
-#cross-icon[data-animate] {
-  opacity: 1;
-}
-#cross-icon[data-animate] #cross_p1 {
-  animation: draw 0.5s cubic-bezier(0.65, 0, 0.45, 1) forwards;
-}
-#cross-icon[data-animate] #cross_p2 {
-  animation: draw 0.5s cubic-bezier(0.65, 0, 0.45, 1) forwards 0.2s;
-}
-@keyframes draw {
-  100% {
-    height: 376.964px;
-    width: 45px;
-  }
-}

package/src/plugins/toolbar/client/execution/toolbar_execution.js

@@ -1,88 +0,0 @@
-import { removeForceHideElement } from "../util/dom.js"
-import { enableVariant } from "../variant/variant.js"
-import { toggleTooltip } from "../tooltip/tooltip.js"
-import { notifyExecutionResult } from "../notification/toolbar_notification.js"
-
-export const renderExecutionInToolbar = async () => {
-  // reset file execution indicator ui
-  applyExecutionIndicator()
-  removeForceHideElement(document.querySelector("#execution-indicator"))
-
-  const { status, startTime, endTime } =
-    await window.parent.__supervisor__.getDocumentExecutionResult()
-  const execution = { status, startTime, endTime }
-  applyExecutionIndicator(execution)
-  const executionStorageKey = window.location.href
-  const previousExecution = sessionStorage.hasOwnProperty(executionStorageKey)
-    ? JSON.parse(sessionStorage.getItem(executionStorageKey))
-    : undefined
-  notifyExecutionResult(executionStorageKey, execution, previousExecution)
-  sessionStorage.setItem(executionStorageKey, JSON.stringify(execution))
-}
-
-// const changeLink = variantNode.querySelector(".eventsource-changes-link")
-// changeLink.innerHTML = reloadMessageCount
-// changeLink.onclick = () => {
-//   console.log(reloadMessages)
-//   // eslint-disable-next-line no-alert
-//   window.parent.alert(JSON.stringify(reloadMessages, null, "  "))
-// }
-
-// const someFailed = reloadMessages.some((m) => m.status === "failed")
-// const somePending = reloadMessages.some((m) => m.status === "pending")
-// const applyLink = variantNode.querySelector(".eventsource-reload-link")
-// applyLink.innerHTML = someFailed
-//   ? "failed"
-//   : somePending
-//   ? "applying..."
-//   : "apply changes"
-// applyLink.onclick = someFailed
-//   ? () => {
-//       parentEventSourceClient.applyReloadMessageEffects()
-//     }
-//   : somePending
-//   ? () => {}
-//   : () => {
-//       parentEventSourceClient.applyReloadMessageEffects()
-//     }
-
-// parentEventSourceClient.reloadMessagesSignal.onchange = () => {
-//   updateEventSourceIndicator()
-// }
-// const autoreloadCheckbox = document.querySelector("#toggle-autoreload")
-// autoreloadCheckbox.checked = parentEventSourceClient.isAutoreloadEnabled()
-// autoreloadCheckbox.onchange = () => {
-//   parentEventSourceClient.setAutoreloadPreference(autoreloadCheckbox.checked)
-//   updateEventSourceIndicator()
-// }
-
-const applyExecutionIndicator = ({
-  status = "running",
-  startTime,
-  endTime,
-} = {}) => {
-  const executionIndicator = document.querySelector("#execution-indicator")
-  enableVariant(executionIndicator, { execution: status })
-  const variantNode = executionIndicator.querySelector("[data-when-active]")
-  variantNode.querySelector("button").onclick = () =>
-    toggleTooltip(executionIndicator)
-  variantNode.querySelector(".tooltip").textContent = computeText({
-    status,
-    startTime,
-    endTime,
-  })
-}
-
-// relative time: https://github.com/tc39/proposal-intl-relative-time/issues/118
-const computeText = ({ status, startTime, endTime }) => {
-  if (status === "completed") {
-    return `Execution completed in ${endTime - startTime}ms`
-  }
-  if (status === "errored") {
-    return `Execution failed in ${endTime - startTime}ms`
-  }
-  if (status === "running") {
-    return "Executing..."
-  }
-  return ""
-}

package/src/plugins/toolbar/client/focus/focus.css

@@ -1,61 +0,0 @@
-button:focus,
-a:focus,
-input:focus,
-*[data-contains-hidden-input] input:focus + * {
-  outline-style: none;
-  outline-offset: -2px;
-}
-
-*[data-contains-hidden-input] input:focus + * {
-  outline-width: 4px;
-  outline-offset: -2px;
-}
-
-html[data-last-interaction="keyboard"] button:focus,
-html[data-last-interaction="keyboard"] a:focus,
-html[data-last-interaction="keyboard"] input:focus,
-html[data-last-interaction="keyboard"]
-  *[data-contains-hidden-input]
-  input:focus
-  + * {
-  outline-style: auto;
-}
-
-html[data-last-interaction="keyboard"]
-  *[data-contains-hidden-input]
-  input:focus
-  + * {
-  outline-color: rgb(0, 150, 255);
-}
-
-/*
-Don't try to replace @-moz-document url-prefix() this by
-
--moz-outline or -moz-outline-color
-Because firefox would take into account outline instead of -moz-outline
-
-:moz-focus-ring
-Because for some element we set the focus outline on a div which would not match :focusring
-*/
-@-moz-document url-prefix() {
-  html[data-last-interaction="keyboard"] button:focus,
-  html[data-last-interaction="keyboard"] a:focus,
-  html[data-last-interaction="keyboard"] input:focus,
-  html[data-last-interaction="keyboard"]
-    *[data-input-customized]
-    input:focus
-    + * {
-    outline-width: 2px;
-    outline-offset: 0;
-    outline-style: solid;
-    /*
-    force a blue color for firefox otherwise
-    it uses outline-color: inherit
-    making it unpredictible and sometimes hard to see
-    */
-    outline-color: rgb(0, 150, 255);
-  }
-}
-::-moz-focus-inner {
-  border: 0;
-}

package/src/plugins/toolbar/client/focus/toolbar_focus.js

@@ -1,19 +0,0 @@
-// handle data-last-interaction attr on html (focusring)
-window.addEventListener("mousedown", (mousedownEvent) => {
-  if (mousedownEvent.defaultPrevented) {
-    return
-  }
-  document.documentElement.setAttribute("data-last-interaction", "mouse")
-})
-window.addEventListener("touchstart", (touchstartEvent) => {
-  if (touchstartEvent.defaultPrevented) {
-    return
-  }
-  document.documentElement.setAttribute("data-last-interaction", "mouse")
-})
-window.addEventListener("keydown", (keydownEvent) => {
-  if (keydownEvent.defaultPrevented) {
-    return
-  }
-  document.documentElement.setAttribute("data-last-interaction", "keyboard")
-})