@jsenv/core 27.8.0 → 28.0.1

package/src/plugins/html_supervisor/jsenv_plugin_html_supervisor.js

@@ -45,7 +45,7 @@ export const jsenvPluginHtmlSupervisor = ({
     name: "jsenv:html_supervisor",
     appliesDuring: "dev",
     serve: async (request, context) => {
-      if (request.ressource.startsWith("/__get_code_frame__/")) {
+      if (request.pathname.startsWith("/__get_code_frame__/")) {
         const { pathname, searchParams } = new URL(request.url)
         const urlWithLineAndColumn = pathname.slice(
           "/__get_code_frame__/".length,
@@ -95,8 +95,8 @@ export const jsenvPluginHtmlSupervisor = ({
           body: codeFrame,
         }
       }
-      if (request.ressource.startsWith("/__get_error_cause__/")) {
-        const file = request.ressource.slice("/__get_error_cause__/".length)
+      if (request.pathname.startsWith("/__get_error_cause__/")) {
+        const file = request.pathname.slice("/__get_error_cause__/".length)
         if (!file) {
           return {
             status: 400,
@@ -148,8 +148,8 @@ export const jsenvPluginHtmlSupervisor = ({
           body,
         }
       }
-      if (request.ressource.startsWith("/__open_in_editor__/")) {
-        const file = request.ressource.slice("/__open_in_editor__/".length)
+      if (request.pathname.startsWith("/__open_in_editor__/")) {
+        const file = request.pathname.slice("/__open_in_editor__/".length)
         if (!file) {
           return {
             status: 400,

package/src/plugins/import_meta_hot/html_hot_dependencies.js

@@ -119,14 +119,14 @@ const getNodeContext = (node) => {
 
 const htmlNodeCanHotReload = (node) => {
   if (node.nodeName === "link") {
-    const { isStylesheet, isRessourceHint, rel } = analyzeLinkNode(node)
+    const { isStylesheet, isResourceHint, rel } = analyzeLinkNode(node)
     if (isStylesheet) {
       // stylesheets can be hot replaced by default
       return true
     }
-    if (isRessourceHint) {
-      // for ressource hints html will be notified the underlying ressource has changed
-      // but we won't do anything (if the ressource is deleted we should?)
+    if (isResourceHint) {
+      // for resource hints html will be notified the underlying resource has changed
+      // but we won't do anything (if the resource is deleted we should?)
       return true
     }
     if (rel === "icon") {

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -28,7 +28,7 @@ export const jsenvPluginImportMetaScenarios = () => {
           babelPlugins: [babelPluginMetadataImportMetaScenarios],
           urlInfo,
         })
-        const { dev = [], test = [], build = [] } = metadata.importMetaScenarios
+        const { dev = [], build = [] } = metadata.importMetaScenarios
         const replacements = []
         const replace = (path, value) => {
           replacements.push({ path, value })
@@ -38,9 +38,6 @@ export const jsenvPluginImportMetaScenarios = () => {
           dev.forEach((path) => {
             replace(path, "undefined")
           })
-          test.forEach((path) => {
-            replace(path, context.scenarios.test ? "true" : "undefined")
-          })
           build.forEach((path) => {
             replace(path, "true")
           })
@@ -52,11 +49,6 @@ export const jsenvPluginImportMetaScenarios = () => {
           dev.forEach((path) => {
             replace(path, "true")
           })
-          if (context.scenarios.test) {
-            test.forEach((path) => {
-              replace(path, "true")
-            })
-          }
         }
         const magicSource = createMagicSource(urlInfo.content)
         replacements.forEach(({ path, value }) => {

package/src/plugins/plugin_controller.js

@@ -208,9 +208,9 @@ const flattenAndFilterPlugins = (plugins, { scenarios }) => {
         return
       }
       if (typeof appliesDuring === "string") {
-        if (!["dev", "test", "build"].includes(appliesDuring)) {
+        if (!["dev", "build"].includes(appliesDuring)) {
           throw new Error(
-            `"appliesDuring" must be "dev", "test" or "build", got ${appliesDuring}`,
+            `"appliesDuring" must be "dev" or "build", got ${appliesDuring}`,
           )
         }
         if (scenarios[appliesDuring]) {

package/src/plugins/server_events/client/server_events_client.js

@@ -2,7 +2,7 @@
 
 import { createWebSocketConnection } from "./web_socket_connection.js"
 
-const websocketScheme = self.location.protocol === "https" ? "wss" : "ws"
+const websocketScheme = self.location.protocol === "https:" ? "wss" : "ws"
 const websocketUrl = `${websocketScheme}://${self.location.host}${self.location.pathname}${self.location.search}`
 const websocketConnection = createWebSocketConnection(websocketUrl, {
   retry: true,

package/src/plugins/toolbar/jsenv_plugin_toolbar.js

@@ -17,7 +17,7 @@ export const jsenvPluginToolbar = ({ logs = false } = {}) => {
 
   return {
     name: "jsenv:toolbar",
-    appliesDuring: { dev: true, test: false },
+    appliesDuring: "dev",
     transformUrlContent: {
       html: ({ url, content }, { referenceUtils }) => {
         if (url === toolbarHtmlClientFileUrl) {

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic.js

@@ -75,7 +75,7 @@ const jsenvPluginAsJsClassicConversion = ({
       // - import specifier (static/dynamic import + re-export)
       // - url specifier when inside System.register/_context.import()
       //   (because it's the transpiled equivalent of static and dynamic imports)
-      // And not other references otherwise we could try to transform inline ressources
+      // And not other references otherwise we could try to transform inline resources
       // or specifiers inside new URL()...
       js_import_export: propagateJsClassicSearchParam,
       js_url_specifier: (reference, context) => {
@@ -94,7 +94,7 @@ const jsenvPluginAsJsClassicConversion = ({
         context,
         searchParam: "as_js_classic",
         // override the expectedType to "js_module"
-        // because when there is ?as_js_classic it means the underlying ressource
+        // because when there is ?as_js_classic it means the underlying resource
         // is a js_module
         expectedType: "js_module",
       })

package/src/plugins/transpilation/as_js_classic/jsenv_plugin_as_js_classic_html.js

@@ -75,10 +75,10 @@ export const jsenvPluginAsJsClassicHtml = ({
         const getReferenceAsJsClassic = async (
           reference,
           {
-            // we don't cook ressource hints
-            // because they might refer to ressource that will be modified during build
+            // we don't cook resource hints
+            // because they might refer to resource that will be modified during build
             // It also means something else HAVE to reference that url in order to cook it
-            // so that the preload is deleted by "resync_ressource_hints.js" otherwise
+            // so that the preload is deleted by "resync_resource_hints.js" otherwise
             cookIt = false,
           } = {},
         ) => {

package/src/plugins/transpilation/babel/jsenv_plugin_babel.js

@@ -1,5 +1,6 @@
 import { applyBabelPlugins } from "@jsenv/ast"
 
+import { babelPluginInstrument } from "@jsenv/core/src/test/coverage/babel_plugin_instrument.js"
 import { RUNTIME_COMPAT } from "@jsenv/core/src/omega/compat/runtime_compat.js"
 import { getBaseBabelPluginStructure } from "./helpers/babel_plugin_structure.js"
 import { babelPluginBabelHelpersAsJsenvImports } from "./helpers/babel_plugin_babel_helpers_as_jsenv_imports.js"
@@ -54,6 +55,18 @@ export const jsenvPluginBabel = ({
       isJsModule,
       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))
     }

package/src/plugins/url_analysis/html/html_urls.js

@@ -35,7 +35,7 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
     }) => {
       const { crossorigin, integrity } = readFetchMetas(node)
 
-      const isRessourceHint = [
+      const isResourceHint = [
         "preconnect",
         "dns-prefetch",
         "prefetch",
@@ -50,7 +50,7 @@ export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
         specifier,
         specifierLine: line,
         specifierColumn: column,
-        isRessourceHint,
+        isResourceHint,
         crossorigin,
         integrity,
       })

package/src/plugins/url_analysis/jsenv_plugin_url_analysis.js

@@ -32,7 +32,7 @@ export const jsenvPluginUrlAnalysis = ({
       }
       if (
         reference.specifier[0] === "#" &&
-        // For Html, css and in general "#" refer to a ressource in the page
+        // For Html, css and in general "#" refer to a resource in the page
         // so that urls must be kept intact
         // However for js import specifiers they have a different meaning and we want
         // to resolve them (https://nodejs.org/api/packages.html#imports for instance)

package/src/test/execute_plan.js

@@ -14,11 +14,10 @@ import {
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort"
 import { ensureEmptyDirectory, writeFileSync } from "@jsenv/filesystem"
 
-import { babelPluginInstrument } from "./coverage/babel_plugin_instrument.js"
 import { reportToCoverage } from "./coverage/report_to_coverage.js"
-import { startOmegaServer } from "@jsenv/core/src/omega/omega_server.js"
 import { run } from "@jsenv/core/src/execute/run.js"
 
+import { pingServer } from "../ping_server.js"
 import { ensureGlobalGc } from "./gc.js"
 import { generateExecutionSteps } from "./execution_steps.js"
 import { createExecutionLog, createSummaryLog } from "./logs_file_execution.js"
@@ -37,10 +36,10 @@ export const executePlan = async (
     logFileRelativeUrl,
     completedExecutionLogMerging,
     completedExecutionLogAbbreviation,
-
     rootDirectoryUrl,
+    devServerOrigin,
+
     keepRunning,
-    services,
     defaultMsAllocatedPerExecution,
     maxExecutionsInParallel,
     failFast,
@@ -55,20 +54,6 @@ export const executePlan = async (
     coverageV8ConflictWarning,
     coverageTempDirectoryRelativeUrl,
 
-    scenarios,
-    sourcemaps,
-    plugins,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
-    transpilation,
-    writeGeneratedFiles,
-
-    protocol,
-    privateKey,
-    certificate,
-    host,
-    port,
-
     beforeExecutionCallback = () => {},
     afterExecutionCallback = () => {},
   } = {},
@@ -88,7 +73,7 @@ export const executePlan = async (
       const { runtime } = executionConfig
       if (runtime) {
         runtimes[runtime.name] = runtime.version
-        if (runtime.needsServer) {
+        if (runtime.type === "browser") {
           someNeedsServer = true
         }
         if (runtime.type === "node") {
@@ -189,6 +174,7 @@ export const executePlan = async (
 
     let runtimeParams = {
       rootDirectoryUrl,
+      devServerOrigin,
       coverageEnabled,
       coverageConfig,
       coverageMethodForBrowsers,
@@ -196,55 +182,16 @@ export const executePlan = async (
       stopAfterAllSignal,
     }
     if (someNeedsServer) {
-      const server = await startOmegaServer({
-        signal: multipleExecutionsOperation.signal,
-        logLevel: "warn",
-        keepProcessAlive: false,
-        port,
-        host,
-        protocol,
-        certificate,
-        privateKey,
-        services,
-
-        rootDirectoryUrl,
-        scenarios,
-        runtimeCompat: runtimes,
-
-        plugins,
-        htmlSupervisor: true,
-        nodeEsmResolution,
-        fileSystemMagicResolution,
-        transpilation: {
-          ...transpilation,
-          getCustomBabelPlugins: ({ clientRuntimeCompat }) => {
-            if (
-              coverageEnabled &&
-              (coverageMethodForBrowsers !== "playwright_api" ||
-                Object.keys(clientRuntimeCompat)[0] !== "chrome")
-            ) {
-              return {
-                "transform-instrument": [
-                  babelPluginInstrument,
-                  {
-                    rootDirectoryUrl,
-                    coverageConfig,
-                  },
-                ],
-              }
-            }
-            return {}
-          },
-        },
-        sourcemaps,
-        writeGeneratedFiles,
-      })
-      multipleExecutionsOperation.addEndCallback(async () => {
-        await server.stop()
-      })
-      runtimeParams = {
-        ...runtimeParams,
-        server,
+      if (!devServerOrigin) {
+        throw new TypeError(
+          `devServerOrigin is required when running tests on browser(s)`,
+        )
+      }
+      const devServerStarted = await pingServer(devServerOrigin)
+      if (!devServerStarted) {
+        throw new Error(
+          `dev server not started at ${devServerOrigin}. It is required to run tests`,
+        )
       }
     }
 

package/src/test/execute_test_plan.js

@@ -17,9 +17,10 @@ import { generateCoverageTextLog } from "./coverage/coverage_reporter_text_log.j
 import { executePlan } from "./execute_plan.js"
 
 /**
- * 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
@@ -45,6 +46,7 @@ export const executeTestPlan = async ({
   completedExecutionLogAbbreviation = false,
   completedExecutionLogMerging = false,
   rootDirectoryUrl,
+  devServerOrigin,
 
   testPlan,
   updateProcessExitCode = true,
@@ -79,18 +81,6 @@ export const executeTestPlan = async ({
   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,
 }) => {
   const logger = createLogger({ logLevel })
   rootDirectoryUrl = assertAndNormalizeDirectoryUrl(rootDirectoryUrl)
@@ -150,6 +140,7 @@ export const executeTestPlan = async ({
     completedExecutionLogMerging,
     completedExecutionLogAbbreviation,
     rootDirectoryUrl,
+    devServerOrigin,
 
     maxExecutionsInParallel,
     defaultMsAllocatedPerExecution,
@@ -165,19 +156,6 @@ export const executeTestPlan = async ({
     coverageMethodForNodeJs,
     coverageV8ConflictWarning,
     coverageTempDirectoryRelativeUrl,
-
-    scenarios: { dev: true, test: true },
-    sourcemaps,
-    plugins,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
-    writeGeneratedFiles,
-
-    protocol,
-    privateKey,
-    certificate,
-    host,
-    port,
   })
   if (
     updateProcessExitCode &&