@jsenv/core 27.8.0 → 28.0.1

package/dist/main.js

@@ -12,10 +12,10 @@ import { createMagicSource, composeTwoSourcemaps, getOriginalPosition, sourcemap
 import { parseHtmlString, stringifyHtmlAst, visitHtmlNodes, getHtmlNodeAttribute, analyzeScriptNode, setHtmlNodeAttributes, parseSrcSet, getHtmlNodePosition, getHtmlNodeAttributePosition, applyPostCss, postCssPluginUrlVisitor, parseJsUrls, getHtmlNodeText, setHtmlNodeText, applyBabelPlugins, injectScriptNodeAsEarlyAsPossible, createHtmlNode, findHtmlNode, removeHtmlNode, removeHtmlNodeText, transpileWithParcel, injectJsImport, minifyWithParcel, analyzeLinkNode } from "@jsenv/ast";
 import { createRequire } from "node:module";
 import babelParser from "@babel/parser";
+import net, { createServer, isIP } from "node:net";
 import http from "node:http";
 import cluster from "node:cluster";
 import { performance as performance$1 } from "node:perf_hooks";
-import net, { createServer } from "node:net";
 import { Readable, Stream, Writable } from "node:stream";
 import { Http2ServerResponse } from "node:http2";
 import { lookup } from "node:dns";
@@ -94,7 +94,7 @@ const urlToScheme$1 = url => {
   return scheme;
 };
 
-const urlToRessource$1 = url => {
+const urlToResource = url => {
   const scheme = urlToScheme$1(url);
 
   if (scheme === "file") {
@@ -115,25 +115,25 @@ const urlToRessource$1 = url => {
 };
 
 const urlToPathname$1 = url => {
-  const ressource = urlToRessource$1(url);
-  const pathname = ressourceToPathname$1(ressource);
+  const resource = urlToResource(url);
+  const pathname = resourceToPathname(resource);
   return pathname;
 };
 
-const ressourceToPathname$1 = ressource => {
-  const searchSeparatorIndex = ressource.indexOf("?");
+const resourceToPathname = resource => {
+  const searchSeparatorIndex = resource.indexOf("?");
 
   if (searchSeparatorIndex > -1) {
-    return ressource.slice(0, searchSeparatorIndex);
+    return resource.slice(0, searchSeparatorIndex);
   }
 
-  const hashIndex = ressource.indexOf("#");
+  const hashIndex = resource.indexOf("#");
 
   if (hashIndex > -1) {
-    return ressource.slice(0, hashIndex);
+    return resource.slice(0, hashIndex);
   }
 
-  return ressource;
+  return resource;
 };
 
 const urlToFilename$1 = url => {
@@ -616,8 +616,8 @@ const urlToRelativeUrl = (url, baseUrl) => {
   } = urlObject;
 
   if (pathname === "/") {
-    const baseUrlRessourceWithoutLeadingSlash = baseUrlObject.pathname.slice(1);
-    return baseUrlRessourceWithoutLeadingSlash;
+    const baseUrlResourceWithoutLeadingSlash = baseUrlObject.pathname.slice(1);
+    return baseUrlResourceWithoutLeadingSlash;
   }
 
   const basePathname = baseUrlObject.pathname;
@@ -2006,10 +2006,10 @@ const ensureWindowsDriveLetter = (url, baseUrl) => {
   return `file:///${driveLetter}:${afterProtocol}`;
 };
 
-const extractDriveLetter = ressource => {
+const extractDriveLetter = resource => {
   // we still have the windows drive letter
-  if (/[a-zA-Z]/.test(ressource[1]) && ressource[2] === ":") {
-    return ressource[1];
+  if (/[a-zA-Z]/.test(resource[1]) && resource[2] === ":") {
+    return resource[1];
   }
 
   return null;
@@ -2136,7 +2136,7 @@ const createWatcher = (sourcePath, options) => {
   return watcher;
 };
 
-const trackRessources = () => {
+const trackResources = () => {
   const callbackArray = [];
 
   const registerCleanupCallback = callback => {
@@ -2244,7 +2244,7 @@ const registerDirectoryLifecycle = (source, {
     return watch;
   };
 
-  const tracker = trackRessources();
+  const tracker = trackResources();
   const infoMap = new Map();
 
   const readEntryInfo = url => {
@@ -2380,7 +2380,7 @@ const registerDirectoryLifecycle = (source, {
 
     if (entryInfo.type !== previousInfo.type) {
       // it existed and was replaced by something else
-      // we don't handle this as an update. We rather say the ressource
+      // we don't handle this as an update. We rather say the resource
       // is lost and something else is found (call removed() then added())
       handleEntryLost(previousInfo);
       handleEntryFound(entryInfo);
@@ -2591,7 +2591,7 @@ const registerFileLifecycle = (source, {
     }
   }
 
-  const tracker = trackRessources();
+  const tracker = trackResources();
 
   const handleFileFound = ({
     existent
@@ -4014,10 +4014,10 @@ const createUrlGraph = ({
     }
 
     references.forEach(reference => {
-      if (reference.isRessourceHint) {
-        // ressource hint are a special kind of reference.
+      if (reference.isResourceHint) {
+        // resource hint are a special kind of reference.
         // They are a sort of weak reference to an url.
-        // We ignore them so that url referenced only by ressource hints
+        // We ignore them so that url referenced only by resource hints
         // have url.dependents.size === 0 and can be considered as not used
         // It means html won't consider url referenced solely
         // by <link> as dependency and it's fine
@@ -4243,7 +4243,7 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
         crossorigin,
         integrity
       } = readFetchMetas(node);
-      const isRessourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(subtype);
+      const isResourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(subtype);
       const [reference] = referenceUtils.found({
         type,
         expectedType,
@@ -4252,7 +4252,7 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
         specifier,
         specifierLine: line,
         specifierColumn: column,
-        isRessourceHint,
+        isResourceHint,
         crossorigin,
         integrity
       });
@@ -4669,7 +4669,7 @@ const jsenvPluginUrlAnalysis = ({
         return;
       }
 
-      if (reference.specifier[0] === "#" && // For Html, css and in general "#" refer to a ressource in the page
+      if (reference.specifier[0] === "#" && // For Html, css and in general "#" refer to a resource in the page
       // so that urls must be kept intact
       // However for js import specifiers they have a different meaning and we want
       // to resolve them (https://nodejs.org/api/packages.html#imports for instance)
@@ -5825,10 +5825,10 @@ const jsenvPluginAsJsClassicHtml = ({
         const convertedUrls = [];
 
         const getReferenceAsJsClassic = async (reference, {
-          // we don't cook ressource hints
-          // because they might refer to ressource that will be modified during build
+          // we don't cook resource hints
+          // because they might refer to resource that will be modified during build
           // It also means something else HAVE to reference that url in order to cook it
-          // so that the preload is deleted by "resync_ressource_hints.js" otherwise
+          // so that the preload is deleted by "resync_resource_hints.js" otherwise
           cookIt = false
         } = {}) => {
           const newReferenceProps = {
@@ -10451,7 +10451,7 @@ const jsenvPluginAsJsClassicConversion = ({
       // - import specifier (static/dynamic import + re-export)
       // - url specifier when inside System.register/_context.import()
       //   (because it's the transpiled equivalent of static and dynamic imports)
-      // And not other references otherwise we could try to transform inline ressources
+      // And not other references otherwise we could try to transform inline resources
       // or specifiers inside new URL()...
       js_import_export: propagateJsClassicSearchParam,
       js_url_specifier: (reference, context) => {
@@ -10468,7 +10468,7 @@ const jsenvPluginAsJsClassicConversion = ({
         context,
         searchParam: "as_js_classic",
         // override the expectedType to "js_module"
-        // because when there is ?as_js_classic it means the underlying ressource
+        // because when there is ?as_js_classic it means the underlying resource
         // is a js_module
         expectedType: "js_module"
       });
@@ -11531,26 +11531,26 @@ const getParentUrl = url => {
   if (url.startsWith("file://")) {
     // With node.js new URL('../', 'file:///C:/').href
     // returns "file:///C:/" instead of "file:///"
-    const ressource = url.slice("file://".length);
-    const slashLastIndex = ressource.lastIndexOf("/");
+    const resource = url.slice("file://".length);
+    const slashLastIndex = resource.lastIndexOf("/");
 
     if (slashLastIndex === -1) {
       return url;
     }
 
-    const lastCharIndex = ressource.length - 1;
+    const lastCharIndex = resource.length - 1;
 
     if (slashLastIndex === lastCharIndex) {
-      const slashBeforeLastIndex = ressource.lastIndexOf("/", slashLastIndex - 1);
+      const slashBeforeLastIndex = resource.lastIndexOf("/", slashLastIndex - 1);
 
       if (slashBeforeLastIndex === -1) {
         return url;
       }
 
-      return `file://${ressource.slice(0, slashBeforeLastIndex + 1)}`;
+      return `file://${resource.slice(0, slashBeforeLastIndex + 1)}`;
     }
 
-    return `file://${ressource.slice(0, slashLastIndex + 1)}`;
+    return `file://${resource.slice(0, slashLastIndex + 1)}`;
   }
 
   return new URL(url.endsWith("/") ? "../" : "./", url).href;
@@ -13190,7 +13190,7 @@ const jsenvPluginHtmlSupervisor = ({
     name: "jsenv:html_supervisor",
     appliesDuring: "dev",
     serve: async (request, context) => {
-      if (request.ressource.startsWith("/__get_code_frame__/")) {
+      if (request.pathname.startsWith("/__get_code_frame__/")) {
         const {
           pathname,
           searchParams
@@ -13249,8 +13249,8 @@ const jsenvPluginHtmlSupervisor = ({
         };
       }
 
-      if (request.ressource.startsWith("/__get_error_cause__/")) {
-        const file = request.ressource.slice("/__get_error_cause__/".length);
+      if (request.pathname.startsWith("/__get_error_cause__/")) {
+        const file = request.pathname.slice("/__get_error_cause__/".length);
 
         if (!file) {
           return {
@@ -13309,8 +13309,8 @@ const jsenvPluginHtmlSupervisor = ({
         };
       }
 
-      if (request.ressource.startsWith("/__open_in_editor__/")) {
-        const file = request.ressource.slice("/__open_in_editor__/".length);
+      if (request.pathname.startsWith("/__open_in_editor__/")) {
+        const file = request.pathname.slice("/__open_in_editor__/".length);
 
         if (!file) {
           return {
@@ -13742,7 +13742,6 @@ const jsenvPluginImportMetaScenarios = () => {
         });
         const {
           dev = [],
-          test = [],
           build = []
         } = metadata.importMetaScenarios;
         const replacements = [];
@@ -13759,9 +13758,6 @@ const jsenvPluginImportMetaScenarios = () => {
           dev.forEach(path => {
             replace(path, "undefined");
           });
-          test.forEach(path => {
-            replace(path, context.scenarios.test ? "true" : "undefined");
-          });
           build.forEach(path => {
             replace(path, "true");
           });
@@ -13773,12 +13769,6 @@ const jsenvPluginImportMetaScenarios = () => {
           dev.forEach(path => {
             replace(path, "true");
           });
-
-          if (context.scenarios.test) {
-            test.forEach(path => {
-              replace(path, "true");
-            });
-          }
         }
 
         const magicSource = createMagicSource(urlInfo.content);
@@ -14062,6 +14052,87 @@ export default inlineContent.text`,
   return [asJsonModule, asCssModule, asTextModule];
 };
 
+const babelPluginInstrument = (api, {
+  rootDirectoryUrl,
+  useInlineSourceMaps = false,
+  coverageConfig = {
+    "./**/*": true
+  }
+}) => {
+  const {
+    programVisitor
+  } = requireFromJsenv("istanbul-lib-instrument");
+  const {
+    types
+  } = api;
+  const associations = URL_META.resolveAssociations({
+    cover: coverageConfig
+  }, rootDirectoryUrl);
+
+  const shouldInstrument = url => {
+    return URL_META.applyAssociations({
+      url,
+      associations
+    }).cover;
+  };
+
+  return {
+    name: "transform-instrument",
+    visitor: {
+      Program: {
+        enter(path) {
+          const {
+            file
+          } = this;
+          const {
+            opts
+          } = file;
+
+          if (!opts.sourceFileName) {
+            console.warn(`cannot instrument file when "sourceFileName" option is not set`);
+            return;
+          }
+
+          const fileUrl = fileSystemPathToUrl$1(opts.sourceFileName);
+
+          if (!shouldInstrument(fileUrl)) {
+            return;
+          }
+
+          this.__dv__ = null;
+          let inputSourceMap;
+
+          if (useInlineSourceMaps) {
+            // https://github.com/istanbuljs/babel-plugin-istanbul/commit/a9e15643d249a2985e4387e4308022053b2cd0ad#diff-1fdf421c05c1140f6d71444ea2b27638R65
+            inputSourceMap = opts.inputSourceMap || file.inputMap ? file.inputMap.sourcemap : null;
+          } else {
+            inputSourceMap = opts.inputSourceMap;
+          }
+
+          this.__dv__ = programVisitor(types, opts.filenameRelative || opts.filename, {
+            coverageVariable: "__coverage__",
+            inputSourceMap
+          });
+
+          this.__dv__.enter(path);
+        },
+
+        exit(path) {
+          if (!this.__dv__) {
+            return;
+          }
+
+          const object = this.__dv__.exit(path); // object got two properties: fileCoverage and sourceMappingURL
+
+
+          this.file.metadata.coverage = object.fileCoverage;
+        }
+
+      }
+    }
+  };
+};
+
 const versionFromValue = value => {
   if (typeof value === "number") {
     return numberToVersion(value);
@@ -15243,6 +15314,17 @@ const jsenvPluginBabel = ({
       getImportSpecifier
     });
 
+    if (context.scenarios.dev) {
+      const requestHeaders = context.request.headers;
+
+      if (requestHeaders["x-coverage-instanbul"]) {
+        babelPluginStructure["transform-instrument"] = [babelPluginInstrument, {
+          rootDirectoryUrl: context.rootDirectoryUrl,
+          coverageConfig: JSON.parse(requestHeaders["x-coverage-instanbul"])
+        }];
+      }
+    }
+
     if (getCustomBabelPlugins) {
       Object.assign(babelPluginStructure, getCustomBabelPlugins(context));
     }
@@ -16315,7 +16397,7 @@ const htmlNodeCanHotReload = node => {
   if (node.nodeName === "link") {
     const {
       isStylesheet,
-      isRessourceHint,
+      isResourceHint,
       rel
     } = analyzeLinkNode(node);
 
@@ -16324,9 +16406,9 @@ const htmlNodeCanHotReload = node => {
       return true;
     }
 
-    if (isRessourceHint) {
-      // for ressource hints html will be notified the underlying ressource has changed
-      // but we won't do anything (if the ressource is deleted we should?)
+    if (isResourceHint) {
+      // for resource hints html will be notified the underlying resource has changed
+      // but we won't do anything (if the resource is deleted we should?)
       return true;
     }
 
@@ -16561,10 +16643,7 @@ import.meta.hot = createImportMetaHot(import.meta.url)
 const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
-    appliesDuring: {
-      dev: true,
-      test: false
-    },
+    appliesDuring: "dev",
     redirectUrl: reference => {
       const urlObject = new URL(reference.url);
 
@@ -16607,10 +16686,7 @@ const jsenvPluginAutoreloadClient = () => {
   const autoreloadClientFileUrl = new URL("./js/autoreload.js", import.meta.url).href;
   return {
     name: "jsenv:autoreload_client",
-    appliesDuring: {
-      dev: true,
-      test: false
-    },
+    appliesDuring: "dev",
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         const htmlAst = parseHtmlString(htmlUrlInfo.content);
@@ -16640,10 +16716,7 @@ const jsenvPluginAutoreloadServer = ({
 }) => {
   return {
     name: "jsenv:autoreload_server",
-    appliesDuring: {
-      dev: true,
-      test: false
-    },
+    appliesDuring: "dev",
     serverEvents: {
       reload: ({
         sendServerEvent,
@@ -16805,7 +16878,7 @@ const jsenvPluginAutoreloadServer = ({
           firstUrlInfo
         }) => {
           const mainHotUpdate = propagateUpdate(firstUrlInfo);
-          const cause = `following files are no longer referenced: ${prunedUrlInfos.map(prunedUrlInfo => formatUrlForClient(prunedUrlInfo.url))}`; // now check if we can hot update the main ressource
+          const cause = `following files are no longer referenced: ${prunedUrlInfos.map(prunedUrlInfo => formatUrlForClient(prunedUrlInfo.url))}`; // now check if we can hot update the main resource
           // then if we can hot update all dependencies
 
           if (mainHotUpdate.declined) {
@@ -16852,7 +16925,7 @@ const jsenvPluginAutoreloadServer = ({
       rootDirectoryUrl,
       urlGraph
     }) => {
-      if (request.ressource === "/__graph__") {
+      if (request.pathname === "/__graph__") {
         const graphJson = JSON.stringify(urlGraph.toJSON(rootDirectoryUrl));
         return {
           status: 200,
@@ -16922,7 +16995,7 @@ const jsenvPluginExplorer = ({
     serve: async (request, {
       rootDirectoryUrl
     }) => {
-      if (request.ressource !== "/") {
+      if (request.pathname !== "/") {
         return null;
       }
 
@@ -17896,7 +17969,7 @@ const nodeStreamToObservable = nodeStream => {
     // safe measure, ensure the readable stream gets
     // used in the next ${readableStreamLifetimeInSeconds} otherwise destroys it
     const timeout = setTimeout(() => {
-      process.emitWarning(`Readable stream not used after ${readableStreamLifetimeInSeconds} seconds. It will be destroyed to release ressources`, {
+      process.emitWarning(`Readable stream not used after ${readableStreamLifetimeInSeconds} seconds. It will be destroyed to release resources`, {
         CODE: "READABLE_STREAM_TIMEOUT",
         // url is for http client request
         detail: `path: ${nodeStream.path}, fd: ${nodeStream.fd}, url: ${nodeStream.url}`
@@ -17976,8 +18049,8 @@ const fromNodeRequest = (nodeRequest, {
     signal,
     http2: Boolean(nodeRequest.stream),
     origin: requestOrigin,
-    ...getPropertiesFromRessource({
-      ressource: nodeRequest.url,
+    ...getPropertiesFromResource({
+      resource: nodeRequest.url,
       baseUrl: requestOrigin
     }),
     method: nodeRequest.method,
@@ -17986,13 +18059,13 @@ const fromNodeRequest = (nodeRequest, {
   });
 };
 const applyRedirectionToRequest = (request, {
-  ressource,
+  resource,
   pathname,
   ...rest
 }) => {
   return { ...request,
-    ...(ressource ? getPropertiesFromRessource({
-      ressource,
+    ...(resource ? getPropertiesFromResource({
+      resource,
       baseUrl: request.url
     }) : pathname ? getPropertiesFromPathname({
       pathname,
@@ -18002,16 +18075,16 @@ const applyRedirectionToRequest = (request, {
   };
 };
 
-const getPropertiesFromRessource = ({
-  ressource,
+const getPropertiesFromResource = ({
+  resource,
   baseUrl
 }) => {
-  const urlObject = new URL(ressource, baseUrl);
+  const urlObject = new URL(resource, baseUrl);
   let pathname = urlObject.pathname;
   return {
     url: String(urlObject),
     pathname,
-    ressource
+    resource
   };
 };
 
@@ -18019,8 +18092,8 @@ const getPropertiesFromPathname = ({
   pathname,
   baseUrl
 }) => {
-  return getPropertiesFromRessource({
-    ressource: `${pathname}${new URL(baseUrl).search}`,
+  return getPropertiesFromResource({
+    resource: `${pathname}${new URL(baseUrl).search}`,
     baseUrl
   });
 };
@@ -18048,11 +18121,11 @@ const createPushRequest = (request, {
 const getHeadersInheritedByPushRequest = request => {
   const headersInherited = { ...request.headers
   }; // mtime sent by the client in request headers concerns the main request
-  // Time remains valid for request to other ressources so we keep it
+  // Time remains valid for request to other resources so we keep it
   // in child requests
   // delete childHeaders["if-modified-since"]
   // eTag sent by the client in request headers concerns the main request
-  // A request made to an other ressource must not inherit the eTag
+  // A request made to an other resource must not inherit the eTag
 
   delete headersInherited["if-none-match"];
   return headersInherited;
@@ -18367,101 +18440,12 @@ const statusIsClientError = status => status >= 400 && status < 500;
 
 const statusIsServerError = status => status >= 500 && status < 600;
 
-const applyDnsResolution = async (hostname, {
-  verbatim = false
-} = {}) => {
-  const dnsResolution = await new Promise((resolve, reject) => {
-    lookup(hostname, {
-      verbatim
-    }, (error, address, family) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve({
-          address,
-          family
-        });
-      }
-    });
-  });
-  return dnsResolution;
-};
-
-const getServerOrigins = async ({
-  protocol,
-  host,
-  port
-}) => {
-  const isLocal = LOOPBACK_HOSTNAMES.includes(host);
-  const localhostDnsResolution = await applyDnsResolution("localhost");
-  const localOrigin = createServerOrigin({
-    protocol,
-    hostname: localhostDnsResolution.address === "127.0.0.1" ? "localhost" : "127.0.0.1",
-    port
-  });
-
-  if (isLocal) {
-    return {
-      local: localOrigin
-    };
-  }
-
-  const isAnyIp = WILDCARD_HOSTNAMES.includes(host);
-  const networkOrigin = createServerOrigin({
-    protocol,
-    hostname: isAnyIp ? getExternalIp() : host,
-    port
-  });
-  return {
-    local: localOrigin,
-    network: networkOrigin
-  };
-};
-const LOOPBACK_HOSTNAMES = ["localhost", "127.0.0.1", "::1", "0000:0000:0000:0000:0000:0000:0000:0001"];
-const WILDCARD_HOSTNAMES = [undefined, "0.0.0.0", "::", "0000:0000:0000:0000:0000:0000:0000:0000"];
-
-const createServerOrigin = ({
-  protocol,
-  hostname,
-  port
-}) => {
-  const url = new URL("https://127.0.0.1:80");
-  url.protocol = protocol;
-  url.hostname = hostname;
-  url.port = port;
-  return url.origin;
-};
-
-const getExternalIp = () => {
-  const networkInterfaceMap = networkInterfaces();
-  let internalIPV4NetworkAddress;
-  Object.keys(networkInterfaceMap).find(key => {
-    const networkAddressArray = networkInterfaceMap[key];
-    return networkAddressArray.find(networkAddress => {
-      if (networkAddress.internal) return false;
-      if (!isIpV4(networkAddress)) return false;
-      internalIPV4NetworkAddress = networkAddress;
-      return true;
-    });
-  });
-  return internalIPV4NetworkAddress ? internalIPV4NetworkAddress.address : null;
-};
-
-const isIpV4 = networkAddress => {
-  // node 18+
-  if (typeof networkAddress.family === "number") {
-    return networkAddress.family === 4;
-  }
-
-  return networkAddress.family === "IPv4";
-};
-
 const listen = async ({
   signal = new AbortController().signal,
   server,
   port,
   portHint,
-  host
+  hostname
 }) => {
   const listeningOperation = Abort.startOperation();
 
@@ -18472,7 +18456,7 @@ const listen = async ({
       listeningOperation.throwIfAborted();
       port = await findFreePort(portHint, {
         signal: listeningOperation.signal,
-        host
+        hostname
       });
     }
 
@@ -18480,7 +18464,7 @@ const listen = async ({
     port = await startListening({
       server,
       port,
-      host
+      hostname
     });
     listeningOperation.addAbortCallback(() => stopListening(server));
     listeningOperation.throwIfAborted();
@@ -18492,7 +18476,7 @@ const listen = async ({
 
 const findFreePort = async (initialPort = 1, {
   signal = new AbortController().signal,
-  host = "127.0.0.1",
+  hostname = "127.0.0.1",
   min = 1,
   max = 65534,
   next = port => port + 1
@@ -18514,27 +18498,27 @@ const findFreePort = async (initialPort = 1, {
       const nextPort = next(port);
 
       if (nextPort > max) {
-        throw new Error(`${host} has no available port between ${min} and ${max}`);
+        throw new Error(`${hostname} has no available port between ${min} and ${max}`);
       }
 
-      return testUntil(nextPort, host);
+      return testUntil(nextPort, hostname);
     };
 
-    const freePort = await testUntil(initialPort, host);
+    const freePort = await testUntil(initialPort, hostname);
     return freePort;
   } finally {
     await findFreePortOperation.end();
   }
 };
 
-const portIsFree = async (port, host) => {
+const portIsFree = async (port, hostname) => {
   const server = createServer();
 
   try {
     await startListening({
       server,
       port,
-      host
+      hostname
     });
   } catch (error) {
     if (error && error.code === "EADDRINUSE") {
@@ -18555,7 +18539,7 @@ const portIsFree = async (port, host) => {
 const startListening = ({
   server,
   port,
-  host
+  hostname
 }) => {
   return new Promise((resolve, reject) => {
     server.on("error", reject);
@@ -18564,7 +18548,7 @@ const startListening = ({
       // https://nodejs.org/api/net.html#net_server_listen_port_host_backlog_callback
       resolve(server.address().port);
     });
-    server.listen(port, host);
+    server.listen(port, hostname);
   });
 };
 
@@ -18803,6 +18787,134 @@ const STOP_REASON_PROCESS_BEFORE_EXIT = createReason("process before exit");
 const STOP_REASON_PROCESS_EXIT = createReason("process exit");
 const STOP_REASON_NOT_SPECIFIED = createReason("not specified");
 
+const createIpGetters = () => {
+  const networkAddresses = [];
+  const networkInterfaceMap = networkInterfaces();
+
+  for (const key of Object.keys(networkInterfaceMap)) {
+    for (const networkAddress of networkInterfaceMap[key]) {
+      networkAddresses.push(networkAddress);
+    }
+  }
+
+  return {
+    getFirstInternalIp: ({
+      preferIpv6
+    }) => {
+      const isPref = preferIpv6 ? isIpV6 : isIpV4;
+      let firstInternalIp;
+
+      for (const networkAddress of networkAddresses) {
+        if (networkAddress.internal) {
+          firstInternalIp = networkAddress.address;
+
+          if (isPref(networkAddress)) {
+            break;
+          }
+        }
+      }
+
+      return firstInternalIp;
+    },
+    getFirstExternalIp: ({
+      preferIpv6
+    }) => {
+      const isPref = preferIpv6 ? isIpV6 : isIpV4;
+      let firstExternalIp;
+
+      for (const networkAddress of networkAddresses) {
+        if (!networkAddress.internal) {
+          firstExternalIp = networkAddress.address;
+
+          if (isPref(networkAddress)) {
+            break;
+          }
+        }
+      }
+
+      return firstExternalIp;
+    }
+  };
+};
+
+const isIpV4 = networkAddress => {
+  // node 18.5
+  if (typeof networkAddress.family === "number") {
+    return networkAddress.family === 4;
+  }
+
+  return networkAddress.family === "IPv4";
+};
+
+const isIpV6 = networkAddress => !isIpV4(networkAddress);
+
+const parseHostname = hostname => {
+  if (hostname === "0.0.0.0") {
+    return {
+      type: "ip",
+      label: "unspecified",
+      version: 4
+    };
+  }
+
+  if (hostname === "::" || hostname === "0000:0000:0000:0000:0000:0000:0000:0000") {
+    return {
+      type: "ip",
+      label: "unspecified",
+      version: 6
+    };
+  }
+
+  if (hostname === "127.0.0.1") {
+    return {
+      type: "ip",
+      label: "loopback",
+      version: 4
+    };
+  }
+
+  if (hostname === "::1" || hostname === "0000:0000:0000:0000:0000:0000:0000:0001") {
+    return {
+      type: "ip",
+      label: "loopback",
+      version: 6
+    };
+  }
+
+  const ipVersion = isIP(hostname);
+
+  if (ipVersion === 0) {
+    return {
+      type: "hostname"
+    };
+  }
+
+  return {
+    type: "ip",
+    version: ipVersion
+  };
+};
+
+const applyDnsResolution = async (hostname, {
+  verbatim = false
+} = {}) => {
+  const dnsResolution = await new Promise((resolve, reject) => {
+    lookup(hostname, {
+      verbatim
+    }, (error, address, family) => {
+      if (error) {
+        reject(error);
+      } else {
+        resolve({
+          address,
+          family
+        });
+      }
+    });
+  });
+  return dnsResolution;
+};
+
 const startServer = async ({
   signal = new AbortController().signal,
   logLevel,
@@ -18814,7 +18926,8 @@ const startServer = async ({
   redirectHttpToHttps,
   allowHttpRequestOnHttps = false,
   acceptAnyIp = false,
-  host = acceptAnyIp ? undefined : "localhost",
+  preferIpv6,
+  hostname = "localhost",
   port = 0,
   // assign a random available port
   portHint,
@@ -18839,11 +18952,15 @@ const startServer = async ({
     requestWaitingMs
   }) => {
     warn(createDetailedMessage$1(`still no response found for request after ${requestWaitingMs} ms`, {
-      "request url": `${request.origin}${request.ressource}`,
+      "request url": request.url,
       "request headers": JSON.stringify(request.headers, null, "  ")
     }));
   }
 } = {}) => {
+  const logger = createLogger({
+    logLevel
+  });
+
   if (protocol !== "http" && protocol !== "https") {
     throw new Error(`protocol must be http or https, got ${protocol}`);
   }
@@ -18862,10 +18979,6 @@ const startServer = async ({
     throw new Error(`http2 needs "https" but protocol is "${protocol}"`);
   }
 
-  const logger = createLogger({
-    logLevel
-  });
-
   if (redirectHttpToHttps === undefined && protocol === "https" && !allowHttpRequestOnHttps) {
     redirectHttpToHttps = true;
   }
@@ -18898,6 +19011,10 @@ const startServer = async ({
   let nodeServer;
   const startServerOperation = Abort.startOperation();
   const stopCallbackList = createCallbackListNotifiedOnce();
+  const serverOrigins = {
+    local: "" // favors hostname when possible
+
+  };
 
   try {
     startServerOperation.addAbortSignal(signal);
@@ -18925,12 +19042,85 @@ const startServer = async ({
       nodeServer.unref();
     }
 
+    const createOrigin = hostname => {
+      if (isIP(hostname) === 6) {
+        return `${protocol}://[${hostname}]`;
+      }
+
+      return `${protocol}://${hostname}`;
+    };
+
+    const ipGetters = createIpGetters();
+    let hostnameToListen;
+
+    if (acceptAnyIp) {
+      const firstInternalIp = ipGetters.getFirstInternalIp({
+        preferIpv6
+      });
+      serverOrigins.local = createOrigin(firstInternalIp);
+      serverOrigins.localip = createOrigin(firstInternalIp);
+      const firstExternalIp = ipGetters.getFirstExternalIp({
+        preferIpv6
+      });
+      serverOrigins.externalip = createOrigin(firstExternalIp);
+      hostnameToListen = preferIpv6 ? "::" : "0.0.0.0";
+    } else {
+      hostnameToListen = hostname;
+    }
+
+    const hostnameInfo = parseHostname(hostname);
+
+    if (hostnameInfo.type === "ip") {
+      if (acceptAnyIp) {
+        throw new Error(`hostname cannot be an ip when acceptAnyIp is enabled, got ${hostname}`);
+      }
+
+      preferIpv6 = hostnameInfo.version === 6;
+      const firstInternalIp = ipGetters.getFirstInternalIp({
+        preferIpv6
+      });
+      serverOrigins.local = createOrigin(firstInternalIp);
+      serverOrigins.localip = createOrigin(firstInternalIp);
+
+      if (hostnameInfo.label === "unspecified") {
+        const firstExternalIp = ipGetters.getFirstExternalIp({
+          preferIpv6
+        });
+        serverOrigins.externalip = createOrigin(firstExternalIp);
+      } else if (hostnameInfo.label === "loopback") {} else {
+        serverOrigins.local = createOrigin(hostname);
+      }
+    } else {
+      const hostnameDnsResolution = await applyDnsResolution(hostname, {
+        verbatim: true
+      });
+
+      if (hostnameDnsResolution) {
+        const hostnameIp = hostnameDnsResolution.address;
+        serverOrigins.localip = createOrigin(hostnameIp);
+        serverOrigins.local = createOrigin(hostname);
+      } else {
+        const firstInternalIp = ipGetters.getFirstInternalIp({
+          preferIpv6
+        }); // fallback to internal ip because there is no ip
+        // associated to this hostname on operating system (in hosts file)
+
+        hostname = firstInternalIp;
+        hostnameToListen = firstInternalIp;
+        serverOrigins.local = createOrigin(firstInternalIp);
+      }
+    }
+
     port = await listen({
       signal: startServerOperation.signal,
       server: nodeServer,
       port,
       portHint,
-      host
+      hostname: hostnameToListen
+    }); // normalize origins (remove :80 when port is 80 for instance)
+
+    Object.keys(serverOrigins).forEach(key => {
+      serverOrigins[key] = new URL(`${serverOrigins[key]}:${port}`).origin;
     });
     serviceController.callHooks("serverListening", {
       port
@@ -18941,12 +19131,23 @@ const startServer = async ({
     startServerOperation.throwIfAborted();
   } finally {
     await startServerOperation.end();
-  } // now the server is started (listening) it cannot be aborted anymore
+  } // the main server origin
+  // - when protocol is http
+  //   node-fetch do not apply local dns resolution to map localhost back to 127.0.0.1
+  //   despites localhost being mapped so we prefer to use the internal ip
+  //   (127.0.0.1)
+  // - when protocol is https
+  //   using the hostname becomes important because the certificate is generated
+  //   for hostnames, not for ips
+  //   so we prefer https://locahost or https://local_hostname
+  //   over the ip
+
+
+  const serverOrigin = serverOrigins.local; // now the server is started (listening) it cannot be aborted anymore
   // (otherwise an AbortError is thrown to the code calling "startServer")
   // we can proceed to create a stop function to stop it gacefully
   // and add a request handler
 
-
   stopCallbackList.add(({
     reason
   }) => {
@@ -18984,12 +19185,6 @@ const startServer = async ({
   };
 
   status = "opened";
-  const serverOrigins = await getServerOrigins({
-    protocol,
-    host,
-    port
-  });
-  const serverOrigin = serverOrigins.local;
   const removeConnectionErrorListener = listenServerConnectionError(nodeServer, onError);
   stopCallbackList.add(removeConnectionErrorListener);
   const connectionsTracker = trackServerPendingConnections(nodeServer, {
@@ -19181,7 +19376,7 @@ const startServer = async ({
         const onPushStreamError = e => {
           addRequestLog(requestNode, {
             type: "error",
-            value: createDetailedMessage$1(`An error occured while pushing a stream to the response for ${request.ressource}`, {
+            value: createDetailedMessage$1(`An error occured while pushing a stream to the response for ${request.resource}`, {
               "error stack": e.stack
             })
           });
@@ -19285,7 +19480,7 @@ const startServer = async ({
 
         addRequestLog(requestNode, {
           type: "info",
-          value: request.parent ? `Push ${request.ressource}` : `${request.method} ${request.origin}${request.ressource}`
+          value: request.parent ? `Push ${request.resource}` : `${request.method} ${request.url}`
         });
 
         const warn = value => {
@@ -19609,7 +19804,7 @@ const startServer = async ({
       let websocketServer = new WebSocketServer({
         noServer: true
       });
-      const websocketOrigin = protocol === "https" ? `wss://${host}:${port}` : `ws://${host}:${port}`;
+      const websocketOrigin = protocol === "https" ? `wss://${hostname}:${port}` : `ws://${hostname}:${port}`;
       server.websocketOrigin = websocketOrigin;
 
       const upgradeCallback = (nodeRequest, socket, head) => {
@@ -19650,6 +19845,7 @@ const startServer = async ({
   Object.assign(server, {
     getStatus: () => status,
     port,
+    hostname,
     origin: serverOrigin,
     origins: serverOrigins,
     nodeServer,
@@ -20102,7 +20298,7 @@ const fetchFileSystem = async (filesystemUrl, {
 
     rootDirectoryUrl = rootDirectoryUrlString;
   } // here you might be tempted to add || cacheControl === 'no-cache'
-  // but no-cache means ressource can be cache but must be revalidated (yeah naming is strange)
+  // but no-cache means resource can be cache but must be revalidated (yeah naming is strange)
   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#Cacheability
 
 
@@ -20243,7 +20439,7 @@ const getClientCacheResponse = async ({
   sourceUrl
 }) => {
   // here you might be tempted to add || headers["cache-control"] === "no-cache"
-  // but no-cache means ressource can be cache but must be revalidated (yeah naming is strange)
+  // but no-cache means resource can be cache but must be revalidated (yeah naming is strange)
   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cache-Control#Cacheability
   if (headers["cache-control"] === "no-store" || // let's disable it on no-cache too
   headers["cache-control"] === "no-cache") {
@@ -20951,8 +21147,8 @@ const flattenAndFilterPlugins = (plugins, {
       }
 
       if (typeof appliesDuring === "string") {
-        if (!["dev", "test", "build"].includes(appliesDuring)) {
-          throw new Error(`"appliesDuring" must be "dev", "test" or "build", got ${appliesDuring}`);
+        if (!["dev", "build"].includes(appliesDuring)) {
+          throw new Error(`"appliesDuring" must be "dev" or "build", got ${appliesDuring}`);
         }
 
         if (scenarios[appliesDuring]) {
@@ -21644,7 +21840,7 @@ const validateResponseIntegrity = ({
     return true;
   }
 
-  const error = new Error(`Integrity validation failed for ressource "${url}". The integrity found for this ressource is "${strongestAlgo}-${actualBase64Value}"`);
+  const error = new Error(`Integrity validation failed for resource "${url}". The integrity found for this resource is "${strongestAlgo}-${actualBase64Value}"`);
   error.code = "EINTEGRITY";
   error.algorithm = strongestAlgo;
   error.found = actualBase64Value;
@@ -21756,7 +21952,7 @@ const createKitchen = ({
     isEntryPoint = false,
     isInline = false,
     injected = false,
-    isRessourceHint = false,
+    isResourceHint = false,
     content,
     contentType,
     assert,
@@ -21794,8 +21990,8 @@ const createKitchen = ({
       isEntryPoint,
       isInline,
       injected,
-      isRessourceHint,
-      // for inline ressources the reference contains the content
+      isResourceHint,
+      // for inline resources the reference contains the content
       content,
       contentType,
       timing: {},
@@ -21846,8 +22042,8 @@ const createKitchen = ({
       // And this is because this hook inject query params used to:
       // - bypass browser cache (?v)
       // - convey information (?hmr)
-      // But do not represent an other ressource, it is considered as
-      // the same ressource under the hood
+      // But do not represent an other resource, it is considered as
+      // the same resource under the hood
 
       pluginController.callHooks("transformUrlSearchParams", reference, kitchenContext, returnValue => {
         Object.keys(returnValue).forEach(key => {
@@ -22656,11 +22852,11 @@ const loadUrlGraph = async ({
       references
     } = urlInfo;
     references.forEach(reference => {
-      // we don't cook ressource hints
-      // because they might refer to ressource that will be modified during build
+      // we don't cook resource hints
+      // because they might refer to resource that will be modified during build
       // It also means something else have to reference that url in order to cook it
-      // so that the preload is deleted by "resync_ressource_hints.js" otherwise
-      if (reference.isRessourceHint) {
+      // so that the preload is deleted by "resync_resource_hints.js" otherwise
+      if (reference.isResourceHint) {
         return;
       } // we use reference.generatedUrl to mimic what a browser would do:
       // do a fetch to the specifier as found in the file
@@ -23325,23 +23521,23 @@ self.serviceWorkerUrls = ${JSON.stringify(serviceWorkerUrls, null, "  ")};
 /*
  * Update <link rel="preload"> and friends after build (once we know everything)
  *
- * - Used to remove ressource hint targeting an url that is no longer used:
+ * - Used to remove resource hint targeting an url that is no longer used:
  *   - Happens because of import assertions transpilation (file is inlined into JS)
  */
-const resyncRessourceHints = async ({
+const resyncResourceHints = async ({
   logger,
   finalGraphKitchen,
   finalGraph,
   rawUrls,
   postBuildRedirections
 }) => {
-  const ressourceHintActions = [];
+  const resourceHintActions = [];
   GRAPH.forEach(finalGraph, urlInfo => {
     if (urlInfo.type !== "html") {
       return;
     }
 
-    ressourceHintActions.push(async () => {
+    resourceHintActions.push(async () => {
       const htmlAst = parseHtmlString(urlInfo.content, {
         storeOriginalPositions: false
       });
@@ -23353,9 +23549,9 @@ const resyncRessourceHints = async ({
         }
 
         const rel = getHtmlNodeAttribute(linkNode, "rel");
-        const isRessourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(rel);
+        const isresourceHint = ["preconnect", "dns-prefetch", "prefetch", "preload", "modulepreload"].includes(rel);
 
-        if (!isRessourceHint) {
+        if (!isresourceHint) {
           return;
         }
 
@@ -23369,7 +23565,7 @@ const resyncRessourceHints = async ({
         }
 
         if (!buildUrl) {
-          logger.warn(`remove ressource hint because cannot find "${href}"`);
+          logger.warn(`remove resource hint because cannot find "${href}"`);
           actions.push(() => {
             removeHtmlNode(linkNode);
           });
@@ -23380,7 +23576,7 @@ const resyncRessourceHints = async ({
         const urlInfo = finalGraph.getUrlInfo(buildUrl);
 
         if (!urlInfo) {
-          logger.warn(`remove ressource hint because cannot find "${buildUrl}" in the graph`);
+          logger.warn(`remove resource hint because cannot find "${buildUrl}" in the graph`);
           actions.push(() => {
             removeHtmlNode(linkNode);
           });
@@ -23388,7 +23584,7 @@ const resyncRessourceHints = async ({
         }
 
         if (urlInfo.dependents.size === 0) {
-          logger.info(`remove ressource hint because "${href}" not used anymore`);
+          logger.info(`remove resource hint because "${href}" not used anymore`);
           actions.push(() => {
             removeHtmlNode(linkNode);
           });
@@ -23420,7 +23616,7 @@ const resyncRessourceHints = async ({
       }
     });
   });
-  await Promise.all(ressourceHintActions.map(ressourceHintAction => ressourceHintAction()));
+  await Promise.all(resourceHintActions.map(resourceHintAction => resourceHintAction()));
 };
 
 /*
@@ -23701,10 +23897,10 @@ build ${entryPointKeys.length} entry points`);
             addToBundlerIfAny(dependencyUrlInfo);
           });
           rawUrlInfo.references.forEach(reference => {
-            if (reference.isRessourceHint && reference.expectedType === "js_module") {
+            if (reference.isResourceHint && reference.expectedType === "js_module") {
               const referencedUrlInfo = rawGraph.getUrlInfo(reference.url);
 
-              if (referencedUrlInfo && // something else than the ressource hint is using this url
+              if (referencedUrlInfo && // something else than the resource hint is using this url
               referencedUrlInfo.dependents.size > 0) {
                 addToBundlerIfAny(referencedUrlInfo);
               }
@@ -23997,7 +24193,7 @@ build ${entryPointKeys.length} entry points`);
             throw new Error(`urls should be inside build directory at this stage, found "${reference.url}"`);
           }
 
-          if (reference.isRessourceHint) {
+          if (reference.isResourceHint) {
             // return the raw url, we will resync at the end
             return rawUrls[reference.url];
           } // remove eventual search params and hash
@@ -24101,7 +24297,7 @@ build ${entryPointKeys.length} entry points`);
         kitchen: finalGraphKitchen,
         outDirectoryUrl: new URL(".jsenv/postbuild/", rootDirectoryUrl),
         writeGeneratedFiles,
-        skipRessourceHint: true,
+        skipResourceHint: true,
         startLoading: cookEntryFile => {
           entryUrls.forEach(entryUrl => {
             const [, postBuildEntryUrlInfo] = cookEntryFile({
@@ -24173,7 +24369,7 @@ ${Array.from(finalGraph.urlInfoMap.keys()).join("\n")}`);
       urlInfo.data.buildUrlIsVersioned = useVersionedUrl;
       urlInfo.data.buildUrlSpecifier = buildUrlSpecifier;
     });
-    await resyncRessourceHints({
+    await resyncResourceHints({
       logger,
       finalGraphKitchen,
       finalGraph,
@@ -24517,7 +24713,7 @@ const applyUrlVersioning = async ({
             return null;
           }
 
-          if (reference.isRessourceHint) {
+          if (reference.isResourceHint) {
             return null;
           } // specifier comes from "normalize" hook done a bit earlier in this file
           // we want to get back their build url to access their infos
@@ -24578,7 +24774,7 @@ const applyUrlVersioning = async ({
       operation: buildOperation,
       urlGraph: finalGraph,
       kitchen: versioningKitchen,
-      skipRessourceHint: true,
+      skipResourceHint: true,
       writeGeneratedFiles,
       startLoading: cookEntryFile => {
         postBuildEntryUrls.forEach(postBuildEntryUrl => {
@@ -25060,7 +25256,7 @@ const createFileService = ({
 
   return async request => {
     // serve file inside ".jsenv" directory
-    const requestFileUrl = new URL(request.ressource.slice(1), rootDirectoryUrl).href;
+    const requestFileUrl = new URL(request.resource.slice(1), rootDirectoryUrl).href;
 
     if (urlIsInsideOf(requestFileUrl, jsenvDirectoryUrl)) {
       return fetchFileSystem(requestFileUrl, {
@@ -25084,7 +25280,7 @@ const createFileService = ({
     const parentUrl = inferParentFromRequest(request, rootDirectoryUrl);
 
     if (parentUrl) {
-      reference = urlGraph.inferReference(request.ressource, parentUrl);
+      reference = urlGraph.inferReference(request.resource, parentUrl);
     }
 
     if (!reference) {
@@ -25094,7 +25290,7 @@ const createFileService = ({
         },
         parentUrl: parentUrl || rootDirectoryUrl,
         type: "http_request",
-        specifier: request.ressource
+        specifier: request.resource
       });
       reference = entryPoint[0];
     }
@@ -25261,7 +25457,7 @@ const startOmegaServer = async ({
   privateKey,
   certificate,
   acceptAnyIp,
-  host,
+  hostname,
   port = 0,
   keepProcessAlive = false,
   onStop = () => {},
@@ -25302,7 +25498,7 @@ const startOmegaServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     requestWaitingMs: 60_1000,
     services: [jsenvServiceCORS({
@@ -25408,7 +25604,7 @@ const startDevServer = async ({
   http2 = false,
   certificate,
   privateKey,
-  host,
+  hostname,
   port = 3456,
   acceptAnyIp,
   keepProcessAlive = true,
@@ -25548,7 +25744,7 @@ const startDevServer = async ({
     http2,
     certificate,
     privateKey,
-    host,
+    hostname,
     port,
     services,
     rootDirectoryUrl,
@@ -25651,87 +25847,6 @@ const generateCoverageTextLog = (coverage, {
   report.execute(context);
 };
 
-const babelPluginInstrument = (api, {
-  rootDirectoryUrl,
-  useInlineSourceMaps = false,
-  coverageConfig = {
-    "./**/*": true
-  }
-}) => {
-  const {
-    programVisitor
-  } = requireFromJsenv("istanbul-lib-instrument");
-  const {
-    types
-  } = api;
-  const associations = URL_META.resolveAssociations({
-    cover: coverageConfig
-  }, rootDirectoryUrl);
-
-  const shouldInstrument = url => {
-    return URL_META.applyAssociations({
-      url,
-      associations
-    }).cover;
-  };
-
-  return {
-    name: "transform-instrument",
-    visitor: {
-      Program: {
-        enter(path) {
-          const {
-            file
-          } = this;
-          const {
-            opts
-          } = file;
-
-          if (!opts.sourceFileName) {
-            console.warn(`cannot instrument file when "sourceFileName" option is not set`);
-            return;
-          }
-
-          const fileUrl = fileSystemPathToUrl$1(opts.sourceFileName);
-
-          if (!shouldInstrument(fileUrl)) {
-            return;
-          }
-
-          this.__dv__ = null;
-          let inputSourceMap;
-
-          if (useInlineSourceMaps) {
-            // https://github.com/istanbuljs/babel-plugin-istanbul/commit/a9e15643d249a2985e4387e4308022053b2cd0ad#diff-1fdf421c05c1140f6d71444ea2b27638R65
-            inputSourceMap = opts.inputSourceMap || file.inputMap ? file.inputMap.sourcemap : null;
-          } else {
-            inputSourceMap = opts.inputSourceMap;
-          }
-
-          this.__dv__ = programVisitor(types, opts.filenameRelative || opts.filename, {
-            coverageVariable: "__coverage__",
-            inputSourceMap
-          });
-
-          this.__dv__.enter(path);
-        },
-
-        exit(path) {
-          if (!this.__dv__) {
-            return;
-          }
-
-          const object = this.__dv__.exit(path); // object got two properties: fileCoverage and sourceMappingURL
-
-
-          this.file.metadata.coverage = object.fileCoverage;
-        }
-
-      }
-    }
-  };
-};
-
 const readNodeV8CoverageDirectory = async ({
   logger,
   signal,
@@ -26424,6 +26539,41 @@ const run = async ({
   }
 };
 
+const pingServer = async url => {
+  const server = createServer();
+  const {
+    hostname,
+    port
+  } = new URL(url);
+
+  try {
+    await new Promise((resolve, reject) => {
+      server.on("error", reject);
+      server.on("listening", () => {
+        resolve();
+      });
+      server.listen(port, hostname);
+    });
+  } catch (error) {
+    if (error && error.code === "EADDRINUSE") {
+      return true;
+    }
+
+    if (error && error.code === "EACCES") {
+      return true;
+    }
+
+    throw error;
+  }
+
+  await new Promise((resolve, reject) => {
+    server.on("error", reject);
+    server.on("close", resolve);
+    server.close();
+  });
+  return false;
+};
+
 const ensureGlobalGc = () => {
   if (!global.gc) {
     v8.setFlagsFromString("--expose_gc");
@@ -26859,8 +27009,8 @@ const executePlan = async (plan, {
   completedExecutionLogMerging,
   completedExecutionLogAbbreviation,
   rootDirectoryUrl,
+  devServerOrigin,
   keepRunning,
-  services,
   defaultMsAllocatedPerExecution,
   maxExecutionsInParallel,
   failFast,
@@ -26873,18 +27023,6 @@ const executePlan = async (plan, {
   coverageMethodForNodeJs,
   coverageV8ConflictWarning,
   coverageTempDirectoryRelativeUrl,
-  scenarios,
-  sourcemaps,
-  plugins,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  transpilation,
-  writeGeneratedFiles,
-  protocol,
-  privateKey,
-  certificate,
-  host,
-  port,
   beforeExecutionCallback = () => {},
   afterExecutionCallback = () => {}
 } = {}) => {
@@ -26908,7 +27046,7 @@ const executePlan = async (plan, {
       if (runtime) {
         runtimes[runtime.name] = runtime.version;
 
-        if (runtime.needsServer) {
+        if (runtime.type === "browser") {
           someNeedsServer = true;
         }
 
@@ -26999,6 +27137,7 @@ const executePlan = async (plan, {
 
     let runtimeParams = {
       rootDirectoryUrl,
+      devServerOrigin,
       coverageEnabled,
       coverageConfig,
       coverageMethodForBrowsers,
@@ -27007,48 +27146,15 @@ const executePlan = async (plan, {
     };
 
     if (someNeedsServer) {
-      const server = await startOmegaServer({
-        signal: multipleExecutionsOperation.signal,
-        logLevel: "warn",
-        keepProcessAlive: false,
-        port,
-        host,
-        protocol,
-        certificate,
-        privateKey,
-        services,
-        rootDirectoryUrl,
-        scenarios,
-        runtimeCompat: runtimes,
-        plugins,
-        htmlSupervisor: true,
-        nodeEsmResolution,
-        fileSystemMagicResolution,
-        transpilation: { ...transpilation,
-          getCustomBabelPlugins: ({
-            clientRuntimeCompat
-          }) => {
-            if (coverageEnabled && (coverageMethodForBrowsers !== "playwright_api" || Object.keys(clientRuntimeCompat)[0] !== "chrome")) {
-              return {
-                "transform-instrument": [babelPluginInstrument, {
-                  rootDirectoryUrl,
-                  coverageConfig
-                }]
-              };
-            }
+      if (!devServerOrigin) {
+        throw new TypeError(`devServerOrigin is required when running tests on browser(s)`);
+      }
 
-            return {};
-          }
-        },
-        sourcemaps,
-        writeGeneratedFiles
-      });
-      multipleExecutionsOperation.addEndCallback(async () => {
-        await server.stop();
-      });
-      runtimeParams = { ...runtimeParams,
-        server
-      };
+      const devServerStarted = await pingServer(devServerOrigin);
+
+      if (!devServerStarted) {
+        throw new Error(`dev server not started at ${devServerOrigin}. It is required to run tests`);
+      }
     }
 
     logger.debug(`Generate executions`);
@@ -27391,9 +27497,10 @@ const executeInParallel = async ({
 };
 
 /**
- * Execute a list of files and log how it goes
+ * Execute a list of files and log how it goes.
  * @param {Object} testPlanParameters
  * @param {string|url} testPlanParameters.rootDirectoryUrl Root directory of the project
+ * @param {string|url} [testPlanParameters.serverOrigin=undefined] Jsenv dev server origin; required when executing test on browsers
  * @param {Object} testPlanParameters.testPlan Object associating patterns leading to files to runtimes where they should be executed
  * @param {boolean} [testPlanParameters.completedExecutionLogAbbreviation=false] Abbreviate completed execution information to shorten terminal output
  * @param {boolean} [testPlanParameters.completedExecutionLogMerging=false] Merge completed execution logs to shorten terminal output
@@ -27420,6 +27527,7 @@ const executeTestPlan = async ({
   completedExecutionLogAbbreviation = false,
   completedExecutionLogMerging = false,
   rootDirectoryUrl,
+  devServerOrigin,
   testPlan,
   updateProcessExitCode = true,
   maxExecutionsInParallel = 1,
@@ -27450,17 +27558,7 @@ const executeTestPlan = async ({
   coverageReportSkipFull = false,
   coverageReportTextLog = true,
   coverageReportJsonFile = process.env.CI ? null : "./.coverage/coverage.json",
-  coverageReportHtmlDirectory = process.env.CI ? "./.coverage/" : null,
-  sourcemaps = "inline",
-  plugins = [],
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  writeGeneratedFiles = false,
-  protocol,
-  privateKey,
-  certificate,
-  host,
-  port
+  coverageReportHtmlDirectory = process.env.CI ? "./.coverage/" : null
 }) => {
   const logger = createLogger({
     logLevel
@@ -27520,6 +27618,7 @@ const executeTestPlan = async ({
     completedExecutionLogMerging,
     completedExecutionLogAbbreviation,
     rootDirectoryUrl,
+    devServerOrigin,
     maxExecutionsInParallel,
     defaultMsAllocatedPerExecution,
     failFast,
@@ -27532,21 +27631,7 @@ const executeTestPlan = async ({
     coverageMethodForBrowsers,
     coverageMethodForNodeJs,
     coverageV8ConflictWarning,
-    coverageTempDirectoryRelativeUrl,
-    scenarios: {
-      dev: true,
-      test: true
-    },
-    sourcemaps,
-    plugins,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
-    writeGeneratedFiles,
-    protocol,
-    privateKey,
-    certificate,
-    host,
-    port
+    coverageTempDirectoryRelativeUrl
   });
 
   if (updateProcessExitCode && result.planSummary.counters.total !== result.planSummary.counters.completed) {
@@ -27664,8 +27749,7 @@ const createRuntimeFromPlaywright = ({
   const runtime = {
     type: "browser",
     name: browserName,
-    version: browserVersion,
-    needsServer: true
+    version: browserVersion
   };
   let browserAndContextPromise;
 
@@ -27674,7 +27758,7 @@ const createRuntimeFromPlaywright = ({
     logger,
     rootDirectoryUrl,
     fileRelativeUrl,
-    server,
+    devServerOrigin,
     // measurePerformance,
     collectPerformance,
     coverageEnabled = false,
@@ -27749,7 +27833,13 @@ const createRuntimeFromPlaywright = ({
       await disconnected;
     };
 
-    const page = await browserContext.newPage();
+    const coverageInHeaders = coverageEnabled && (!coveragePlaywrightAPIAvailable || coverageMethodForBrowsers !== "playwright_api");
+    const page = await browserContext.newPage({
+      extraHTTPHeaders: { ...(coverageInHeaders ? {
+          "x-coverage-istanbul": JSON.stringify(coverageConfig)
+        } : {})
+      }
+    });
 
     const closePage = async () => {
       try {
@@ -27777,7 +27867,7 @@ const createRuntimeFromPlaywright = ({
           const v8CoveragesWithFsUrls = v8CoveragesWithWebUrls.map(v8CoveragesWithWebUrl => {
             const fsUrl = moveUrl({
               url: v8CoveragesWithWebUrl.url,
-              from: `${server.origin}/`,
+              from: `${devServerOrigin}/`,
               to: rootDirectoryUrl,
               preferAbsolute: true
             });
@@ -27848,7 +27938,7 @@ const createRuntimeFromPlaywright = ({
       });
     }
 
-    const fileClientUrl = new URL(fileRelativeUrl, `${server.origin}/`).href; // https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#event-console
+    const fileClientUrl = new URL(fileRelativeUrl, `${devServerOrigin}/`).href; // https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#event-console
 
     const removeConsoleListener = registerEvent({
       object: page,
@@ -27962,7 +28052,7 @@ const createRuntimeFromPlaywright = ({
               } = returnValue;
               const error = evalException(exceptionSource, {
                 rootDirectoryUrl,
-                server,
+                devServerOrigin,
                 transformErrorHook
               });
               cb({
@@ -28198,7 +28288,7 @@ const registerEvent = ({
 
 const evalException = (exceptionSource, {
   rootDirectoryUrl,
-  server,
+  devServerOrigin,
   transformErrorHook
 }) => {
   const script = new Script(exceptionSource, {
@@ -28207,7 +28297,7 @@ const evalException = (exceptionSource, {
   const error = script.runInThisContext();
 
   if (error && error instanceof Error) {
-    const remoteRootRegexp = new RegExp(escapeRegexpSpecialChars(`${server.origin}/`), "g");
+    const remoteRootRegexp = new RegExp(escapeRegexpSpecialChars(`${devServerOrigin}/`), "g");
     error.stack = error.stack.replace(remoteRootRegexp, rootDirectoryUrl);
     error.message = error.message.replace(remoteRootRegexp, rootDirectoryUrl);
   }
@@ -29205,7 +29295,7 @@ const startBuildServer = async ({
   certificate,
   privateKey,
   acceptAnyIp,
-  host,
+  hostname,
   port = 9779,
   services = [],
   keepProcessAlive = true,
@@ -29342,7 +29432,7 @@ const startBuildServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,
@@ -29387,15 +29477,15 @@ const createBuildFilesService = ({
   buildIndexPath
 }) => {
   return request => {
-    const urlIsVersioned = new URL(request.ressource, request.origin).searchParams.has("v");
+    const urlIsVersioned = new URL(request.url).searchParams.has("v");
 
-    if (buildIndexPath && request.ressource === "/") {
+    if (buildIndexPath && request.resource === "/") {
       request = { ...request,
-        ressource: `/${buildIndexPath}`
+        resource: `/${buildIndexPath}`
       };
     }
 
-    return fetchFileSystem(new URL(request.ressource.slice(1), buildDirectoryUrl), {
+    return fetchFileSystem(new URL(request.resource.slice(1), buildDirectoryUrl), {
       headers: request.headers,
       cacheControl: urlIsVersioned ? `private,max-age=${SECONDS_IN_30_DAYS},immutable` : "private,max-age=0,must-revalidate",
       etagEnabled: true,
@@ -29413,32 +29503,17 @@ const execute = async ({
   handleSIGINT = true,
   logLevel,
   rootDirectoryUrl,
+  devServerOrigin,
   fileRelativeUrl,
   allocatedMs,
   mirrorConsole = true,
   keepRunning = false,
-  services,
   collectConsole,
   collectCoverage,
   coverageTempDirectoryUrl,
   collectPerformance = false,
   runtime,
   runtimeParams,
-  scenarios = {
-    dev: true
-  },
-  plugins = [],
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  transpilation,
-  htmlSupervisor = true,
-  sourcemaps = "inline",
-  writeGeneratedFiles = false,
-  port,
-  protocol,
-  http2,
-  certificate,
-  privateKey,
   ignoreError = false
 }) => {
   const logger = createLogger({
@@ -29460,45 +29535,21 @@ const execute = async ({
 
   runtimeParams = {
     rootDirectoryUrl,
+    devServerOrigin,
     fileRelativeUrl,
     ...runtimeParams
   };
 
-  if (runtime.needsServer) {
-    const server = await startOmegaServer({
-      signal: executeOperation.signal,
-      logLevel: "warn",
-      keepProcessAlive: false,
-      services,
-      port,
-      protocol,
-      http2,
-      certificate,
-      privateKey,
-      rootDirectoryUrl,
-      scenarios,
-      runtimeCompat: {
-        [runtime.name]: runtime.version
-      },
-      plugins,
-      htmlSupervisor,
-      nodeEsmResolution,
-      fileSystemMagicResolution,
-      transpilation,
-      sourcemaps,
-      writeGeneratedFiles
-    });
-    executeOperation.addEndCallback(async () => {
-      await server.stop("execution done");
-    });
-    runtimeParams = { ...runtimeParams,
-      server
-    };
+  if (runtime.type === "browser") {
+    if (!devServerOrigin) {
+      throw new TypeError(`devServerOrigin is required when running tests on browser(s)`);
+    }
 
-    resultTransformer = result => {
-      result.server = server;
-      return result;
-    };
+    const devServerStarted = await pingServer(devServerOrigin);
+
+    if (!devServerStarted) {
+      throw new Error(`dev server not started at ${devServerOrigin}. It is required to run tests`);
+    }
   }
 
   let result = await run({
@@ -29620,4 +29671,4 @@ const jsenvPluginInjectGlobals = urlAssociations => {
   };
 };
 
-export { build, chromium, chromiumIsolatedTab, execute, executeTestPlan, firefox, firefoxIsolatedTab, jsenvPluginInjectGlobals, nodeChildProcess, nodeWorkerThread, startBuildServer, startDevServer, webkit, webkitIsolatedTab };
+export { build, chromium, chromiumIsolatedTab, execute, executeTestPlan, firefox, firefoxIsolatedTab, jsenvPluginInjectGlobals, nodeChildProcess, nodeWorkerThread, pingServer, startBuildServer, startDevServer, webkit, webkitIsolatedTab };