@jsenv/core 27.7.0 → 28.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.7.0",
+  "version": "28.0.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -73,7 +73,7 @@
     "@jsenv/integrity": "0.0.1",
     "@jsenv/log": "3.1.0",
     "@jsenv/node-esm-resolution": "0.1.0",
-    "@jsenv/server": "13.1.0",
+    "@jsenv/server": "14.0.0",
     "@jsenv/sourcemap": "1.0.4",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",

package/src/build/build.js

@@ -175,7 +175,7 @@ build ${entryPointKeys.length} entry points`)
       logger,
       rootDirectoryUrl,
       urlGraph: rawGraph,
-      scenario: "build",
+      scenarios: { build: true },
       sourcemaps,
       sourcemapsSourcesContent,
       runtimeCompat,
@@ -202,7 +202,6 @@ build ${entryPointKeys.length} entry points`)
         ...getCorePlugins({
           rootDirectoryUrl,
           urlGraph: rawGraph,
-          scenario: "build",
           runtimeCompat,
 
           urlAnalysis,
@@ -423,7 +422,7 @@ build ${entryPointKeys.length} entry points`)
       logger,
       rootDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: { build: true },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: !versioning,
@@ -1063,7 +1062,7 @@ const applyUrlVersioning = async ({
       logger,
       rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: { build: true },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: true,
@@ -1078,7 +1077,7 @@ const applyUrlVersioning = async ({
         }),
         {
           name: "jsenv:versioning",
-          appliesDuring: { build: true },
+          appliesDuring: "build",
           resolveUrl: (reference) => {
             const buildUrl = buildUrls[reference.specifier]
             if (buildUrl) {

package/src/build/start_build_server.js

@@ -41,7 +41,7 @@ export const startBuildServer = async ({
   certificate,
   privateKey,
   acceptAnyIp,
-  host,
+  hostname,
   port = 9779,
   services = [],
   keepProcessAlive = true,
@@ -163,7 +163,7 @@ export const startBuildServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,

package/src/dev/start_dev_server.js

@@ -22,7 +22,7 @@ export const startDevServer = async ({
   http2 = false,
   certificate,
   privateKey,
-  host,
+  hostname,
   port = 3456,
   acceptAnyIp,
   keepProcessAlive = true,
@@ -150,12 +150,12 @@ export const startDevServer = async ({
     http2,
     certificate,
     privateKey,
-    host,
+    hostname,
     port,
     services,
 
     rootDirectoryUrl,
-    scenario: "dev",
+    scenarios: { dev: true },
     runtimeCompat,
 
     plugins,

package/src/execute/execute.js

@@ -1,9 +1,8 @@
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
-
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem"
 import { createLogger } from "@jsenv/log"
 
-import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
+import { pingServer } from "../ping_server.js"
 import { run } from "./run.js"
 
 export const execute = async ({
@@ -11,12 +10,13 @@ export const execute = async ({
   handleSIGINT = true,
   logLevel,
   rootDirectoryUrl,
+  devServerOrigin,
 
   fileRelativeUrl,
   allocatedMs,
   mirrorConsole = true,
   keepRunning = false,
-  services,
+
   collectConsole,
   collectCoverage,
   coverageTempDirectoryUrl,
@@ -24,21 +24,6 @@ export const execute = async ({
   runtime,
   runtimeParams,
 
-  scenario = "dev",
-  plugins = [],
-  nodeEsmResolution,
-  fileSystemMagicResolution,
-  transpilation,
-  htmlSupervisor = true,
-  sourcemaps = "inline",
-  writeGeneratedFiles = false,
-
-  port,
-  protocol,
-  http2,
-  certificate,
-  privateKey,
-
   ignoreError = false,
 }) => {
   const logger = createLogger({ logLevel })
@@ -59,44 +44,21 @@ export const execute = async ({
   let resultTransformer = (result) => result
   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`,
+      )
     }
   }
 

package/src/execute/runtimes/browsers/from_playwright.js

