@jsenv/core 27.7.0 → 28.0.0

package/src/plugins/import_meta_scenarios/jsenv_plugin_import_meta_scenarios.js

@@ -1,11 +1,10 @@
 /*
  * 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)
  */
 
@@ -17,7 +16,7 @@ export 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") &&
@@ -29,37 +28,25 @@ 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 })
         }
-        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")
           })
         }
@@ -106,7 +93,6 @@ const babelPluginMetadataImportMetaScenarios = () => {
         })
         state.file.metadata.importMetaScenarios = {
           dev: importMetas.dev,
-          test: importMetas.test,
           build: importMetas.build,
         }
       },

package/src/plugins/importmap/jsenv_plugin_importmap.js

@@ -202,7 +202,7 @@ export const jsenvPluginImportmap = () => {
         // by "formatReferencedUrl" making the importmap presence useless.
         // In dev/test we keep importmap into the HTML to see it even if useless
         // Duing build we get rid of it
-        if (context.scenario === "build") {
+        if (context.scenarios.build) {
           removeHtmlNode(importmap)
         }
         return {

package/src/plugins/minification/jsenv_plugin_minification.js

@@ -40,9 +40,7 @@ export const jsenvPluginMinification = (minification) => {
 
   return {
     name: "jsenv:minification",
-    appliesDuring: {
-      build: true,
-    },
+    appliesDuring: "build",
     optimizeUrlContent: {
       html: htmlOptimizer,
       svg: htmlOptimizer,

package/src/plugins/node_esm_resolution/jsenv_plugin_node_esm_resolution.js

@@ -27,8 +27,10 @@ export const jsenvPluginNodeEsmResolution = ({
   return {
     name: "jsenv:node_esm_resolution",
     appliesDuring: "*",
-    init: ({ rootDirectoryUrl, scenario, runtimeCompat, urlGraph }) => {
-      const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node")
+    init: (context) => {
+      const nodeRuntimeEnabled = Object.keys(context.runtimeCompat).includes(
+        "node",
+      )
       // https://nodejs.org/api/esm.html#resolver-algorithm-specification
       packageConditions = packageConditions || [
         ...readCustomConditionsFromProcessArgs(),
@@ -57,19 +59,19 @@ export 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),
+            new URL(file, context.rootDirectoryUrl),
             {
               added: () => {
                 onFileChange()
@@ -131,7 +133,7 @@ export const jsenvPluginNodeEsmResolution = ({
       return null
     },
     transformUrlSearchParams: (reference, context) => {
-      if (context.scenario === "build") {
+      if (context.scenarios.build) {
         return null
       }
       if (!reference.url.startsWith("file:")) {

package/src/plugins/plugin_controller.js

@@ -17,8 +17,8 @@ const HOOK_NAMES = [
   "destroy",
 ]
 
-export const createPluginController = ({ plugins, scenario }) => {
-  const flatPlugins = flattenAndFilterPlugins(plugins, { scenario })
+export const createPluginController = ({ plugins, scenarios }) => {
+  const flatPlugins = flattenAndFilterPlugins(plugins, { 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
@@ -187,7 +187,7 @@ export const createPluginController = ({ plugins, scenario }) => {
   }
 }
 
-const flattenAndFilterPlugins = (plugins, { scenario }) => {
+const flattenAndFilterPlugins = (plugins, { scenarios }) => {
   const flatPlugins = []
   const visitPluginEntry = (pluginEntry) => {
     if (Array.isArray(pluginEntry)) {
@@ -208,13 +208,14 @@ const flattenAndFilterPlugins = (plugins, { scenario }) => {
         return
       }
       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
       }
@@ -223,7 +224,17 @@ const flattenAndFilterPlugins = (plugins, { scenario }) => {
           `"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
       }

package/src/plugins/plugins.js

@@ -24,7 +24,6 @@ import { jsenvPluginExplorer } from "./explorer/jsenv_plugin_explorer.js"
 
 export const getCorePlugins = ({
   rootDirectoryUrl,
-  scenario,
   runtimeCompat,
 
   urlAnalysis = {},
@@ -84,7 +83,6 @@ export const getCorePlugins = ({
       ? [
           jsenvPluginAutoreload({
             ...clientAutoreload,
-            scenario,
             clientFileChangeCallbackList,
             clientFilesPruneCallbackList,
           }),

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

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/transpilation/import_assertions/jsenv_plugin_import_assertions.js

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

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

@@ -13,9 +13,9 @@ import {
 export const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   const url = urlInfo.originalUrl
   const content = urlInfo.content
-  const { scenario, referenceUtils } = context
+  const { scenarios, referenceUtils } = context
   const htmlAst = parseHtmlString(content, {
-    storeOriginalPositions: scenario !== "build",
+    storeOriginalPositions: scenarios.dev,
   })
   const actions = []
   visitHtmlUrls({

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,
 
-    scenario,
-    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,
-        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,
-                  },
-                ],
-              }
-            }
-            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,
-
-    scenario: "test",
-    sourcemaps,
-    plugins,
-    nodeEsmResolution,
-    fileSystemMagicResolution,
-    writeGeneratedFiles,
-
-    protocol,
-    privateKey,
-    certificate,
-    host,
-    port,
   })
   if (
     updateProcessExitCode &&