@jsenv/core 27.7.0 → 28.0.0

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";
@@ -4217,11 +4217,11 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   const url = urlInfo.originalUrl;
   const content = urlInfo.content;
   const {
-    scenario,
+    scenarios,
     referenceUtils
   } = context;
   const htmlAst = parseHtmlString(content, {
-    storeOriginalPositions: scenario !== "build"
+    storeOriginalPositions: scenarios.dev
   });
   const actions = [];
   visitHtmlUrls({
@@ -11464,7 +11464,7 @@ const jsenvPluginImportmap = () => {
         // Duing build we get rid of it
 
 
-        if (context.scenario === "build") {
+        if (context.scenarios.build) {
           removeHtmlNode(importmap);
         }
 
@@ -12801,13 +12801,8 @@ const jsenvPluginNodeEsmResolution = ({
   return {
     name: "jsenv:node_esm_resolution",
     appliesDuring: "*",
-    init: ({
-      rootDirectoryUrl,
-      scenario,
-      runtimeCompat,
-      urlGraph
-    }) => {
-      const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node"); // https://nodejs.org/api/esm.html#resolver-algorithm-specification
+    init: context => {
+      const nodeRuntimeEnabled = Object.keys(context.runtimeCompat).includes("node"); // https://nodejs.org/api/esm.html#resolver-algorithm-specification
 
       packageConditions = packageConditions || [...readCustomConditionsFromProcessArgs(), nodeRuntimeEnabled ? "node" : "browser", "import"];
       const packageScopesCache = new Map();
@@ -12838,19 +12833,19 @@ const jsenvPluginNodeEsmResolution = ({
         return packageJson;
       };
 
-      if (scenario === "dev") {
+      if (context.scenarios.dev) {
         const onFileChange = () => {
           packageScopesCache.clear();
           packageJsonsCache.clear();
-          urlGraph.urlInfoMap.forEach(urlInfo => {
+          context.urlGraph.urlInfoMap.forEach(urlInfo => {
             if (urlInfo.dependsOnPackageJson) {
-              urlGraph.considerModified(urlInfo);
+              context.urlGraph.considerModified(urlInfo);
             }
           });
         };
 
         filesInvalidatingCache.forEach(file => {
-          const unregister = registerFileLifecycle(new URL(file, rootDirectoryUrl), {
+          const unregister = registerFileLifecycle(new URL(file, context.rootDirectoryUrl), {
             added: () => {
               onFileChange();
             },
@@ -12912,7 +12907,7 @@ const jsenvPluginNodeEsmResolution = ({
       return null;
     },
     transformUrlSearchParams: (reference, context) => {
-      if (context.scenario === "build") {
+      if (context.scenarios.build) {
         return null;
       }
 
@@ -13091,14 +13086,10 @@ const jsenvPluginFileUrls = ({
     }
   }, {
     name: "jsenv:@fs_resolution",
-    appliesDuring: {
-      // during dev and test it's a browser running the code
-      // so absolute file urls needs to be relativized
-      dev: true,
-      test: true,
-      // during build it's fine to use file:// urls
-      build: false
-    },
+    // during dev and test it's a browser running the code
+    // so absolute file urls needs to be relativized
+    // during build it's fine to use file:// urls
+    appliesDuring: "dev",
     resolveUrl: reference => {
       if (reference.specifier.startsWith("/@fs/")) {
         const fsRootRelativeUrl = reference.specifier.slice("/@fs/".length);
@@ -13197,10 +13188,7 @@ const jsenvPluginHtmlSupervisor = ({
   const htmlSupervisorInstallerFileUrl = new URL("./js/html_supervisor_installer.js", import.meta.url).href;
   return {
     name: "jsenv:html_supervisor",
-    appliesDuring: {
-      dev: true,
-      test: true
-    },
+    appliesDuring: "dev",
     serve: async (request, context) => {
       if (request.ressource.startsWith("/__get_code_frame__/")) {
         const {
@@ -13569,16 +13557,14 @@ const generateCodeToSuperviseScript = ({
  * - global
  */
 const jsenvPluginCommonJsGlobals = () => {
-  const transformCommonJsGlobals = async (urlInfo, {
-    scenario
-  }) => {
+  const transformCommonJsGlobals = async (urlInfo, context) => {
     if (!urlInfo.content.includes("process.env.NODE_ENV") && !urlInfo.content.includes("__filename") && !urlInfo.content.includes("__dirname")) {
       return null;
     }
 
     const isJsModule = urlInfo.type === "js_module";
     const replaceMap = {
-      "process.env.NODE_ENV": `("${scenario === "dev" || scenario === "test" ? "development" : "production"}")`,
+      "process.env.NODE_ENV": `("${context.scenarios.dev ? "development" : "production"}")`,
       "global": "globalThis",
       "__filename": isJsModule ? `import.meta.url.slice('file:///'.length)` : `document.currentScript.src`,
       "__dirname": isJsModule ? `import.meta.url.slice('file:///'.length).replace(/[\\\/\\\\][^\\\/\\\\]*$/, '')` : `new URL('./', document.currentScript.src).href`
@@ -13732,11 +13718,10 @@ const babelPluginMetadataExpressionPaths = (babel, {
 /*
  * Source code can contain the following
  * - import.meta.dev
- * - import.meta.test
  * - import.meta.build
  * They are either:
  * - replaced by true: When scenario matches (import.meta.dev and it's the dev server)
- * - left as is to be evaluated to undefined (import.meta.test but it's the dev server)
+ * - left as is to be evaluated to undefined (import.meta.build but it's the dev server)
  * - replaced by undefined (import.meta.dev but it's build; the goal is to ensure it's tree-shaked)
  */
 const jsenvPluginImportMetaScenarios = () => {
@@ -13744,9 +13729,7 @@ const jsenvPluginImportMetaScenarios = () => {
     name: "jsenv:import_meta_scenario",
     appliesDuring: "*",
     transformUrlContent: {
-      js_module: async (urlInfo, {
-        scenario
-      }) => {
+      js_module: async (urlInfo, context) => {
         if (!urlInfo.content.includes("import.meta.dev") && !urlInfo.content.includes("import.meta.test") && !urlInfo.content.includes("import.meta.build")) {
           return null;
         }
@@ -13759,7 +13742,6 @@ const jsenvPluginImportMetaScenarios = () => {
         });
         const {
           dev = [],
-          test = [],
           build = []
         } = metadata.importMetaScenarios;
         const replacements = [];
@@ -13771,32 +13753,20 @@ const jsenvPluginImportMetaScenarios = () => {
           });
         };
 
-        if (scenario === "dev") {
+        if (context.scenarios.build) {
+          // during build ensure replacement for tree-shaking
           dev.forEach(path => {
-            replace(path, "true");
-          });
-        } else if (scenario === "test") {
-          // test is also considered a dev environment
-          // just like the dev server can be used to debug test files
-          // without this people would have to write
-          // if (import.meta.dev || import.meta.test) or if (!import.meta.build)
-          dev.forEach(path => {
-            replace(path, "true");
+            replace(path, "undefined");
           });
-          test.forEach(path => {
+          build.forEach(path => {
             replace(path, "true");
           });
-        } else if (scenario === "build") {
-          // replacing by undefined might not be required
-          // as I suppose rollup would consider them as undefined
-          // but let's make it explicit to ensure code is properly tree-shaked
+        } else {
+          // during dev we can let "import.meta.build" untouched
+          // it will be evaluated to undefined.
+          // Moreover it can be surprising to see some "undefined"
+          // when source file contains "import.meta.build"
           dev.forEach(path => {
-            replace(path, "undefined");
-          });
-          test.forEach(path => {
-            replace(path, "undefined");
-          });
-          build.forEach(path => {
             replace(path, "true");
           });
         }
@@ -13863,7 +13833,6 @@ const babelPluginMetadataImportMetaScenarios = () => {
         });
         state.file.metadata.importMetaScenarios = {
           dev: importMetas.dev,
-          test: importMetas.test,
           build: importMetas.build
         };
       }
@@ -13933,7 +13902,7 @@ const jsenvPluginImportAssertions = ({
       //     We would have to tell rollup to ignore import with assertion
       //   - means rollup can bundle more js file together
       //   - means url versioning can work for css inlined in js
-      if (context.scenario === "build") {
+      if (context.scenarios.build) {
         json = true;
         css = true;
         text = true;
@@ -14083,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);
@@ -15264,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));
     }
@@ -16034,9 +16095,7 @@ const jsenvPluginBundling = bundling => {
   });
   return {
     name: "jsenv:bundling",
-    appliesDuring: {
-      build: true
-    },
+    appliesDuring: "build",
     bundle: {
       css: bundling.css ? (cssUrlInfos, context) => {
         return bundleCss({
@@ -16172,9 +16231,7 @@ const jsenvPluginMinification = minification => {
   }) : null;
   return {
     name: "jsenv:minification",
-    appliesDuring: {
-      build: true
-    },
+    appliesDuring: "build",
     optimizeUrlContent: {
       html: htmlOptimizer,
       svg: htmlOptimizer,
@@ -16494,7 +16551,7 @@ const jsenvPluginImportMetaHot = () => {
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         // during build we don't really care to parse html hot dependencies
-        if (context.scenario === "build") {
+        if (context.scenarios.build) {
           return;
         }
 
@@ -16543,7 +16600,7 @@ const jsenvPluginImportMetaHot = () => {
           return null;
         }
 
-        if (context.scenario === "build") {
+        if (context.scenarios.build) {
           return removeImportMetaHots(urlInfo, importMetaHotPaths);
         }
 
@@ -16587,7 +16644,8 @@ const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
     appliesDuring: {
-      dev: true
+      dev: true,
+      test: false
     },
     redirectUrl: reference => {
       const urlObject = new URL(reference.url);
@@ -16632,7 +16690,8 @@ const jsenvPluginAutoreloadClient = () => {
   return {
     name: "jsenv:autoreload_client",
     appliesDuring: {
-      dev: true
+      dev: true,
+      test: false
     },
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
@@ -16664,7 +16723,8 @@ const jsenvPluginAutoreloadServer = ({
   return {
     name: "jsenv:autoreload_server",
     appliesDuring: {
-      dev: true
+      dev: true,
+      test: false
     },
     serverEvents: {
       reload: ({
@@ -16892,14 +16952,9 @@ const jsenvPluginAutoreloadServer = ({
 };
 
 const jsenvPluginAutoreload = ({
-  scenario,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList
 }) => {
-  if (scenario === "build") {
-    return [];
-  }
-
   return [jsenvPluginHmr(), jsenvPluginAutoreloadClient(), jsenvPluginAutoreloadServer({
     clientFileChangeCallbackList,
     clientFilesPruneCallbackList
@@ -16909,14 +16964,11 @@ const jsenvPluginAutoreload = ({
 const jsenvPluginCacheControl = () => {
   return {
     name: "jsenv:cache_control",
-    appliesDuring: {
-      dev: true,
-      test: true
-    },
+    appliesDuring: "dev",
     augmentResponse: ({
       reference
     }, context) => {
-      if (context.scenario === "test") {
+      if (context.scenarios.test) {
         // During dev, all files are put into browser cache for 1 hour because:
         // 1: Browser cache is a temporary directory created by playwright
         // 2: We assume source files won't be modified while tests are running
@@ -17003,7 +17055,6 @@ const jsenvPluginExplorer = ({
 
 const getCorePlugins = ({
   rootDirectoryUrl,
-  scenario,
   runtimeCompat,
   urlAnalysis = {},
   htmlSupervisor,
@@ -17048,7 +17099,6 @@ const getCorePlugins = ({
   jsenvPluginNodeEsmResolution(nodeEsmResolution), jsenvPluginUrlResolution(), jsenvPluginUrlVersion(), jsenvPluginCommonJsGlobals(), jsenvPluginImportMetaScenarios(), jsenvPluginNodeRuntime({
     runtimeCompat
   }), jsenvPluginBundling(bundling), jsenvPluginMinification(minification), jsenvPluginImportMetaHot(), ...(clientAutoreload ? [jsenvPluginAutoreload({ ...clientAutoreload,
-    scenario,
     clientFileChangeCallbackList,
     clientFilesPruneCallbackList
   })] : []), jsenvPluginCacheControl(), ...(explorer ? [jsenvPluginExplorer(explorer)] : [])];
@@ -18399,101 +18449,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();
 
@@ -18504,7 +18465,7 @@ const listen = async ({
       listeningOperation.throwIfAborted();
       port = await findFreePort(portHint, {
         signal: listeningOperation.signal,
-        host
+        hostname
       });
     }
 
@@ -18512,7 +18473,7 @@ const listen = async ({
     port = await startListening({
       server,
       port,
-      host
+      hostname
     });
     listeningOperation.addAbortCallback(() => stopListening(server));
     listeningOperation.throwIfAborted();
@@ -18524,7 +18485,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
@@ -18546,27 +18507,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") {
@@ -18587,7 +18548,7 @@ const portIsFree = async (port, host) => {
 const startListening = ({
   server,
   port,
-  host
+  hostname
 }) => {
   return new Promise((resolve, reject) => {
     server.on("error", reject);
@@ -18596,7 +18557,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);
   });
 };
 
@@ -18835,6 +18796,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,
@@ -18846,7 +18935,8 @@ const startServer = async ({
   redirectHttpToHttps,
   allowHttpRequestOnHttps = false,
   acceptAnyIp = false,
-  host = acceptAnyIp ? undefined : "localhost",
+  preferIpv6,
+  hostname = "localhost",
   port = 0,
   // assign a random available port
   portHint,
@@ -18876,6 +18966,10 @@ const startServer = async ({
     }));
   }
 } = {}) => {
+  const logger = createLogger({
+    logLevel
+  });
+
   if (protocol !== "http" && protocol !== "https") {
     throw new Error(`protocol must be http or https, got ${protocol}`);
   }
@@ -18894,10 +18988,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;
   }
@@ -18930,6 +19020,10 @@ const startServer = async ({
   let nodeServer;
   const startServerOperation = Abort.startOperation();
   const stopCallbackList = createCallbackListNotifiedOnce();
+  const serverOrigins = {
+    local: "" // favors hostname when possible
+
+  };
 
   try {
     startServerOperation.addAbortSignal(signal);
@@ -18957,12 +19051,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
@@ -18973,12 +19140,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
   }) => {
@@ -19016,12 +19194,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, {
@@ -19641,7 +19813,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) => {
@@ -19682,6 +19854,7 @@ const startServer = async ({
   Object.assign(server, {
     getStatus: () => status,
     port,
+    hostname,
     origin: serverOrigin,
     origins: serverOrigins,
     nodeServer,
@@ -20743,10 +20916,10 @@ const HOOK_NAMES = ["init", "serve", // is called only during dev/tests
 "destroy"];
 const createPluginController = ({
   plugins,
-  scenario
+  scenarios
 }) => {
   const flatPlugins = flattenAndFilterPlugins(plugins, {
-    scenario
+    scenarios
   }); // precompute a list of hooks per hookName for one major reason:
   // - When debugging, there is less iteration
   // also it should increase perf as there is less work to do
@@ -20953,7 +21126,7 @@ const createPluginController = ({
 };
 
 const flattenAndFilterPlugins = (plugins, {
-  scenario
+  scenarios
 }) => {
   const flatPlugins = [];
 
@@ -20983,12 +21156,13 @@ const flattenAndFilterPlugins = (plugins, {
       }
 
       if (typeof appliesDuring === "string") {
-        if (!["dev", "build", "test"].includes(appliesDuring)) {
+        if (!["dev", "test", "build"].includes(appliesDuring)) {
           throw new Error(`"appliesDuring" must be "dev", "test" or "build", got ${appliesDuring}`);
         }
 
-        if (appliesDuring === scenario) {
+        if (scenarios[appliesDuring]) {
           flatPlugins.push(pluginEntry);
+          return;
         }
 
         return;
@@ -20998,7 +21172,20 @@ const flattenAndFilterPlugins = (plugins, {
         throw new Error(`"appliesDuring" must be an object or a string, got ${appliesDuring}`);
       }
 
-      if (appliesDuring[scenario]) {
+      let applies;
+
+      for (const key of Object.keys(appliesDuring)) {
+        if (!appliesDuring[key] && scenarios[key]) {
+          applies = false;
+          break;
+        }
+
+        if (appliesDuring[key] && scenarios[key]) {
+          applies = true;
+        }
+      }
+
+      if (applies) {
         flatPlugins.push(pluginEntry);
         return;
       }
@@ -21710,19 +21897,15 @@ const createKitchen = ({
   signal,
   logLevel,
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
   clientRuntimeCompat = runtimeCompat,
   urlGraph,
   plugins,
-  sourcemaps = {
-    dev: "inline",
-    // "programmatic" and "file" also allowed
-    test: "inline",
-    build: "none"
-  }[scenario],
+  sourcemaps = scenarios.dev ? "inline" : "none",
+  // "programmatic" and "file" also allowed
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
   sourcemapsRelativeSources,
@@ -21733,7 +21916,7 @@ const createKitchen = ({
   });
   const pluginController = createPluginController({
     plugins,
-    scenario
+    scenarios
   });
   const jsenvDirectoryUrl = new URL(".jsenv/", rootDirectoryUrl).href;
   const kitchenContext = {
@@ -21741,7 +21924,7 @@ const createKitchen = ({
     logger,
     rootDirectoryUrl,
     urlGraph,
-    scenario,
+    scenarios,
     runtimeCompat,
     clientRuntimeCompat,
     isSupportedOnCurrentClients: feature => {
@@ -22446,7 +22629,7 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       column: reference.specifierColumn
     };
     urlInfo.contentType = reference.contentType;
-    urlInfo.originalContent = context.scenario === "build" ? urlInfo.originalContent === undefined ? reference.content : urlInfo.originalContent : reference.content;
+    urlInfo.originalContent = context.scenarios.build ? urlInfo.originalContent === undefined ? reference.content : urlInfo.originalContent : reference.content;
     urlInfo.content = reference.content;
   }
 };
@@ -23581,7 +23764,9 @@ build ${entryPointKeys.length} entry points`);
       logger,
       rootDirectoryUrl,
       urlGraph: rawGraph,
-      scenario: "build",
+      scenarios: {
+        build: true
+      },
       sourcemaps,
       sourcemapsSourcesContent,
       runtimeCompat,
@@ -23603,7 +23788,6 @@ build ${entryPointKeys.length} entry points`);
       }, ...getCorePlugins({
         rootDirectoryUrl,
         urlGraph: rawGraph,
-        scenario: "build",
         runtimeCompat,
         urlAnalysis,
         nodeEsmResolution,
@@ -23821,7 +24005,9 @@ build ${entryPointKeys.length} entry points`);
       logger,
       rootDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: {
+        build: true
+      },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: !versioning,
@@ -24483,7 +24669,9 @@ const applyUrlVersioning = async ({
       logger,
       rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: {
+        build: true
+      },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: true,
@@ -24496,9 +24684,7 @@ const applyUrlVersioning = async ({
         allowEscapeForVersioning: true
       }), {
         name: "jsenv:versioning",
-        appliesDuring: {
-          build: true
-        },
+        appliesDuring: "build",
         resolveUrl: reference => {
           const buildUrl = buildUrls[reference.specifier];
 
@@ -24893,7 +25079,7 @@ const createFileService = ({
   serverStopCallbacks,
   serverEventsDispatcher,
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
   plugins,
   urlAnalysis,
@@ -24931,7 +25117,7 @@ const createFileService = ({
     ".jsenv/": false
   };
 
-  if (scenario === "dev") {
+  if (scenarios.dev) {
     const stopWatchingClientFiles = registerDirectoryLifecycle(rootDirectoryUrl, {
       watchPatterns: clientFilePatterns,
       cooldownBetweenFileEvents,
@@ -24995,13 +25181,13 @@ const createFileService = ({
 
         urlInfo.isValid = () => watch;
       },
-      includeOriginalUrls: scenario === "dev"
+      includeOriginalUrls: scenarios.dev
     });
     const kitchen = createKitchen({
       signal,
       logLevel,
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeCompat,
       clientRuntimeCompat: {
         [runtimeName]: runtimeVersion
@@ -25009,7 +25195,6 @@ const createFileService = ({
       urlGraph,
       plugins: [...plugins, ...getCorePlugins({
         rootDirectoryUrl,
-        scenario,
         runtimeCompat,
         urlAnalysis,
         htmlSupervisor,
@@ -25052,7 +25237,7 @@ const createFileService = ({
           allServerEvents[serverEventName]({
             rootDirectoryUrl,
             urlGraph,
-            scenario,
+            scenarios,
             sendServerEvent: data => {
               serverEventsDispatcher.dispatch({
                 type: serverEventName,
@@ -25068,7 +25253,7 @@ const createFileService = ({
 
     const context = {
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeName,
       runtimeVersion,
       urlGraph,
@@ -25155,7 +25340,7 @@ const createFileService = ({
       await kitchen.cook(urlInfo, {
         request,
         reference,
-        outDirectoryUrl: scenario === "dev" ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/` : `${rootDirectoryUrl}.jsenv/${scenario}/${runtimeName}@${runtimeVersion}/`
+        outDirectoryUrl: scenarios.dev ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/` : `${rootDirectoryUrl}.jsenv/${scenarios.test ? "test" : "build"}/${runtimeName}@${runtimeVersion}/`
       });
       let {
         response
@@ -25281,13 +25466,13 @@ const startOmegaServer = async ({
   privateKey,
   certificate,
   acceptAnyIp,
-  host,
+  hostname,
   port = 0,
   keepProcessAlive = false,
   onStop = () => {},
   services = [],
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
   plugins,
   urlAnalysis,
@@ -25322,7 +25507,7 @@ const startOmegaServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     requestWaitingMs: 60_1000,
     services: [jsenvServiceCORS({
@@ -25340,7 +25525,7 @@ const startOmegaServer = async ({
         serverStopCallbacks,
         serverEventsDispatcher,
         rootDirectoryUrl,
-        scenario,
+        scenarios,
         runtimeCompat,
         plugins,
         urlAnalysis,
@@ -25428,7 +25613,7 @@ const startDevServer = async ({
   http2 = false,
   certificate,
   privateKey,
-  host,
+  hostname,
   port = 3456,
   acceptAnyIp,
   keepProcessAlive = true,
@@ -25568,11 +25753,13 @@ const startDevServer = async ({
     http2,
     certificate,
     privateKey,
-    host,
+    hostname,
     port,
     services,
     rootDirectoryUrl,
-    scenario: "dev",
+    scenarios: {
+      dev: true
+    },
     runtimeCompat,
     plugins,
     urlAnalysis,
@@ -25669,87 +25856,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,
@@ -26442,6 +26548,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");
@@ -26877,8 +27018,8 @@ const executePlan = async (plan, {
   completedExecutionLogMerging,
   completedExecutionLogAbbreviation,
   rootDirectoryUrl,
+  devServerOrigin,
   keepRunning,
-  services,
   defaultMsAllocatedPerExecution,
   maxExecutionsInParallel,
   failFast,
@@ -26891,18 +27032,6 @@ const executePlan = async (plan, {
   coverageMethodForNodeJs,
   coverageV8ConflictWarning,
   coverageTempDirectoryRelativeUrl,
-  scenario,
-  sourcemaps,
-  plugins,
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  transpilation,
-  writeGeneratedFiles,
-  protocol,
-  privateKey,
-  certificate,
-  host,
-  port,
   beforeExecutionCallback = () => {},
   afterExecutionCallback = () => {}
 } = {}) => {
@@ -26926,7 +27055,7 @@ const executePlan = async (plan, {
       if (runtime) {
         runtimes[runtime.name] = runtime.version;
 
-        if (runtime.needsServer) {
+        if (runtime.type === "browser") {
           someNeedsServer = true;
         }
 
@@ -27017,6 +27146,7 @@ const executePlan = async (plan, {
 
     let runtimeParams = {
       rootDirectoryUrl,
+      devServerOrigin,
       coverageEnabled,
       coverageConfig,
       coverageMethodForBrowsers,
@@ -27025,48 +27155,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,
-        scenario,
-        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`);
@@ -27409,9 +27506,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
@@ -27438,6 +27536,7 @@ const executeTestPlan = async ({
   completedExecutionLogAbbreviation = false,
   completedExecutionLogMerging = false,
   rootDirectoryUrl,
+  devServerOrigin,
   testPlan,
   updateProcessExitCode = true,
   maxExecutionsInParallel = 1,
@@ -27468,17 +27567,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
@@ -27538,6 +27627,7 @@ const executeTestPlan = async ({
     completedExecutionLogMerging,
     completedExecutionLogAbbreviation,
     rootDirectoryUrl,
+    devServerOrigin,
     maxExecutionsInParallel,
     defaultMsAllocatedPerExecution,
     failFast,
@@ -27550,18 +27640,7 @@ const executeTestPlan = async ({
     coverageMethodForBrowsers,
     coverageMethodForNodeJs,
     coverageV8ConflictWarning,
-    coverageTempDirectoryRelativeUrl,
-    scenario: "test",
-    sourcemaps,
-    plugins,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
-    writeGeneratedFiles,
-    protocol,
-    privateKey,
-    certificate,
-    host,
-    port
+    coverageTempDirectoryRelativeUrl
   });
 
   if (updateProcessExitCode && result.planSummary.counters.total !== result.planSummary.counters.completed) {
@@ -27679,8 +27758,7 @@ const createRuntimeFromPlaywright = ({
   const runtime = {
     type: "browser",
     name: browserName,
-    version: browserVersion,
-    needsServer: true
+    version: browserVersion
   };
   let browserAndContextPromise;
 
@@ -27689,7 +27767,7 @@ const createRuntimeFromPlaywright = ({
     logger,
     rootDirectoryUrl,
     fileRelativeUrl,
-    server,
+    devServerOrigin,
     // measurePerformance,
     collectPerformance,
     coverageEnabled = false,
@@ -27764,7 +27842,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 {
@@ -27792,7 +27876,7 @@ const createRuntimeFromPlaywright = ({
           const v8CoveragesWithFsUrls = v8CoveragesWithWebUrls.map(v8CoveragesWithWebUrl => {
             const fsUrl = moveUrl({
               url: v8CoveragesWithWebUrl.url,
-              from: `${server.origin}/`,
+              from: `${devServerOrigin}/`,
               to: rootDirectoryUrl,
               preferAbsolute: true
             });
@@ -27863,7 +27947,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,
@@ -27977,7 +28061,7 @@ const createRuntimeFromPlaywright = ({
               } = returnValue;
               const error = evalException(exceptionSource, {
                 rootDirectoryUrl,
-                server,
+                devServerOrigin,
                 transformErrorHook
               });
               cb({
@@ -28213,7 +28297,7 @@ const registerEvent = ({
 
 const evalException = (exceptionSource, {
   rootDirectoryUrl,
-  server,
+  devServerOrigin,
   transformErrorHook
 }) => {
   const script = new Script(exceptionSource, {
@@ -28222,7 +28306,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);
   }
@@ -29220,7 +29304,7 @@ const startBuildServer = async ({
   certificate,
   privateKey,
   acceptAnyIp,
-  host,
+  hostname,
   port = 9779,
   services = [],
   keepProcessAlive = true,
@@ -29357,7 +29441,7 @@ const startBuildServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,
@@ -29428,30 +29512,17 @@ const execute = async ({
   handleSIGINT = true,
   logLevel,
   rootDirectoryUrl,
+  devServerOrigin,
   fileRelativeUrl,
   allocatedMs,
   mirrorConsole = true,
   keepRunning = false,
-  services,
   collectConsole,
   collectCoverage,
   coverageTempDirectoryUrl,
   collectPerformance = false,
   runtime,
   runtimeParams,
-  scenario = "dev",
-  plugins = [],
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  transpilation,
-  htmlSupervisor = true,
-  sourcemaps = "inline",
-  writeGeneratedFiles = false,
-  port,
-  protocol,
-  http2,
-  certificate,
-  privateKey,
   ignoreError = false
 }) => {
   const logger = createLogger({
@@ -29473,45 +29544,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,
-      scenario,
-      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({
@@ -29633,4 +29680,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 };