@@ -27,7 +27,6 @@ export const createRuntimeFromPlaywright = ({
     type: "browser",
     name: browserName,
     version: browserVersion,
-    needsServer: true,
   }
   let browserAndContextPromise
   runtime.run = async ({
@@ -35,7 +34,7 @@ export const createRuntimeFromPlaywright = ({
     logger,
     rootDirectoryUrl,
     fileRelativeUrl,
-    server,
+    devServerOrigin,
 
     // measurePerformance,
     collectPerformance,
@@ -98,7 +97,19 @@ export 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 {
         await page.close()
@@ -128,7 +139,7 @@ export const createRuntimeFromPlaywright = ({
             (v8CoveragesWithWebUrl) => {
               const fsUrl = moveUrl({
                 url: v8CoveragesWithWebUrl.url,
-                from: `${server.origin}/`,
+                from: `${devServerOrigin}/`,
                 to: rootDirectoryUrl,
                 preferAbsolute: true,
               })
@@ -202,7 +213,7 @@ export const createRuntimeFromPlaywright = ({
       })
     }
 
-    const fileClientUrl = new URL(fileRelativeUrl, `${server.origin}/`).href
+    const fileClientUrl = new URL(fileRelativeUrl, `${devServerOrigin}/`).href
 
     // https://github.com/GoogleChrome/puppeteer/blob/v1.4.0/docs/api.md#event-console
     const removeConsoleListener = registerEvent({
@@ -302,7 +313,7 @@ export const createRuntimeFromPlaywright = ({
                 const { exceptionSource } = returnValue
                 const error = evalException(exceptionSource, {
                   rootDirectoryUrl,
-                  server,
+                  devServerOrigin,
                   transformErrorHook,
                 })
                 cb({
@@ -525,13 +536,13 @@ const registerEvent = ({ object, eventType, callback }) => {
 
 const evalException = (
   exceptionSource,
-  { rootDirectoryUrl, server, transformErrorHook },
+  { rootDirectoryUrl, devServerOrigin, transformErrorHook },
 ) => {
   const script = new Script(exceptionSource, { filename: "" })
   const error = script.runInThisContext()
   if (error && error instanceof Error) {
     const remoteRootRegexp = new RegExp(
-      escapeRegexpSpecialChars(`${server.origin}/`),
+      escapeRegexpSpecialChars(`${devServerOrigin}/`),
       "g",
     )
     error.stack = error.stack.replace(remoteRootRegexp, rootDirectoryUrl)

package/src/main.js

@@ -21,6 +21,9 @@ export { nodeWorkerThread } from "./execute/runtimes/node/node_worker_thread.js"
 export { build } from "./build/build.js"
 export { startBuildServer } from "./build/start_build_server.js"
 
+// helpers
+export { pingServer } from "./ping_server.js"
+
 // advanced
 export { execute } from "./execute/execute.js"
 export { jsenvPluginInjectGlobals } from "./plugins/inject_globals/jsenv_plugin_inject_globals.js"

package/src/omega/kitchen.js

@@ -28,18 +28,14 @@ export const createKitchen = ({
   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,
@@ -48,7 +44,7 @@ export const createKitchen = ({
   const logger = createLogger({ logLevel })
   const pluginController = createPluginController({
     plugins,
-    scenario,
+    scenarios,
   })
   const jsenvDirectoryUrl = new URL(".jsenv/", rootDirectoryUrl).href
   const kitchenContext = {
@@ -56,7 +52,7 @@ export const createKitchen = ({
     logger,
     rootDirectoryUrl,
     urlGraph,
-    scenario,
+    scenarios,
     runtimeCompat,
     clientRuntimeCompat,
     isSupportedOnCurrentClients: (feature) => {
@@ -769,12 +765,11 @@ 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
   }
 }

package/src/omega/omega_server.js

@@ -18,14 +18,14 @@ export const startOmegaServer = async ({
   privateKey,
   certificate,
   acceptAnyIp,
-  host,
+  hostname,
   port = 0,
   keepProcessAlive = false,
   onStop = () => {},
   services = [],
 
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
 
   plugins,
@@ -62,7 +62,7 @@ export const startOmegaServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     requestWaitingMs: 60_1000,
     services: [
@@ -87,7 +87,7 @@ export const startOmegaServer = async ({
           serverEventsDispatcher,
 
           rootDirectoryUrl,
-          scenario,
+          scenarios,
           runtimeCompat,
 
           plugins,

package/src/omega/server/file_service.js

@@ -20,7 +20,7 @@ export const createFileService = ({
   serverEventsDispatcher,
 
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
 
   plugins,
@@ -53,7 +53,7 @@ export const createFileService = ({
     ".jsenv/": false,
   }
 
-  if (scenario === "dev") {
+  if (scenarios.dev) {
     const stopWatchingClientFiles = registerDirectoryLifecycle(
       rootDirectoryUrl,
       {
@@ -99,13 +99,13 @@ export const createFileService = ({
         })
         urlInfo.isValid = () => watch
       },
-      includeOriginalUrls: scenario === "dev",
+      includeOriginalUrls: scenarios.dev,
     })
     const kitchen = createKitchen({
       signal,
       logLevel,
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeCompat,
       clientRuntimeCompat: {
         [runtimeName]: runtimeVersion,
@@ -115,7 +115,6 @@ export const createFileService = ({
         ...plugins,
         ...getCorePlugins({
           rootDirectoryUrl,
-          scenario,
           runtimeCompat,
 
           urlAnalysis,
@@ -156,7 +155,7 @@ export const createFileService = ({
           allServerEvents[serverEventName]({
             rootDirectoryUrl,
             urlGraph,
-            scenario,
+            scenarios,
             sendServerEvent: (data) => {
               serverEventsDispatcher.dispatch({
                 type: serverEventName,
@@ -174,7 +173,7 @@ export const createFileService = ({
 
     const context = {
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeName,
       runtimeVersion,
       urlGraph,
@@ -260,10 +259,11 @@ export 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 } = urlInfo
       if (response) {

package/src/ping_server.js

@@ -0,0 +1,30 @@
+import { createServer } from "node:net"
+
+export 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
+}

package/src/plugins/autoreload/jsenv_plugin_autoreload.js

@@ -3,13 +3,9 @@ import { jsenvPluginAutoreloadClient } from "./jsenv_plugin_autoreload_client.js
 import { jsenvPluginAutoreloadServer } from "./jsenv_plugin_autoreload_server.js"
 
 export const jsenvPluginAutoreload = ({
-  scenario,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList,
 }) => {
-  if (scenario === "build") {
-    return []
-  }
   return [
     jsenvPluginHmr(),
     jsenvPluginAutoreloadClient(),

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -13,7 +13,7 @@ export const jsenvPluginAutoreloadClient = () => {
 
   return {
     name: "jsenv:autoreload_client",
-    appliesDuring: { dev: true },
+    appliesDuring: { dev: true, test: false },
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         const htmlAst = parseHtmlString(htmlUrlInfo.content)

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -6,7 +6,7 @@ export const jsenvPluginAutoreloadServer = ({
 }) => {
   return {
     name: "jsenv:autoreload_server",
-    appliesDuring: { dev: true },
+    appliesDuring: { dev: true, test: false },
     serverEvents: {
       reload: ({ sendServerEvent, rootDirectoryUrl, urlGraph }) => {
         const formatUrlForClient = (url) => {

package/src/plugins/autoreload/jsenv_plugin_hmr.js

@@ -1,7 +1,7 @@
 export const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
-    appliesDuring: { dev: true },
+    appliesDuring: { dev: true, test: false },
     redirectUrl: (reference) => {
       const urlObject = new URL(reference.url)
       if (!urlObject.searchParams.has("hmr")) {

package/src/plugins/bundling/jsenv_plugin_bundling.js

@@ -18,9 +18,7 @@ export const jsenvPluginBundling = (bundling) => {
 
   return {
     name: "jsenv:bundling",
-    appliesDuring: {
-      build: true,
-    },
+    appliesDuring: "build",
     bundle: {
       css: bundling.css
         ? (cssUrlInfos, context) => {

package/src/plugins/cache_control/jsenv_plugin_cache_control.js

@@ -1,12 +1,9 @@
 export 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

package/src/plugins/commonjs_globals/jsenv_plugin_commonjs_globals.js

@@ -11,7 +11,7 @@ import { createMagicSource } from "@jsenv/sourcemap"
 import { applyBabelPlugins } from "@jsenv/ast"
 
 export const jsenvPluginCommonJsGlobals = () => {
-  const transformCommonJsGlobals = async (urlInfo, { scenario }) => {
+  const transformCommonJsGlobals = async (urlInfo, context) => {
     if (
       !urlInfo.content.includes("process.env.NODE_ENV") &&
       !urlInfo.content.includes("__filename") &&
@@ -22,7 +22,7 @@ export const jsenvPluginCommonJsGlobals = () => {
     const isJsModule = urlInfo.type === "js_module"
     const replaceMap = {
       "process.env.NODE_ENV": `("${
-        scenario === "dev" || scenario === "test" ? "development" : "production"
+        context.scenarios.dev ? "development" : "production"
       }")`,
       "global": "globalThis",
       "__filename": isJsModule

package/src/plugins/file_urls/jsenv_plugin_file_urls.js

@@ -113,14 +113,10 @@ export 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)

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -43,10 +43,7 @@ export const jsenvPluginHtmlSupervisor = ({
 
   return {
     name: "jsenv:html_supervisor",
-    appliesDuring: {
-      dev: true,
-      test: true,
-    },
+    appliesDuring: "dev",
     serve: async (request, context) => {
       if (request.ressource.startsWith("/__get_code_frame__/")) {
         const { pathname, searchParams } = new URL(request.url)

package/src/plugins/import_meta_hot/jsenv_plugin_import_meta_hot.js

@@ -16,7 +16,7 @@ export 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
         }
         const htmlAst = parseHtmlString(htmlUrlInfo.content)
@@ -58,7 +58,7 @@ export const jsenvPluginImportMetaHot = () => {
         if (importMetaHotPaths.length === 0) {
           return null
         }
-        if (context.scenario === "build") {
+        if (context.scenarios.build) {
           return removeImportMetaHots(urlInfo, importMetaHotPaths)
         }
         return injectImportMetaHot(urlInfo, context, importMetaHotClientFileUrl)