@jsenv/core 27.8.0 → 28.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.8.0",
+  "version": "28.0.1",
   "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.1.0",
     "@jsenv/sourcemap": "1.0.4",
     "@jsenv/uneval": "1.6.0",
     "@jsenv/url-meta": "7.0.0",

package/readme.md

@@ -16,7 +16,7 @@ npm create jsenv@latest
 ```
 
 This command prompts to choose a demo from a list.
-Each demo contains preconfigured scripts such as:
+Each demo contains preconfigured scripts:
 
 - `npm run dev`: starts a dev server with autoreload.
 - `npm run test`: execute test files on browsers(s) and/or Node.js.

package/src/build/build.js

@@ -45,7 +45,7 @@ import { createBuilUrlsGenerator } from "./build_urls_generator.js"
 import { injectGlobalVersionMapping } from "./inject_global_version_mappings.js"
 import { createVersionGenerator } from "./version_generator.js"
 import { injectServiceWorkerUrls } from "./inject_service_worker_urls.js"
-import { resyncRessourceHints } from "./resync_ressource_hints.js"
+import { resyncResourceHints } from "./resync_resource_hints.js"
 
 // default runtimeCompat corresponds to
 // "we can keep <script type="module"> intact":
@@ -314,13 +314,13 @@ build ${entryPointKeys.length} entry points`)
           })
           rawUrlInfo.references.forEach((reference) => {
             if (
-              reference.isRessourceHint &&
+              reference.isResourceHint &&
               reference.expectedType === "js_module"
             ) {
               const referencedUrlInfo = rawGraph.getUrlInfo(reference.url)
               if (
                 referencedUrlInfo &&
-                // something else than the ressource hint is using this url
+                // something else than the resource hint is using this url
                 referencedUrlInfo.dependents.size > 0
               ) {
                 addToBundlerIfAny(referencedUrlInfo)
@@ -611,7 +611,7 @@ build ${entryPointKeys.length} entry points`)
                 `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]
             }
@@ -717,7 +717,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({
@@ -786,7 +786,7 @@ ${Array.from(finalGraph.urlInfoMap.keys()).join("\n")}`,
       urlInfo.data.buildUrlIsVersioned = useVersionedUrl
       urlInfo.data.buildUrlSpecifier = buildUrlSpecifier
     })
-    await resyncRessourceHints({
+    await resyncResourceHints({
       logger,
       finalGraphKitchen,
       finalGraph,
@@ -1116,7 +1116,7 @@ const applyUrlVersioning = async ({
             if (reference.isInline || reference.url.startsWith("data:")) {
               return null
             }
-            if (reference.isRessourceHint) {
+            if (reference.isResourceHint) {
               return null
             }
             // specifier comes from "normalize" hook done a bit earlier in this file
@@ -1185,7 +1185,7 @@ const applyUrlVersioning = async ({
       operation: buildOperation,
       urlGraph: finalGraph,
       kitchen: versioningKitchen,
-      skipRessourceHint: true,
+      skipResourceHint: true,
       writeGeneratedFiles,
       startLoading: (cookEntryFile) => {
         postBuildEntryUrls.forEach((postBuildEntryUrl) => {

package/src/build/{resync_ressource_hints.js → resync_resource_hints.js}

@@ -1,7 +1,7 @@
 /*
  * 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)
  */
 
@@ -16,19 +16,19 @@ import {
 
 import { GRAPH } from "./graph_utils.js"
 
-export const resyncRessourceHints = async ({
+export 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,
       })
@@ -38,14 +38,14 @@ export const resyncRessourceHints = async ({
           return
         }
         const rel = getHtmlNodeAttribute(linkNode, "rel")
-        const isRessourceHint = [
+        const isresourceHint = [
           "preconnect",
           "dns-prefetch",
           "prefetch",
           "preload",
           "modulepreload",
         ].includes(rel)
-        if (!isRessourceHint) {
+        if (!isresourceHint) {
           return
         }
 
@@ -57,7 +57,7 @@ export 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)
           })
@@ -67,7 +67,7 @@ export const resyncRessourceHints = async ({
         const urlInfo = finalGraph.getUrlInfo(buildUrl)
         if (!urlInfo) {
           logger.warn(
-            `remove ressource hint because cannot find "${buildUrl}" in the graph`,
+            `remove resource hint because cannot find "${buildUrl}" in the graph`,
           )
           actions.push(() => {
             removeHtmlNode(linkNode)
@@ -75,9 +75,7 @@ export const resyncRessourceHints = async ({
           return
         }
         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)
           })
@@ -109,6 +107,6 @@ export const resyncRessourceHints = async ({
     })
   })
   await Promise.all(
-    ressourceHintActions.map((ressourceHintAction) => ressourceHintAction()),
+    resourceHintActions.map((resourceHintAction) => resourceHintAction()),
   )
 }

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,
@@ -208,18 +208,15 @@ export const startBuildServer = async ({
 
 const createBuildFilesService = ({ buildDirectoryUrl, buildIndexPath }) => {
   return (request) => {
-    const urlIsVersioned = new URL(
-      request.ressource,
-      request.origin,
-    ).searchParams.has("v")
-    if (buildIndexPath && request.ressource === "/") {
+    const urlIsVersioned = new URL(request.url).searchParams.has("v")
+    if (buildIndexPath && request.resource === "/") {
       request = {
         ...request,
-        ressource: `/${buildIndexPath}`,
+        resource: `/${buildIndexPath}`,
       }
     }
     return fetchFileSystem(
-      new URL(request.ressource.slice(1), buildDirectoryUrl),
+      new URL(request.resource.slice(1), buildDirectoryUrl),
       {
         headers: request.headers,
         cacheControl: urlIsVersioned

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,7 +150,7 @@ export const startDevServer = async ({
     http2,
     certificate,
     privateKey,
-    host,
+    hostname,
     port,
     services,
 

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,
 
-  scenarios = { dev: true },
-  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,
-      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`,
+      )
     }
   }
 

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

@@ -88,7 +88,7 @@ export const createKitchen = ({
     isEntryPoint = false,
     isInline = false,
     injected = false,
-    isRessourceHint = false,
+    isResourceHint = false,
     content,
     contentType,
     assert,
@@ -125,8 +125,8 @@ export 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: {},
@@ -182,8 +182,8 @@ export 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,

package/src/omega/omega_server.js

@@ -18,7 +18,7 @@ export const startOmegaServer = async ({
   privateKey,
   certificate,
   acceptAnyIp,
-  host,
+  hostname,
   port = 0,
   keepProcessAlive = false,
   onStop = () => {},
@@ -62,7 +62,7 @@ export const startOmegaServer = async ({
     certificate,
     privateKey,
     acceptAnyIp,
-    host,
+    hostname,
     port,
     requestWaitingMs: 60_1000,
     services: [

package/src/omega/server/file_service.js

@@ -185,7 +185,7 @@ export const createFileService = ({
 
   return async (request) => {
     // serve file inside ".jsenv" directory
-    const requestFileUrl = new URL(request.ressource.slice(1), rootDirectoryUrl)
+    const requestFileUrl = new URL(request.resource.slice(1), rootDirectoryUrl)
       .href
     if (urlIsInsideOf(requestFileUrl, jsenvDirectoryUrl)) {
       return fetchFileSystem(requestFileUrl, {
@@ -206,14 +206,14 @@ export const createFileService = ({
     let reference
     const parentUrl = inferParentFromRequest(request, rootDirectoryUrl)
     if (parentUrl) {
-      reference = urlGraph.inferReference(request.ressource, parentUrl)
+      reference = urlGraph.inferReference(request.resource, parentUrl)
     }
     if (!reference) {
       const entryPoint = kitchen.injectReference({
         trace: { message: parentUrl || rootDirectoryUrl },
         parentUrl: parentUrl || rootDirectoryUrl,
         type: "http_request",
-        specifier: request.ressource,
+        specifier: request.resource,
       })
       reference = entryPoint[0]
     }

package/src/omega/url_graph/url_graph_load.js

@@ -31,11 +31,11 @@ export const loadUrlGraph = async ({
     })
     const { 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:

package/src/omega/url_graph.js

@@ -70,10 +70,10 @@ export 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

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/client/reload.js

@@ -62,8 +62,8 @@ export const getDOMNodesUsingUrl = (urlToReload) => {
       }
     }
   })
-  // There is no real need to update a.href because the ressource will be fetched when clicked.
-  // But in a scenario where the ressource was already visited and is in browser cache, adding
+  // There is no real need to update a.href because the resource will be fetched when clicked.
+  // But in a scenario where the resource was already visited and is in browser cache, adding
   // the dynamic query param ensure the cache is invalidated
   Array.from(document.querySelectorAll("a")).forEach((a) => {
     visitNodeAttributeAsUrl(a, "href")

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -13,7 +13,7 @@ export const jsenvPluginAutoreloadClient = () => {
 
   return {
     name: "jsenv:autoreload_client",
-    appliesDuring: { dev: true, test: false },
+    appliesDuring: "dev",
     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, test: false },
+    appliesDuring: "dev",
     serverEvents: {
       reload: ({ sendServerEvent, rootDirectoryUrl, urlGraph }) => {
         const formatUrlForClient = (url) => {
@@ -140,7 +140,7 @@ export const jsenvPluginAutoreloadServer = ({
             const cause = `following files are no longer referenced: ${prunedUrlInfos.map(
               (prunedUrlInfo) => formatUrlForClient(prunedUrlInfo.url),
             )}`
-            // now check if we can hot update the main ressource
+            // now check if we can hot update the main resource
             // then if we can hot update all dependencies
             if (mainHotUpdate.declined) {
               notifyDeclined({
@@ -179,7 +179,7 @@ export const jsenvPluginAutoreloadServer = ({
       },
     },
     serve: (request, { rootDirectoryUrl, urlGraph }) => {
-      if (request.ressource === "/__graph__") {
+      if (request.pathname === "/__graph__") {
         const graphJson = JSON.stringify(urlGraph.toJSON(rootDirectoryUrl))
         return {
           status: 200,

package/src/plugins/autoreload/jsenv_plugin_hmr.js

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

package/src/plugins/explorer/jsenv_plugin_explorer.js

@@ -11,7 +11,7 @@ export const jsenvPluginExplorer = ({ groups }) => {
     name: "jsenv:explorer",
     appliesDuring: "dev",
     serve: async (request, { rootDirectoryUrl }) => {
-      if (request.ressource !== "/") {
+      if (request.pathname !== "/") {
         return null
       }
       const associationsForExplorable = {}

package/src/plugins/html_supervisor/client/error_formatter.js

@@ -154,13 +154,13 @@ export const formatError = (
           }
         }
         if (urlSite.line !== undefined) {
-          let ressourceToFetch = `/__get_code_frame__/${formatUrlWithLineAndColumn(
+          let resourceToFetch = `/__get_code_frame__/${formatUrlWithLineAndColumn(
             urlSite,
           )}`
           if (!Error.captureStackTrace) {
-            ressourceToFetch += `?remap`
+            resourceToFetch += `?remap`
           }
-          const response = await window.fetch(ressourceToFetch)
+          const response = await window.fetch(resourceToFetch)
           const codeFrame = await response.text()
           return {
             codeFrame: formatErrorText({ message: codeFrame }),