@jsenv/core 40.6.2 → 40.7.1

package/src/plugins/protocol_file/jsenv_plugin_fs_redirection.js

@@ -3,11 +3,17 @@ import {
   applyFileSystemMagicResolution,
   getExtensionsToTry,
 } from "@jsenv/node-esm-resolution";
-import { urlToExtension, urlToPathname } from "@jsenv/urls";
-import { realpathSync } from "node:fs";
+import {
+  urlIsOrIsInsideOf,
+  urlToExtension,
+  urlToFilename,
+  urlToPathname,
+} from "@jsenv/urls";
+import { existsSync, realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 
 export const jsenvPluginFsRedirection = ({
+  spa,
   directoryContentMagicName,
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
@@ -97,11 +103,19 @@ export const jsenvPluginFsRedirection = ({
         // 3. The url pathname does not ends with "/"
         //    In that case we assume client explicitely asks to load a directory
         if (
+          spa &&
           !urlToExtension(urlObject) &&
           !urlToPathname(urlObject).endsWith("/")
         ) {
-          const { mainFilePath, rootDirectoryUrl } =
+          const { requestedUrl, rootDirectoryUrl, mainFilePath } =
             reference.ownerUrlInfo.context;
+          const closestHtmlRootFile = getClosestHtmlRootFile(
+            requestedUrl,
+            rootDirectoryUrl,
+          );
+          if (closestHtmlRootFile) {
+            return closestHtmlRootFile;
+          }
           return new URL(mainFilePath, rootDirectoryUrl);
         }
         return null;
@@ -150,3 +164,22 @@ const resolveSymlink = (fileUrl) => {
   }
   return realUrlObject.href;
 };
+
+const getClosestHtmlRootFile = (requestedUrl, serverRootDirectoryUrl) => {
+  let directoryUrl = new URL("./", requestedUrl);
+  while (true) {
+    const indexHtmlFileUrl = new URL(`index.html`, directoryUrl);
+    if (existsSync(indexHtmlFileUrl)) {
+      return indexHtmlFileUrl.href;
+    }
+    const filename = urlToFilename(directoryUrl);
+    const htmlFileUrlCandidate = new URL(`${filename}.html`, directoryUrl);
+    if (existsSync(htmlFileUrlCandidate)) {
+      return htmlFileUrlCandidate.href;
+    }
+    if (!urlIsOrIsInsideOf(directoryUrl, serverRootDirectoryUrl)) {
+      return null;
+    }
+    directoryUrl = new URL("../", directoryUrl);
+  }
+};

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -9,6 +9,7 @@ import { jsenvPluginFsRedirection } from "./jsenv_plugin_fs_redirection.js";
 const directoryContentMagicName = "...";
 
 export const jsenvPluginProtocolFile = ({
+  spa = true,
   magicExtensions,
   magicDirectoryIndex,
   preserveSymlinks,
@@ -20,6 +21,7 @@ export const jsenvPluginProtocolFile = ({
 }) => {
   return [
     jsenvPluginFsRedirection({
+      spa,
       directoryContentMagicName,
       magicExtensions,
       magicDirectoryIndex,
@@ -75,6 +77,7 @@ export const jsenvPluginProtocolFile = ({
     ...(directoryListing
       ? [
           jsenvPluginDirectoryListing({
+            spa,
             ...directoryListing,
             directoryContentMagicName,
             rootDirectoryUrl,

package/src/plugins/ribbon/client/ribbon.js

@@ -1,43 +1,46 @@
 export const injectRibbon = ({ text }) => {
   const css = /* css */ `
-      #jsenv_ribbon_container {
-        position: fixed;
-        z-index: 1001;
-        top: 0;
-        right: 0;
-        width: 100px;
-        height: 100px;
-        overflow: hidden;
-        opacity: 0.5;
-        pointer-events: none;
-      }
-      #jsenv_ribbon {
-        position: absolute;
-        top: -10px;
-        right: -10px;
-        width: 100%;
-        height: 100%;
-      }
-      #jsenv_ribbon_text {
-        position: absolute;
-        left: 0px;
-        top: 20px;
-        transform: rotate(45deg);
-        display: block;
-        width: 125px;
-        line-height: 36px;
-        background-color: orange;
-        color: rgb(55, 7, 7);
-        box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1);
-        font-weight: 700;
-        font-size: 16px;
-        font-family: "Lato", sans-serif;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-        text-align: center;
-        user-select: none;
-      }`;
+    #jsenv_ribbon_container {
+      position: fixed;
+      z-index: 1001;
+      top: 0;
+      right: 0;
+      width: 100px;
+      height: 100px;
+      overflow: hidden;
+      opacity: 0.5;
+      pointer-events: none;
+    }
+    #jsenv_ribbon {
+      position: absolute;
+      top: -10px;
+      right: -10px;
+      width: 100%;
+      height: 100%;
+    }
+    #jsenv_ribbon_text {
+      position: absolute;
+      left: 0px;
+      top: 20px;
+      transform: rotate(45deg);
+      display: block;
+      width: 125px;
+      line-height: 36px;
+      background-color: orange;
+      color: rgb(55, 7, 7);
+      box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1);
+      font-weight: 700;
+      font-size: 16px;
+      font-family: "Lato", sans-serif;
+      text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+      text-align: center;
+      user-select: none;
+    }
+  `;
   const html = /* html */ `<div id="jsenv_ribbon_container">
-      <style>${css}</style>
+      <style>
+        ${css}
+      </style>
       <div id="jsenv_ribbon">
         <div id="jsenv_ribbon_text">${text}</div>
       </div>

package/src/plugins/injections/internal/inject_globals.js

@@ -1,52 +0,0 @@
-import { injectJsenvScript, parseHtml, stringifyHtmlAst } from "@jsenv/ast";
-import { createMagicSource } from "@jsenv/sourcemap";
-
-export const injectGlobals = (content, globals, urlInfo) => {
-  if (urlInfo.type === "html") {
-    return globalInjectorOnHtml(content, globals, urlInfo);
-  }
-  if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
-    return globalsInjectorOnJs(content, globals, urlInfo);
-  }
-  throw new Error(`cannot inject globals into "${urlInfo.type}"`);
-};
-
-const globalInjectorOnHtml = (content, globals, urlInfo) => {
-  // ideally we would inject an importmap but browser support is too low
-  // (even worse for worker/service worker)
-  // so for now we inject code into entry points
-  const htmlAst = parseHtml({
-    html: content,
-    url: urlInfo.url,
-    storeOriginalPositions: false,
-  });
-  const clientCode = generateClientCodeForGlobals(globals, {
-    isWebWorker: false,
-  });
-  injectJsenvScript(htmlAst, {
-    content: clientCode,
-    pluginName: "jsenv:inject_globals",
-  });
-  return stringifyHtmlAst(htmlAst);
-};
-
-const globalsInjectorOnJs = (content, globals, urlInfo) => {
-  const clientCode = generateClientCodeForGlobals(globals, {
-    isWebWorker:
-      urlInfo.subtype === "worker" ||
-      urlInfo.subtype === "service_worker" ||
-      urlInfo.subtype === "shared_worker",
-  });
-  const magicSource = createMagicSource(content);
-  magicSource.prepend(clientCode);
-  return magicSource.toContentAndSourcemap();
-};
-
-const generateClientCodeForGlobals = (globals, { isWebWorker = false }) => {
-  const globalName = isWebWorker ? "self" : "window";
-  return `Object.assign(${globalName}, ${JSON.stringify(
-    globals,
-    null,
-    "  ",
-  )});`;
-};