@jsenv/core 39.2.17 → 39.2.18

package/dist/js/ribbon.js

@@ -35,8 +35,7 @@ const injectRibbon = ({ text }) => {
         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>
       <div id="jsenv_ribbon">
@@ -64,7 +63,33 @@ const injectRibbon = ({ text }) => {
   const jsenvRibbonElement = new JsenvRibbonHtmlElement({
     hidden: toolbarStateInLocalStorage.ribbonDisplayed === false,
   });
-  document.body.appendChild(jsenvRibbonElement);
+  appendIntoRespectingLineBreaksAndIndentation(
+    jsenvRibbonElement,
+    document.body,
+  );
+};
+
+const appendIntoRespectingLineBreaksAndIndentation = (
+  node,
+  parentNode,
+  { indent = 2 } = {},
+) => {
+  const indentMinusOne = "  ".repeat(indent - 1);
+  const desiredIndent = "  ".repeat(indent);
+  const previousSibling =
+    parentNode.childNodes[parentNode.childNodes.length - 1];
+  if (previousSibling && previousSibling.nodeName === "#text") {
+    if (previousSibling.nodeValue === `\n${indentMinusOne}`) {
+      previousSibling.nodeValue = `\n${desiredIndent}`;
+    }
+    if (previousSibling.nodeValue !== `\n${desiredIndent}`) {
+      previousSibling.nodeValue = `\n${desiredIndent}`;
+    }
+  } else {
+    parentNode.appendChild(document.createTextNode(`\n${desiredIndent}`));
+  }
+  parentNode.appendChild(node);
+  parentNode.appendChild(document.createTextNode(`\n${indentMinusOne}`));
 };
 
 export { injectRibbon };

package/dist/jsenv_core.js

@@ -3065,7 +3065,7 @@ const isWindowsPathnameSpecifier = (specifier) => {
 };
 const hasScheme$1 = (specifier) => /^[a-zA-Z]+:/.test(specifier);
 
-const createFilter = (patterns, url) => {
+const createFilter = (patterns, url, map = (v) => v) => {
   const associations = resolveAssociations(
     {
       yes: patterns,
@@ -3074,7 +3074,7 @@ const createFilter = (patterns, url) => {
   );
   return (url) => {
     const meta = applyAssociations({ url, associations });
-    return Boolean(meta.yes);
+    return Boolean(map(meta.yes));
   };
 };
 
@@ -23179,6 +23179,9 @@ ${e.trace?.message}`);
         }
       },
       handleWebsocket: (websocket, { request }) => {
+        // if (true || logLevel === "debug") {
+        //   console.log("handleWebsocket", websocket, request.headers);
+        // }
         if (request.headers["sec-websocket-protocol"] === "jsenv") {
           serverEventsDispatcher.addWebsocket(websocket, request);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.2.17",
+  "version": "39.2.18",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -61,6 +61,7 @@
     "test:only_dev_server_errors": "node --conditions=development ./tests/dev_server/errors/dev_errors_snapshots.test.mjs",
     "workspace:test:ci": "CI=1 npm run workspace:test",
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
+    "playwright:install": "npx playwright install-deps && npx playwright install",
     "certificate:install": "node ./scripts/dev/install_certificate_authority.mjs",
     "prepublishOnly": "npm run build"
   },
@@ -68,20 +69,20 @@
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.0",
     "@jsenv/ast": "6.2.14",
-    "@jsenv/filesystem": "4.9.9",
+    "@jsenv/filesystem": "4.9.10",
     "@jsenv/humanize": "1.2.8",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.2",
     "@jsenv/js-module-fallback": "1.3.35",
     "@jsenv/node-esm-resolution": "1.0.2",
-    "@jsenv/plugin-bundling": "2.7.5",
+    "@jsenv/plugin-bundling": "2.7.6",
     "@jsenv/plugin-minification": "1.5.5",
     "@jsenv/plugin-supervisor": "1.5.15",
     "@jsenv/plugin-transpilation": "1.4.19",
     "@jsenv/runtime-compat": "1.3.1",
-    "@jsenv/server": "15.2.18",
+    "@jsenv/server": "15.2.19",
     "@jsenv/sourcemap": "1.2.22",
-    "@jsenv/url-meta": "8.5.0",
+    "@jsenv/url-meta": "8.5.1",
     "@jsenv/urls": "2.5.2",
     "@jsenv/utils": "2.1.2",
     "anchor-markdown-header": "0.7.0"

package/src/dev/start_dev_server.js

@@ -561,6 +561,9 @@ ${e.trace?.message}`);
         }
       },
       handleWebsocket: (websocket, { request }) => {
+        // if (true || logLevel === "debug") {
+        //   console.log("handleWebsocket", websocket, request.headers);
+        // }
         if (request.headers["sec-websocket-protocol"] === "jsenv") {
           serverEventsDispatcher.addWebsocket(websocket, request);
         }

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

@@ -35,8 +35,7 @@ export const injectRibbon = ({ text }) => {
         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>
       <div id="jsenv_ribbon">
@@ -64,5 +63,31 @@ export const injectRibbon = ({ text }) => {
   const jsenvRibbonElement = new JsenvRibbonHtmlElement({
     hidden: toolbarStateInLocalStorage.ribbonDisplayed === false,
   });
-  document.body.appendChild(jsenvRibbonElement);
+  appendIntoRespectingLineBreaksAndIndentation(
+    jsenvRibbonElement,
+    document.body,
+  );
+};
+
+const appendIntoRespectingLineBreaksAndIndentation = (
+  node,
+  parentNode,
+  { indent = 2 } = {},
+) => {
+  const indentMinusOne = "  ".repeat(indent - 1);
+  const desiredIndent = "  ".repeat(indent);
+  const previousSibling =
+    parentNode.childNodes[parentNode.childNodes.length - 1];
+  if (previousSibling && previousSibling.nodeName === "#text") {
+    if (previousSibling.nodeValue === `\n${indentMinusOne}`) {
+      previousSibling.nodeValue = `\n${desiredIndent}`;
+    }
+    if (previousSibling.nodeValue !== `\n${desiredIndent}`) {
+      previousSibling.nodeValue = `\n${desiredIndent}`;
+    }
+  } else {
+    parentNode.appendChild(document.createTextNode(`\n${desiredIndent}`));
+  }
+  parentNode.appendChild(node);
+  parentNode.appendChild(document.createTextNode(`\n${indentMinusOne}`));
 };