@jsenv/core 27.7.0 → 27.8.0

package/dist/main.js

@@ -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;
         }
@@ -13771,34 +13754,31 @@ const jsenvPluginImportMetaScenarios = () => {
           });
         };
 
-        if (scenario === "dev") {
-          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");
-          });
-          test.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
+        if (context.scenarios.build) {
+          // during build ensure replacement for tree-shaking
           dev.forEach(path => {
             replace(path, "undefined");
           });
           test.forEach(path => {
-            replace(path, "undefined");
+            replace(path, context.scenarios.test ? "true" : "undefined");
           });
           build.forEach(path => {
             replace(path, "true");
           });
+        } 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, "true");
+          });
+
+          if (context.scenarios.test) {
+            test.forEach(path => {
+              replace(path, "true");
+            });
+          }
         }
 
         const magicSource = createMagicSource(urlInfo.content);
@@ -13863,7 +13843,6 @@ const babelPluginMetadataImportMetaScenarios = () => {
         });
         state.file.metadata.importMetaScenarios = {
           dev: importMetas.dev,
-          test: importMetas.test,
           build: importMetas.build
         };
       }
@@ -13933,7 +13912,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;
@@ -16034,9 +16013,7 @@ const jsenvPluginBundling = bundling => {
   });
   return {
     name: "jsenv:bundling",
-    appliesDuring: {
-      build: true
-    },
+    appliesDuring: "build",
     bundle: {
       css: bundling.css ? (cssUrlInfos, context) => {
         return bundleCss({
@@ -16172,9 +16149,7 @@ const jsenvPluginMinification = minification => {
   }) : null;
   return {
     name: "jsenv:minification",
-    appliesDuring: {
-      build: true
-    },
+    appliesDuring: "build",
     optimizeUrlContent: {
       html: htmlOptimizer,
       svg: htmlOptimizer,
@@ -16494,7 +16469,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 +16518,7 @@ const jsenvPluginImportMetaHot = () => {
           return null;
         }
 
-        if (context.scenario === "build") {
+        if (context.scenarios.build) {
           return removeImportMetaHots(urlInfo, importMetaHotPaths);
         }
 
@@ -16587,7 +16562,8 @@ const jsenvPluginHmr = () => {
   return {
     name: "jsenv:hmr",
     appliesDuring: {
-      dev: true
+      dev: true,
+      test: false
     },
     redirectUrl: reference => {
       const urlObject = new URL(reference.url);
@@ -16632,7 +16608,8 @@ const jsenvPluginAutoreloadClient = () => {
   return {
     name: "jsenv:autoreload_client",
     appliesDuring: {
-      dev: true
+      dev: true,
+      test: false
     },
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
@@ -16664,7 +16641,8 @@ const jsenvPluginAutoreloadServer = ({
   return {
     name: "jsenv:autoreload_server",
     appliesDuring: {
-      dev: true
+      dev: true,
+      test: false
     },
     serverEvents: {
       reload: ({
@@ -16892,14 +16870,9 @@ const jsenvPluginAutoreloadServer = ({
 };
 
 const jsenvPluginAutoreload = ({
-  scenario,
   clientFileChangeCallbackList,
   clientFilesPruneCallbackList
 }) => {
-  if (scenario === "build") {
-    return [];
-  }
-
   return [jsenvPluginHmr(), jsenvPluginAutoreloadClient(), jsenvPluginAutoreloadServer({
     clientFileChangeCallbackList,
     clientFilesPruneCallbackList
@@ -16909,14 +16882,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 +16973,6 @@ const jsenvPluginExplorer = ({
 
 const getCorePlugins = ({
   rootDirectoryUrl,
-  scenario,
   runtimeCompat,
   urlAnalysis = {},
   htmlSupervisor,
@@ -17048,7 +17017,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)] : [])];
@@ -20743,10 +20711,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 +20921,7 @@ const createPluginController = ({
 };
 
 const flattenAndFilterPlugins = (plugins, {
-  scenario
+  scenarios
 }) => {
   const flatPlugins = [];
 
@@ -20983,12 +20951,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 +20967,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 +21692,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 +21711,7 @@ const createKitchen = ({
   });
   const pluginController = createPluginController({
     plugins,
-    scenario
+    scenarios
   });
   const jsenvDirectoryUrl = new URL(".jsenv/", rootDirectoryUrl).href;
   const kitchenContext = {
@@ -21741,7 +21719,7 @@ const createKitchen = ({
     logger,
     rootDirectoryUrl,
     urlGraph,
-    scenario,
+    scenarios,
     runtimeCompat,
     clientRuntimeCompat,
     isSupportedOnCurrentClients: feature => {
@@ -22446,7 +22424,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 +23559,9 @@ build ${entryPointKeys.length} entry points`);
       logger,
       rootDirectoryUrl,
       urlGraph: rawGraph,
-      scenario: "build",
+      scenarios: {
+        build: true
+      },
       sourcemaps,
       sourcemapsSourcesContent,
       runtimeCompat,
@@ -23603,7 +23583,6 @@ build ${entryPointKeys.length} entry points`);
       }, ...getCorePlugins({
         rootDirectoryUrl,
         urlGraph: rawGraph,
-        scenario: "build",
         runtimeCompat,
         urlAnalysis,
         nodeEsmResolution,
@@ -23821,7 +23800,9 @@ build ${entryPointKeys.length} entry points`);
       logger,
       rootDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: {
+        build: true
+      },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: !versioning,
@@ -24483,7 +24464,9 @@ const applyUrlVersioning = async ({
       logger,
       rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
-      scenario: "build",
+      scenarios: {
+        build: true
+      },
       sourcemaps,
       sourcemapsSourcesContent,
       sourcemapsRelativeSources: true,
@@ -24496,9 +24479,7 @@ const applyUrlVersioning = async ({
         allowEscapeForVersioning: true
       }), {
         name: "jsenv:versioning",
-        appliesDuring: {
-          build: true
-        },
+        appliesDuring: "build",
         resolveUrl: reference => {
           const buildUrl = buildUrls[reference.specifier];
 
@@ -24893,7 +24874,7 @@ const createFileService = ({
   serverStopCallbacks,
   serverEventsDispatcher,
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
   plugins,
   urlAnalysis,
@@ -24931,7 +24912,7 @@ const createFileService = ({
     ".jsenv/": false
   };
 
-  if (scenario === "dev") {
+  if (scenarios.dev) {
     const stopWatchingClientFiles = registerDirectoryLifecycle(rootDirectoryUrl, {
       watchPatterns: clientFilePatterns,
       cooldownBetweenFileEvents,
@@ -24995,13 +24976,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 +24990,6 @@ const createFileService = ({
       urlGraph,
       plugins: [...plugins, ...getCorePlugins({
         rootDirectoryUrl,
-        scenario,
         runtimeCompat,
         urlAnalysis,
         htmlSupervisor,
@@ -25052,7 +25032,7 @@ const createFileService = ({
           allServerEvents[serverEventName]({
             rootDirectoryUrl,
             urlGraph,
-            scenario,
+            scenarios,
             sendServerEvent: data => {
               serverEventsDispatcher.dispatch({
                 type: serverEventName,
@@ -25068,7 +25048,7 @@ const createFileService = ({
 
     const context = {
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeName,
       runtimeVersion,
       urlGraph,
@@ -25155,7 +25135,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
@@ -25287,7 +25267,7 @@ const startOmegaServer = async ({
   onStop = () => {},
   services = [],
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
   plugins,
   urlAnalysis,
@@ -25340,7 +25320,7 @@ const startOmegaServer = async ({
         serverStopCallbacks,
         serverEventsDispatcher,
         rootDirectoryUrl,
-        scenario,
+        scenarios,
         runtimeCompat,
         plugins,
         urlAnalysis,
@@ -25572,7 +25552,9 @@ const startDevServer = async ({
     port,
     services,
     rootDirectoryUrl,
-    scenario: "dev",
+    scenarios: {
+      dev: true
+    },
     runtimeCompat,
     plugins,
     urlAnalysis,
@@ -26891,7 +26873,7 @@ const executePlan = async (plan, {
   coverageMethodForNodeJs,
   coverageV8ConflictWarning,
   coverageTempDirectoryRelativeUrl,
-  scenario,
+  scenarios,
   sourcemaps,
   plugins,
   nodeEsmResolution,
@@ -27036,7 +27018,7 @@ const executePlan = async (plan, {
         privateKey,
         services,
         rootDirectoryUrl,
-        scenario,
+        scenarios,
         runtimeCompat: runtimes,
         plugins,
         htmlSupervisor: true,
@@ -27551,7 +27533,10 @@ const executeTestPlan = async ({
     coverageMethodForNodeJs,
     coverageV8ConflictWarning,
     coverageTempDirectoryRelativeUrl,
-    scenario: "test",
+    scenarios: {
+      dev: true,
+      test: true
+    },
     sourcemaps,
     plugins,
     nodeEsmResolution,
@@ -29439,7 +29424,9 @@ const execute = async ({
   collectPerformance = false,
   runtime,
   runtimeParams,
-  scenario = "dev",
+  scenarios = {
+    dev: true
+  },
   plugins = [],
   nodeEsmResolution,
   fileSystemMagicResolution,
@@ -29489,7 +29476,7 @@ const execute = async ({
       certificate,
       privateKey,
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeCompat: {
         [runtime.name]: runtime.version
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "27.7.0",
+  "version": "27.8.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

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/dev/start_dev_server.js

@@ -155,7 +155,7 @@ export const startDevServer = async ({
     services,
 
     rootDirectoryUrl,
-    scenario: "dev",
+    scenarios: { dev: true },
     runtimeCompat,
 
     plugins,

package/src/execute/execute.js

@@ -24,7 +24,7 @@ export const execute = async ({
   runtime,
   runtimeParams,
 
-  scenario = "dev",
+  scenarios = { dev: true },
   plugins = [],
   nodeEsmResolution,
   fileSystemMagicResolution,
@@ -75,7 +75,7 @@ export const execute = async ({
       privateKey,
 
       rootDirectoryUrl,
-      scenario,
+      scenarios,
       runtimeCompat: { [runtime.name]: runtime.version },
 
       plugins,

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

@@ -25,7 +25,7 @@ export const startOmegaServer = async ({
   services = [],
 
   rootDirectoryUrl,
-  scenario,
+  scenarios,
   runtimeCompat,
 
   plugins,
@@ -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/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)

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") &&
@@ -34,34 +33,30 @@ export const jsenvPluginImportMetaScenarios = () => {
         const replace = (path, value) => {
           replacements.push({ path, value })
         }
-        if (scenario === "dev") {
-          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")
-          })
-          test.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
+        if (context.scenarios.build) {
+          // during build ensure replacement for tree-shaking
           dev.forEach((path) => {
             replace(path, "undefined")
           })
           test.forEach((path) => {
-            replace(path, "undefined")
+            replace(path, context.scenarios.test ? "true" : "undefined")
           })
           build.forEach((path) => {
             replace(path, "true")
           })
+        } 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, "true")
+          })
+          if (context.scenarios.test) {
+            test.forEach((path) => {
+              replace(path, "true")
+            })
+          }
         }
         const magicSource = createMagicSource(urlInfo.content)
         replacements.forEach(({ path, value }) => {
@@ -106,7 +101,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/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/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

@@ -55,7 +55,7 @@ export const executePlan = async (
     coverageV8ConflictWarning,
     coverageTempDirectoryRelativeUrl,
 
-    scenario,
+    scenarios,
     sourcemaps,
     plugins,
     nodeEsmResolution,
@@ -208,7 +208,7 @@ export const executePlan = async (
         services,
 
         rootDirectoryUrl,
-        scenario,
+        scenarios,
         runtimeCompat: runtimes,
 
         plugins,

package/src/test/execute_test_plan.js

@@ -166,7 +166,7 @@ export const executeTestPlan = async ({
     coverageV8ConflictWarning,
     coverageTempDirectoryRelativeUrl,
 
-    scenario: "test",
+    scenarios: { dev: true, test: true },
     sourcemaps,
     plugins,
     nodeEsmResolution,