@jsenv/plugin-supervisor 1.6.10 → 1.6.11

package/dist/jsenv_plugin_supervisor.js

@@ -2,7 +2,6 @@ import { applyBabelPlugins, parseHtml, visitHtmlNodes, analyzeScriptNode, getHtm
 import process$1 from "node:process";
 import os from "node:os";
 import tty from "node:tty";
-import "string-width";
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -469,30 +468,38 @@ const fillLeft = (value, biggestValue, char = " ") => {
 // becoming "file:///file.css?css_module="
 // we want to get rid of the "=" and consider it's the same url
 const normalizeUrl = url => {
-  if (url.includes("?")) {
-    // disable on data urls (would mess up base64 encoding)
-    if (url.startsWith("data:")) {
-      return url;
-    }
-    return url.replace(/[=](?=&|$)/g, "");
+  const calledWithString = typeof url === "string";
+  const urlObject = calledWithString ? new URL(url) : url;
+  let urlString = urlObject.href;
+  if (!urlString.includes("?")) {
+    return url;
+  }
+  // disable on data urls (would mess up base64 encoding)
+  if (urlString.startsWith("data:")) {
+    return url;
   }
-  return url;
+  urlString = urlString.replace(/[=](?=&|$)/g, "");
+  if (calledWithString) {
+    return urlString;
+  }
+  urlObject.href = urlString;
+  return urlObject;
 };
 const injectQueryParams = (url, params) => {
-  const urlObject = new URL(url);
+  const calledWithString = typeof url === "string";
+  const urlObject = calledWithString ? new URL(url) : url;
   const {
     searchParams
   } = urlObject;
-  Object.keys(params).forEach(key => {
+  for (const key of Object.keys(params)) {
     const value = params[key];
     if (value === undefined) {
       searchParams.delete(key);
     } else {
       searchParams.set(key, value);
     }
-  });
-  const urlWithParams = urlObject.href;
-  return normalizeUrl(urlWithParams);
+  }
+  return normalizeUrl(calledWithString ? urlObject.href : urlObject);
 };
 
 const getCommonPathname = (pathname, otherPathname) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/plugin-supervisor",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -29,9 +29,9 @@
     "./src/client/supervisor.js"
   ],
   "dependencies": {
-    "@jsenv/ast": "6.6.5",
-    "@jsenv/urls": "2.6.3",
-    "@jsenv/sourcemap": "1.3.2"
+    "@jsenv/ast": "6.6.6",
+    "@jsenv/urls": "2.7.0",
+    "@jsenv/sourcemap": "1.3.3"
   },
   "scripts": {
     "build": "node ./scripts/build.mjs",