@jsenv/core 29.7.1 → 29.8.1

package/dist/main.js

@@ -8363,7 +8363,7 @@ const analyzeImportDeclaration = (node, {
   const specifierNode = node.source;
   const assertionInfo = extractImportAssertionsInfo(node);
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "import_static",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -8383,7 +8383,7 @@ const analyzeImportExpression = (node, {
   }
   const assertionInfo = extractImportAssertionsInfo(node);
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "import_dynamic",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -8407,7 +8407,7 @@ const analyzeExportNamedDeclaration = (node, {
     return;
   }
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "export_named",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -8421,7 +8421,7 @@ const analyzeExportAllDeclaration = (node, {
 }) => {
   const specifierNode = node.source;
   onUrl({
-    type: "js_import_export",
+    type: "js_import",
     subtype: "export_all",
     specifier: specifierNode.value,
     specifierStart: specifierNode.start,
@@ -8499,6 +8499,27 @@ const extractImportAssertionsInfo = node => {
   };
 };
 
+const isImportMetaResolveCall = node => {
+  return node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.object.type === "MetaProperty" && node.callee.property.type === "Identifier" && node.callee.property.name === "resolve";
+};
+const analyzeImportMetaResolveCall = (node, {
+  onUrl
+}) => {
+  const firstArg = node.arguments[0];
+  if (firstArg && isStringLiteralNode(firstArg)) {
+    onUrl({
+      node,
+      type: "js_import",
+      subtype: "import_meta_resolve",
+      specifier: firstArg.value,
+      specifierStart: firstArg.start,
+      specifierEnd: firstArg.end,
+      specifierLine: firstArg.loc.start.line,
+      specifierColumn: firstArg.loc.start.column
+    });
+  }
+};
+
 const isNewUrlCall = node => {
   return node.type === "NewExpression" && node.callee.type === "Identifier" && node.callee.name === "URL";
 };
@@ -8514,7 +8535,7 @@ const analyzeNewUrlCall = (node, {
     if (urlType === "StringLiteral") {
       const specifierNode = firstArgNode;
       onUrl({
-        type: "js_url_specifier",
+        type: "js_url",
         subtype: "new_url_first_arg",
         specifier: specifierNode.value,
         specifierStart: specifierNode.start,
@@ -8544,7 +8565,7 @@ const analyzeNewUrlCall = (node, {
         // we can understand the first argument
         const specifierNode = firstArgNode;
         onUrl({
-          type: "js_url_specifier",
+          type: "js_url",
           subtype: "new_url_first_arg",
           specifier: specifierNode.value,
           specifierStart: specifierNode.start,
@@ -8558,7 +8579,7 @@ const analyzeNewUrlCall = (node, {
       if (baseUrlType === "StringLiteral") {
         const specifierNode = secondArgNode;
         onUrl({
-          type: "js_url_specifier",
+          type: "js_url",
           subtype: "new_url_second_arg",
           specifier: specifierNode.value,
           specifierStart: specifierNode.start,
@@ -8720,7 +8741,7 @@ const analyzeWorkerCallArguments = (node, {
   if (isStringLiteralNode(firstArgNode)) {
     const specifierNode = firstArgNode;
     onUrl({
-      type: "js_url_specifier",
+      type: "js_url",
       subtype: referenceSubtype,
       expectedType,
       expectedSubtype,
@@ -8745,6 +8766,20 @@ const analyzeWorkerCallArguments = (node, {
         onUrl(mention);
       }
     });
+    return;
+  }
+  if (isJsModule && isImportMetaResolveCall(firstArgNode)) {
+    analyzeImportMetaResolveCall(firstArgNode, {
+      onUrl: mention => {
+        Object.assign(mention, {
+          expectedType,
+          expectedSubtype,
+          typePropertyNode
+        });
+        onUrl(mention);
+      }
+    });
+    return;
   }
 };
 
@@ -8762,7 +8797,7 @@ const analyzeImportScriptCalls = (node, {
     if (isStringLiteralNode(arg)) {
       const specifierNode = arg;
       onUrl({
-        type: "js_url_specifier",
+        type: "js_url",
         subtype: "self_import_scripts_arg",
         expectedType: "js_classic",
         specifier: specifierNode.value,
@@ -8807,7 +8842,7 @@ const analyzeSystemRegisterDeps = (node, {
     if (isStringLiteralNode(element)) {
       const specifierNode = element;
       onUrl({
-        type: "js_url_specifier",
+        type: "js_url",
         subtype: "system_register_arg",
         expectedType: "js_classic",
         specifier: specifierNode.value,
@@ -8835,7 +8870,7 @@ const analyzeSystemImportCall = (node, {
   if (isStringLiteralNode(firstArgNode)) {
     const specifierNode = firstArgNode;
     onUrl({
-      type: "js_url_specifier",
+      type: "js_url",
       subtype: "system_import_arg",
       expectedType: "js_classic",
       specifier: specifierNode.value,
@@ -8846,6 +8881,32 @@ const analyzeSystemImportCall = (node, {
     });
   }
 };
+const isSystemResolveCall = node => {
+  const callee = node.callee;
+  return callee.type === "MemberExpression" && callee.object.type === "MemberExpression" && callee.object.object.type === "Identifier" &&
+  // because of minification we can't assume _context.
+  // so anything matching "*.meta.resolve()"
+  // will be assumed to be the equivalent to "meta.resolve()"
+  // callee.object.object.name === "_context" &&
+  callee.object.property.type === "Identifier" && callee.object.property.name === "meta" && callee.property.type === "Identifier" && callee.property.name === "resolve";
+};
+const analyzeSystemResolveCall = (node, {
+  onUrl
+}) => {
+  const firstArgNode = node.arguments[0];
+  if (isStringLiteralNode(firstArgNode)) {
+    const specifierNode = firstArgNode;
+    onUrl({
+      type: "js_url",
+      subtype: "system_resolve_arg",
+      specifier: specifierNode.value,
+      specifierStart: specifierNode.start,
+      specifierEnd: specifierNode.end,
+      specifierLine: specifierNode.loc.start.line,
+      specifierColumn: specifierNode.loc.start.column
+    });
+  }
+};
 
 const parseJsUrls = async ({
   js,
@@ -8884,6 +8945,12 @@ const parseJsUrls = async ({
       });
     },
     CallExpression: node => {
+      if (isJsModule && isImportMetaResolveCall(node)) {
+        analyzeImportMetaResolveCall(node, {
+          onUrl
+        });
+        return;
+      }
       if (isServiceWorkerRegisterCall(node)) {
         analyzeServiceWorkerRegisterCall(node, {
           isJsModule,
@@ -8909,6 +8976,12 @@ const parseJsUrls = async ({
         });
         return;
       }
+      if (!isJsModule && isSystemResolveCall(node)) {
+        analyzeSystemResolveCall(node, {
+          onUrl
+        });
+        return;
+      }
     },
     NewExpression: (node, ancestors) => {
       if (isNewWorkerCall(node)) {
@@ -8970,11 +9043,11 @@ const urlSpecifierEncoding = {
   }
 };
 const formatters = {
-  "js_import_export": {
+  "js_import": {
     encode: JSON.stringify,
     decode: JSON.parse
   },
-  "js_url_specifier": {
+  "js_url": {
     encode: JSON.stringify,
     decode: JSON.parse
   },
@@ -9277,23 +9350,30 @@ const HOOK_NAMES = ["init", "serve",
 "cooked", "augmentResponse",
 // is called only during dev/tests
 "destroy"];
-const createPluginController = ({
-  plugins,
-  scenarios
-}) => {
-  const flatPlugins = flattenAndFilterPlugins(plugins, {
-    scenarios
-  });
+const createPluginController = kitchenContext => {
+  const plugins = [];
   // 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
-
   const hookGroups = {};
   const addPlugin = (plugin, {
     position = "start"
   }) => {
+    if (plugin === null || typeof plugin !== "object") {
+      throw new TypeError(`plugin must be objects, got ${plugin}`);
+    }
+    if (!testAppliesDuring(plugin) || !initPlugin(plugin)) {
+      if (plugin.destroy) {
+        plugin.destroy();
+      }
+      return;
+    }
+    if (!plugin.name) {
+      plugin.name = "anonymous";
+    }
+    plugins.push(plugin);
     Object.keys(plugin).forEach(key => {
-      if (key === "name" || key === "appliesDuring" || key === "serverEvents") {
+      if (key === "name" || key === "appliesDuring" || key === "init" || key === "serverEvents") {
         return;
       }
       const isHook = HOOK_NAMES.includes(key);
@@ -9317,6 +9397,52 @@ const createPluginController = ({
       }
     });
   };
+  const testAppliesDuring = plugin => {
+    const {
+      appliesDuring
+    } = plugin;
+    if (appliesDuring === undefined) {
+      // console.debug(`"appliesDuring" is undefined on ${pluginEntry.name}`)
+      return true;
+    }
+    if (appliesDuring === "*") {
+      return true;
+    }
+    if (typeof appliesDuring === "string") {
+      if (appliesDuring !== "dev" && appliesDuring !== "build") {
+        throw new TypeError(`"appliesDuring" must be "dev" or "build", got ${appliesDuring}`);
+      }
+      if (kitchenContext[appliesDuring]) {
+        return true;
+      }
+      return false;
+    }
+    if (typeof appliesDuring === "object") {
+      for (const key of Object.keys(appliesDuring)) {
+        if (!appliesDuring[key] && kitchenContext[key]) {
+          return false;
+        }
+        if (appliesDuring[key] && kitchenContext[key]) {
+          return true;
+        }
+      }
+      // throw new Error(`"appliesDuring" is empty`)
+      return false;
+    }
+    throw new TypeError(`"appliesDuring" must be an object or a string, got ${appliesDuring}`);
+  };
+  const initPlugin = plugin => {
+    if (plugin.init) {
+      const initReturnValue = plugin.init(kitchenContext);
+      if (initReturnValue === false) {
+        return false;
+      }
+      if (typeof initReturnValue === "function" && !plugin.destroy) {
+        plugin.destroy = initReturnValue;
+      }
+    }
+    return true;
+  };
   const pushPlugin = plugin => {
     addPlugin(plugin, {
       position: "start"
@@ -9327,9 +9453,6 @@ const createPluginController = ({
       position: "end"
     });
   };
-  flatPlugins.forEach(plugin => {
-    pushPlugin(plugin);
-  });
   let lastPluginUsed = null;
   let currentPlugin = null;
   let currentHookName = null;
@@ -9436,7 +9559,7 @@ const createPluginController = ({
     });
   };
   return {
-    plugins: flatPlugins,
+    plugins,
     pushPlugin,
     unshiftPlugin,
     getHookFunction,
@@ -9451,68 +9574,6 @@ const createPluginController = ({
     getCurrentHookName: () => currentHookName
   };
 };
-const flattenAndFilterPlugins = (plugins, {
-  scenarios
-}) => {
-  const flatPlugins = [];
-  const visitPluginEntry = pluginEntry => {
-    if (Array.isArray(pluginEntry)) {
-      pluginEntry.forEach(value => visitPluginEntry(value));
-      return;
-    }
-    if (typeof pluginEntry === "object" && pluginEntry !== null) {
-      if (!pluginEntry.name) {
-        pluginEntry.name = "anonymous";
-      }
-      const {
-        appliesDuring
-      } = pluginEntry;
-      if (appliesDuring === undefined) {
-        // console.debug(`"appliesDuring" is undefined on ${pluginEntry.name}`)
-        flatPlugins.push(pluginEntry);
-        return;
-      }
-      if (appliesDuring === "*") {
-        flatPlugins.push(pluginEntry);
-        return;
-      }
-      if (typeof appliesDuring === "string") {
-        if (!["dev", "build"].includes(appliesDuring)) {
-          throw new Error(`"appliesDuring" must be "dev" or "build", got ${appliesDuring}`);
-        }
-        if (scenarios[appliesDuring]) {
-          flatPlugins.push(pluginEntry);
-          return;
-        }
-        return;
-      }
-      if (typeof appliesDuring !== "object") {
-        throw new Error(`"appliesDuring" must be an object or a string, got ${appliesDuring}`);
-      }
-      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;
-      }
-      if (pluginEntry.destroy) {
-        pluginEntry.destroy();
-      }
-      return;
-    }
-    throw new Error(`plugin must be objects, got ${pluginEntry}`);
-  };
-  plugins.forEach(plugin => visitPluginEntry(plugin));
-  return flatPlugins;
-};
 const getHookFunction = (hook,
 // can be undefined, reference, or urlInfo
 info = {}) => {
@@ -9651,6 +9712,7 @@ const createUrlInfoTransformer = ({
     //   during build it's urlInfo.url to be inside the build
     //   but otherwise it's generatedUrl to be inside .jsenv/ directory
     const generatedUrlObject = new URL(urlInfo.generatedUrl);
+    generatedUrlObject.searchParams.delete("as_js_module");
     generatedUrlObject.searchParams.delete("as_js_classic");
     generatedUrlObject.searchParams.delete("as_js_classic_library");
     const urlForSourcemap = generatedUrlObject.href;
@@ -9872,7 +9934,7 @@ const findHighestVersion = (...values) => {
   });
 };
 
-const featureCompats = {
+const featuresCompatMap = {
   script_type_module: {
     edge: "16",
     firefox: "60",
@@ -9903,6 +9965,9 @@ const featureCompats = {
     safari: "11.1",
     samsung: "9.2"
   },
+  import_meta_resolve: {
+    chrome: "107"
+  },
   // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import#browser_compatibility
   import_dynamic: {
     android: "8",
@@ -10029,7 +10094,7 @@ const featureCompats = {
 };
 
 const RUNTIME_COMPAT = {
-  featureCompats,
+  featuresCompatMap,
   add: (originalRuntimeCompat, feature) => {
     const featureCompat = getFeatureCompat(feature);
     const runtimeCompat = {
@@ -10058,7 +10123,7 @@ const RUNTIME_COMPAT = {
 };
 const getFeatureCompat = feature => {
   if (typeof feature === "string") {
-    const compat = featureCompats[feature];
+    const compat = featuresCompatMap[feature];
     if (!compat) {
       throw new Error(`"${feature}" feature is unknown`);
     }
@@ -10460,14 +10525,15 @@ const createKitchen = ({
   signal,
   logLevel,
   rootDirectoryUrl,
-  scenarios,
+  dev = false,
+  build = false,
   runtimeCompat,
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
   clientRuntimeCompat = runtimeCompat,
   urlGraph,
   plugins,
-  sourcemaps = scenarios.dev ? "inline" : "none",
+  sourcemaps = dev ? "inline" : "none",
   // "programmatic" and "file" also allowed
   sourcemapsSourcesProtocol,
   sourcemapsSourcesContent,
@@ -10478,16 +10544,13 @@ const createKitchen = ({
   const logger = createLogger({
     logLevel
   });
-  const pluginController = createPluginController({
-    plugins,
-    scenarios
-  });
   const kitchenContext = {
     signal,
     logger,
     rootDirectoryUrl,
     urlGraph,
-    scenarios,
+    dev,
+    build,
     runtimeCompat,
     clientRuntimeCompat,
     isSupportedOnCurrentClients: feature => {
@@ -10499,7 +10562,17 @@ const createKitchen = ({
     sourcemaps,
     outDirectoryUrl
   };
-  pluginController.callHooks("init", kitchenContext);
+  const pluginController = createPluginController(kitchenContext);
+  const pushPlugins = plugins => {
+    plugins.forEach(pluginEntry => {
+      if (Array.isArray(pluginEntry)) {
+        pushPlugins(pluginEntry);
+      } else {
+        pluginController.pushPlugin(pluginEntry);
+      }
+    });
+  };
+  pushPlugins(plugins);
   const createReference = ({
     data = {},
     node,
@@ -11164,7 +11237,7 @@ const applyReferenceEffectsOnUrlInfo = (reference, urlInfo, context) => {
       column: reference.specifierColumn
     };
     urlInfo.contentType = reference.contentType;
-    urlInfo.originalContent = context.scenarios.build ? urlInfo.originalContent === undefined ? reference.content : urlInfo.originalContent : reference.content;
+    urlInfo.originalContent = context.build ? urlInfo.originalContent === undefined ? reference.content : urlInfo.originalContent : reference.content;
     urlInfo.content = reference.content;
   }
 };
@@ -11527,10 +11600,12 @@ const jsenvPluginReferenceExpectedTypes = () => {
       reference.expectedType = "js_classic";
     } else if (searchParams.has("as_js_classic") || searchParams.has("as_js_classic_library")) {
       reference.expectedType = "js_classic";
+    } else if (searchParams.has("as_js_module")) {
+      reference.expectedType = "js_module";
     } else if (searchParams.has("js_module")) {
       searchParams.delete("js_module");
       reference.expectedType = "js_module";
-    } else if (reference.type === "js_url_specifier" && reference.expectedType === undefined && CONTENT_TYPE.fromUrlExtension(reference.url) === "text/javascript") {
+    } else if (reference.type === "js_url" && reference.expectedType === undefined && CONTENT_TYPE.fromUrlExtension(reference.url) === "text/javascript") {
       // by default, js referenced by new URL is considered as "js_module"
       // in case this is not desired code must use "?js_classic" like
       // new URL('./file.js?js_classic', import.meta.url)
@@ -11553,7 +11628,7 @@ const jsenvPluginReferenceExpectedTypes = () => {
     appliesDuring: "*",
     redirectUrl: {
       script_src: redirectJsUrls,
-      js_url_specifier: redirectJsUrls
+      js_url: redirectJsUrls
     }
   };
 };
@@ -11562,7 +11637,7 @@ const parseAndTransformHtmlUrls = async (urlInfo, context) => {
   const url = urlInfo.originalUrl;
   const content = urlInfo.content;
   const htmlAst = parseHtmlString(content, {
-    storeOriginalPositions: context.scenarios.dev
+    storeOriginalPositions: context.dev
   });
   const mentions = visitHtmlUrls({
     url,
@@ -11909,6 +11984,7 @@ const parseAndTransformJsUrls = async (urlInfo, context) => {
       urlInfo.data.usesImport = true;
     }
     const [reference] = context.referenceUtils.found({
+      node: jsMention.node,
       type: jsMention.type,
       subtype: jsMention.subtype,
       expectedType: jsMention.expectedType,
@@ -12010,7 +12086,7 @@ const jsenvPluginUrlAnalysis = ({
       // 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)
-      reference.type !== "js_import_export") {
+      reference.type !== "js_import") {
         reference.shouldHandle = false;
         return;
       }
@@ -12807,6 +12883,27 @@ const generateExpressionAst = (expression, options) => {
   return ast;
 };
 
+const babelPluginTransformImportMetaResolve = () => {
+  return {
+    name: "transform-import-meta-resolve",
+    visitor: {
+      Program: programPath => {
+        programPath.traverse({
+          MemberExpression: path => {
+            const node = path.node;
+            if (node.object.type === "MetaProperty" && node.object.property.name === "meta" && node.property.name === "resolve") {
+              const firstArg = node.arguments[0];
+              if (firstArg && firstArg.type === "StringLiteral") {
+                path.replaceWithSourceString(`new URL(${firstArg.value}, document.currentScript.src).href`);
+              }
+            }
+          }
+        });
+      }
+    }
+  };
+};
+
 // eslint-disable-next-line import/no-default-export
 var helpers_string_1 = '// A type of promise-like that resolves synchronously and supports only one observer\nexport const _Pact = /*#__PURE__*/(function() {\n\tfunction _Pact() {}\n\t_Pact.prototype.then = function(onFulfilled, onRejected) {\n\t\tconst result = new _Pact();\n\t\tconst state = this.s;\n\t\tif (state) {\n\t\t\tconst callback = state & 1 ? onFulfilled : onRejected;\n\t\t\tif (callback) {\n\t\t\t\ttry {\n\t\t\t\t\t_settle(result, 1, callback(this.v));\n\t\t\t\t} catch (e) {\n\t\t\t\t\t_settle(result, 2, e);\n\t\t\t\t}\n\t\t\t\treturn result;\n\t\t\t} else {\n\t\t\t\treturn this;\n\t\t\t}\n\t\t}\n\t\tthis.o = function(_this) {\n\t\t\ttry {\n\t\t\t\tconst value = _this.v;\n\t\t\t\tif (_this.s & 1) {\n\t\t\t\t\t_settle(result, 1, onFulfilled ? onFulfilled(value) : value);\n\t\t\t\t} else if (onRejected) {\n\t\t\t\t\t_settle(result, 1, onRejected(value));\n\t\t\t\t} else {\n\t\t\t\t\t_settle(result, 2, value);\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\t_settle(result, 2, e);\n\t\t\t}\n\t\t};\n\t\treturn result;\n\t}\n\treturn _Pact;\n})();\n\n// Settles a pact synchronously\nexport function _settle(pact, state, value) {\n\tif (!pact.s) {\n\t\tif (value instanceof _Pact) {\n\t\t\tif (value.s) {\n\t\t\t\tif (state & 1) {\n\t\t\t\t\tstate = value.s;\n\t\t\t\t}\n\t\t\t\tvalue = value.v;\n\t\t\t} else {\n\t\t\t\tvalue.o = _settle.bind(null, pact, state);\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\tif (value && value.then) {\n\t\t\tvalue.then(_settle.bind(null, pact, state), _settle.bind(null, pact, 2));\n\t\t\treturn;\n\t\t}\n\t\tpact.s = state;\n\t\tpact.v = value;\n\t\tconst observer = pact.o;\n\t\tif (observer) {\n\t\t\tobserver(pact);\n\t\t}\n\t}\n}\n\nexport function _isSettledPact(thenable) {\n\treturn thenable instanceof _Pact && thenable.s & 1;\n}\n\n// Converts argument to a function that always returns a Promise\nexport function _async(f) {\n\treturn function() {\n\t\tfor (var args = [], i = 0; i < arguments.length; i++) {\n\t\t\targs[i] = arguments[i];\n\t\t}\n\t\ttry {\n\t\t\treturn Promise.resolve(f.apply(this, args));\n\t\t} catch(e) {\n\t\t\treturn Promise.reject(e);\n\t\t}\n\t}\n}\n\n// Awaits on a value that may or may not be a Promise (equivalent to the await keyword in ES2015, with continuations passed explicitly)\nexport function _await(value, then, direct) {\n\tif (direct) {\n\t\treturn then ? then(value) : value;\n\t}\n\tif (!value || !value.then) {\n\t\tvalue = Promise.resolve(value);\n\t}\n\treturn then ? value.then(then) : value;\n}\n\n// Awaits on a value that may or may not be a Promise, then ignores it\nexport function _awaitIgnored(value, direct) {\n\tif (!direct) {\n\t\treturn value && value.then ? value.then(_empty) : Promise.resolve();\n\t}\n}\n\n// Proceeds after a value has resolved, or proceeds immediately if the value is not thenable\nexport function _continue(value, then) {\n\treturn value && value.then ? value.then(then) : then(value);\n}\n\n// Proceeds after a value has resolved, or proceeds immediately if the value is not thenable\nexport function _continueIgnored(value) {\n\tif (value && value.then) {\n\t\treturn value.then(_empty);\n\t}\n}\n\n// Asynchronously iterate through an object that has a length property, passing the index as the first argument to the callback (even as the length property changes)\nexport function _forTo(array, body, check) {\n\tvar i = -1, pact, reject;\n\tfunction _cycle(result) {\n\t\ttry {\n\t\t\twhile (++i < array.length && (!check || !check())) {\n\t\t\t\tresult = body(i);\n\t\t\t\tif (result && result.then) {\n\t\t\t\t\tif (_isSettledPact(result)) {\n\t\t\t\t\t\tresult = result.v;\n\t\t\t\t\t} else {\n\t\t\t\t\t\tresult.then(_cycle, reject || (reject = _settle.bind(null, pact = new _Pact(), 2)));\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (pact) {\n\t\t\t\t_settle(pact, 1, result);\n\t\t\t} else {\n\t\t\t\tpact = result;\n\t\t\t}\n\t\t} catch (e) {\n\t\t\t_settle(pact || (pact = new _Pact()), 2, e);\n\t\t}\n\t}\n\t_cycle();\n\treturn pact;\n}\n\n// Asynchronously iterate through an object\'s properties (including properties inherited from the prototype)\n// Uses a snapshot of the object\'s properties\nexport function _forIn(target, body, check) {\n\tvar keys = [];\n\tfor (var key in target) {\n\t\tkeys.push(key);\n\t}\n\treturn _forTo(keys, function(i) { return body(keys[i]); }, check);\n}\n\n// Asynchronously iterate through an object\'s own properties (excluding properties inherited from the prototype)\n// Uses a snapshot of the object\'s properties\nexport function _forOwn(target, body, check) {\n\tvar keys = [];\n\tfor (var key in target) {\n\t\tif (Object.prototype.hasOwnProperty.call(target, key)) {\n\t\t\tkeys.push(key);\n\t\t}\n\t}\n\treturn _forTo(keys, function(i) { return body(keys[i]); }, check);\n}\n\nexport const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.iterator || (Symbol.iterator = Symbol("Symbol.iterator"))) : "@@iterator";\n\n// Asynchronously iterate through an object\'s values\n// Uses for...of if the runtime supports it, otherwise iterates until length on a copy\nexport function _forOf(target, body, check) {\n\tif (typeof target[_iteratorSymbol] === "function") {\n\t\tvar iterator = target[_iteratorSymbol](), step, pact, reject;\n\t\tfunction _cycle(result) {\n\t\t\ttry {\n\t\t\t\twhile (!(step = iterator.next()).done && (!check || !check())) {\n\t\t\t\t\tresult = body(step.value);\n\t\t\t\t\tif (result && result.then) {\n\t\t\t\t\t\tif (_isSettledPact(result)) {\n\t\t\t\t\t\t\tresult = result.v;\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tresult.then(_cycle, reject || (reject = _settle.bind(null, pact = new _Pact(), 2)));\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (pact) {\n\t\t\t\t\t_settle(pact, 1, result);\n\t\t\t\t} else {\n\t\t\t\t\tpact = result;\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\t_settle(pact || (pact = new _Pact()), 2, e);\n\t\t\t}\n\t\t}\n\t\t_cycle();\n\t\tif (iterator.return) {\n\t\t\tvar _fixup = function(value) {\n\t\t\t\ttry {\n\t\t\t\t\tif (!step.done) {\n\t\t\t\t\t\titerator.return();\n\t\t\t\t\t}\n\t\t\t\t} catch(e) {\n\t\t\t\t}\n\t\t\t\treturn value;\n\t\t\t}\n\t\t\tif (pact && pact.then) {\n\t\t\t\treturn pact.then(_fixup, function(e) {\n\t\t\t\t\tthrow _fixup(e);\n\t\t\t\t});\n\t\t\t}\n\t\t\t_fixup();\n\t\t}\n\t\treturn pact;\n\t}\n\t// No support for Symbol.iterator\n\tif (!("length" in target)) {\n\t\tthrow new TypeError("Object is not iterable");\n\t}\n\t// Handle live collections properly\n\tvar values = [];\n\tfor (var i = 0; i < target.length; i++) {\n\t\tvalues.push(target[i]);\n\t}\n\treturn _forTo(values, function(i) { return body(values[i]); }, check);\n}\n\nexport const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";\n\n// Asynchronously iterate on a value using it\'s async iterator if present, or its synchronous iterator if missing\nexport function _forAwaitOf(target, body, check) {\n\tif (typeof target[_asyncIteratorSymbol] === "function") {\n\t\tvar pact = new _Pact();\n\t\tvar iterator = target[_asyncIteratorSymbol]();\n\t\titerator.next().then(_resumeAfterNext).then(void 0, _reject);\n\t\treturn pact;\n\t\tfunction _resumeAfterBody(result) {\n\t\t\tif (check && check()) {\n\t\t\t\treturn _settle(pact, 1, iterator.return ? iterator.return().then(function() { return result; }) : result);\n\t\t\t}\n\t\t\titerator.next().then(_resumeAfterNext).then(void 0, _reject);\n\t\t}\n\t\tfunction _resumeAfterNext(step) {\n\t\t\tif (step.done) {\n\t\t\t\t_settle(pact, 1);\n\t\t\t} else {\n\t\t\t\tPromise.resolve(body(step.value)).then(_resumeAfterBody).then(void 0, _reject);\n\t\t\t}\n\t\t}\n\t\tfunction _reject(error) {\n\t\t\t_settle(pact, 2, iterator.return ? iterator.return().then(function() { return error; }) : error);\n\t\t}\n\t}\n\treturn Promise.resolve(_forOf(target, function(value) { return Promise.resolve(value).then(body); }, check));\n}\n\n// Asynchronously implement a generic for loop\nexport function _for(test, update, body) {\n\tvar stage;\n\tfor (;;) {\n\t\tvar shouldContinue = test();\n\t\tif (_isSettledPact(shouldContinue)) {\n\t\t\tshouldContinue = shouldContinue.v;\n\t\t}\n\t\tif (!shouldContinue) {\n\t\t\treturn result;\n\t\t}\n\t\tif (shouldContinue.then) {\n\t\t\tstage = 0;\n\t\t\tbreak;\n\t\t}\n\t\tvar result = body();\n\t\tif (result && result.then) {\n\t\t\tif (_isSettledPact(result)) {\n\t\t\t\tresult = result.s;\n\t\t\t} else {\n\t\t\t\tstage = 1;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\tif (update) {\n\t\t\tvar updateValue = update();\n\t\t\tif (updateValue && updateValue.then && !_isSettledPact(updateValue)) {\n\t\t\t\tstage = 2;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\tvar pact = new _Pact();\n\tvar reject = _settle.bind(null, pact, 2);\n\t(stage === 0 ? shouldContinue.then(_resumeAfterTest) : stage === 1 ? result.then(_resumeAfterBody) : updateValue.then(_resumeAfterUpdate)).then(void 0, reject);\n\treturn pact;\n\tfunction _resumeAfterBody(value) {\n\t\tresult = value;\n\t\tdo {\n\t\t\tif (update) {\n\t\t\t\tupdateValue = update();\n\t\t\t\tif (updateValue && updateValue.then && !_isSettledPact(updateValue)) {\n\t\t\t\t\tupdateValue.then(_resumeAfterUpdate).then(void 0, reject);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t}\n\t\t\tshouldContinue = test();\n\t\t\tif (!shouldContinue || (_isSettledPact(shouldContinue) && !shouldContinue.v)) {\n\t\t\t\t_settle(pact, 1, result);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tif (shouldContinue.then) {\n\t\t\t\tshouldContinue.then(_resumeAfterTest).then(void 0, reject);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tresult = body();\n\t\t\tif (_isSettledPact(result)) {\n\t\t\t\tresult = result.v;\n\t\t\t}\n\t\t} while (!result || !result.then);\n\t\tresult.then(_resumeAfterBody).then(void 0, reject);\n\t}\n\tfunction _resumeAfterTest(shouldContinue) {\n\t\tif (shouldContinue) {\n\t\t\tresult = body();\n\t\t\tif (result && result.then) {\n\t\t\t\tresult.then(_resumeAfterBody).then(void 0, reject);\n\t\t\t} else {\n\t\t\t\t_resumeAfterBody(result);\n\t\t\t}\n\t\t} else {\n\t\t\t_settle(pact, 1, result);\n\t\t}\n\t}\n\tfunction _resumeAfterUpdate() {\n\t\tif (shouldContinue = test()) {\n\t\t\tif (shouldContinue.then) {\n\t\t\t\tshouldContinue.then(_resumeAfterTest).then(void 0, reject);\n\t\t\t} else {\n\t\t\t\t_resumeAfterTest(shouldContinue);\n\t\t\t}\n\t\t} else {\n\t\t\t_settle(pact, 1, result);\n\t\t}\n\t}\n}\n\n// Asynchronously implement a do ... while loop\nexport function _do(body, test) {\n\tvar awaitBody;\n\tdo {\n\t\tvar result = body();\n\t\tif (result && result.then) {\n\t\t\tif (_isSettledPact(result)) {\n\t\t\t\tresult = result.v;\n\t\t\t} else {\n\t\t\t\tawaitBody = true;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t\tvar shouldContinue = test();\n\t\tif (_isSettledPact(shouldContinue)) {\n\t\t\tshouldContinue = shouldContinue.v;\n\t\t}\n\t\tif (!shouldContinue) {\n\t\t\treturn result;\n\t\t}\n\t} while (!shouldContinue.then);\n\tconst pact = new _Pact();\n\tconst reject = _settle.bind(null, pact, 2);\n\t(awaitBody ? result.then(_resumeAfterBody) : shouldContinue.then(_resumeAfterTest)).then(void 0, reject);\n\treturn pact;\n\tfunction _resumeAfterBody(value) {\n\t\tresult = value;\n\t\tfor (;;) {\n\t\t\tshouldContinue = test();\n\t\t\tif (_isSettledPact(shouldContinue)) {\n\t\t\t\tshouldContinue = shouldContinue.v;\n\t\t\t}\n\t\t\tif (!shouldContinue) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (shouldContinue.then) {\n\t\t\t\tshouldContinue.then(_resumeAfterTest).then(void 0, reject);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tresult = body();\n\t\t\tif (result && result.then) {\n\t\t\t\tif (_isSettledPact(result)) {\n\t\t\t\t\tresult = result.v;\n\t\t\t\t} else {\n\t\t\t\t\tresult.then(_resumeAfterBody).then(void 0, reject);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\t_settle(pact, 1, result);\n\t}\n\tfunction _resumeAfterTest(shouldContinue) {\n\t\tif (shouldContinue) {\n\t\t\tdo {\n\t\t\t\tresult = body();\n\t\t\t\tif (result && result.then) {\n\t\t\t\t\tif (_isSettledPact(result)) {\n\t\t\t\t\t\tresult = result.v;\n\t\t\t\t\t} else {\n\t\t\t\t\t\tresult.then(_resumeAfterBody).then(void 0, reject);\n\t\t\t\t\t\treturn;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tshouldContinue = test();\n\t\t\t\tif (_isSettledPact(shouldContinue)) {\n\t\t\t\t\tshouldContinue = shouldContinue.v;\n\t\t\t\t}\n\t\t\t\tif (!shouldContinue) {\n\t\t\t\t\t_settle(pact, 1, result);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t} while (!shouldContinue.then);\n\t\t\tshouldContinue.then(_resumeAfterTest).then(void 0, reject);\n\t\t} else {\n\t\t\t_settle(pact, 1, result);\n\t\t}\n\t}\n}\n\n// Asynchronously implement a switch statement\nexport function _switch(discriminant, cases) {\n\tvar dispatchIndex = -1;\n\tvar awaitBody;\n\touter: {\n\t\tfor (var i = 0; i < cases.length; i++) {\n\t\t\tvar test = cases[i][0];\n\t\t\tif (test) {\n\t\t\t\tvar testValue = test();\n\t\t\t\tif (testValue && testValue.then) {\n\t\t\t\t\tbreak outer;\n\t\t\t\t}\n\t\t\t\tif (testValue === discriminant) {\n\t\t\t\t\tdispatchIndex = i;\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\t// Found the default case, set it as the pending dispatch case\n\t\t\t\tdispatchIndex = i;\n\t\t\t}\n\t\t}\n\t\tif (dispatchIndex !== -1) {\n\t\t\tdo {\n\t\t\t\tvar body = cases[dispatchIndex][1];\n\t\t\t\twhile (!body) {\n\t\t\t\t\tdispatchIndex++;\n\t\t\t\t\tbody = cases[dispatchIndex][1];\n\t\t\t\t}\n\t\t\t\tvar result = body();\n\t\t\t\tif (result && result.then) {\n\t\t\t\t\tawaitBody = true;\n\t\t\t\t\tbreak outer;\n\t\t\t\t}\n\t\t\t\tvar fallthroughCheck = cases[dispatchIndex][2];\n\t\t\t\tdispatchIndex++;\n\t\t\t} while (fallthroughCheck && !fallthroughCheck());\n\t\t\treturn result;\n\t\t}\n\t}\n\tconst pact = new _Pact();\n\tconst reject = _settle.bind(null, pact, 2);\n\t(awaitBody ? result.then(_resumeAfterBody) : testValue.then(_resumeAfterTest)).then(void 0, reject);\n\treturn pact;\n\tfunction _resumeAfterTest(value) {\n\t\tfor (;;) {\n\t\t\tif (value === discriminant) {\n\t\t\t\tdispatchIndex = i;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (++i === cases.length) {\n\t\t\t\tif (dispatchIndex !== -1) {\n\t\t\t\t\tbreak;\n\t\t\t\t} else {\n\t\t\t\t\t_settle(pact, 1, result);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t}\n\t\t\ttest = cases[i][0];\n\t\t\tif (test) {\n\t\t\t\tvalue = test();\n\t\t\t\tif (value && value.then) {\n\t\t\t\t\tvalue.then(_resumeAfterTest).then(void 0, reject);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tdispatchIndex = i;\n\t\t\t}\n\t\t}\n\t\tdo {\n\t\t\tvar body = cases[dispatchIndex][1];\n\t\t\twhile (!body) {\n\t\t\t\tdispatchIndex++;\n\t\t\t\tbody = cases[dispatchIndex][1];\n\t\t\t}\n\t\t\tvar result = body();\n\t\t\tif (result && result.then) {\n\t\t\t\tresult.then(_resumeAfterBody).then(void 0, reject);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tvar fallthroughCheck = cases[dispatchIndex][2];\n\t\t\tdispatchIndex++;\n\t\t} while (fallthroughCheck && !fallthroughCheck());\n\t\t_settle(pact, 1, result);\n\t}\n\tfunction _resumeAfterBody(result) {\n\t\tfor (;;) {\n\t\t\tvar fallthroughCheck = cases[dispatchIndex][2];\n\t\t\tif (!fallthroughCheck || fallthroughCheck()) {\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tdispatchIndex++;\n\t\t\tvar body = cases[dispatchIndex][1];\n\t\t\twhile (!body) {\n\t\t\t\tdispatchIndex++;\n\t\t\t\tbody = cases[dispatchIndex][1];\n\t\t\t}\n\t\t\tresult = body();\n\t\t\tif (result && result.then) {\n\t\t\t\tresult.then(_resumeAfterBody).then(void 0, reject);\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\t_settle(pact, 1, result);\n\t}\n}\n\n// Asynchronously call a function and pass the result to explicitly passed continuations\nexport function _call(body, then, direct) {\n\tif (direct) {\n\t\treturn then ? then(body()) : body();\n\t}\n\ttry {\n\t\tvar result = Promise.resolve(body());\n\t\treturn then ? result.then(then) : result;\n\t} catch (e) {\n\t\treturn Promise.reject(e);\n\t}\n}\n\n// Asynchronously call a function and swallow the result\nexport function _callIgnored(body, direct) {\n\treturn _call(body, _empty, direct);\n}\n\n// Asynchronously call a function and pass the result to explicitly passed continuations\nexport function _invoke(body, then) {\n\tvar result = body();\n\tif (result && result.then) {\n\t\treturn result.then(then);\n\t}\n\treturn then(result);\n}\n\n// Asynchronously call a function and swallow the result\nexport function _invokeIgnored(body) {\n\tvar result = body();\n\tif (result && result.then) {\n\t\treturn result.then(_empty);\n\t}\n}\n\n// Asynchronously call a function and send errors to recovery continuation\nexport function _catch(body, recover) {\n\ttry {\n\t\tvar result = body();\n\t} catch(e) {\n\t\treturn recover(e);\n\t}\n\tif (result && result.then) {\n\t\treturn result.then(void 0, recover);\n\t}\n\treturn result;\n}\n\n// Asynchronously await a promise and pass the result to a finally continuation\nexport function _finallyRethrows(body, finalizer) {\n\ttry {\n\t\tvar result = body();\n\t} catch (e) {\n\t\treturn finalizer(true, e);\n\t}\n\tif (result && result.then) {\n\t\treturn result.then(finalizer.bind(null, false), finalizer.bind(null, true));\n\t}\n\treturn finalizer(false, result);\n}\n\n// Asynchronously await a promise and invoke a finally continuation that always overrides the result\nexport function _finally(body, finalizer) {\n\ttry {\n\t\tvar result = body();\n\t} catch (e) {\n\t\treturn finalizer();\n\t}\n\tif (result && result.then) {\n\t\treturn result.then(finalizer, finalizer);\n\t}\n\treturn finalizer();\n}\n\n// Rethrow or return a value from a finally continuation\nexport function _rethrow(thrown, value) {\n\tif (thrown)\n\t\tthrow value;\n\treturn value;\n}\n\n// Empty function to implement break and other control flow that ignores asynchronous results\nexport function _empty() {\n}\n\n// Sentinel value for early returns in generators \nexport const _earlyReturn = /*#__PURE__*/ {};\n\n// Asynchronously call a function and send errors to recovery continuation, skipping early returns\nexport function _catchInGenerator(body, recover) {\n\treturn _catch(body, function(e) {\n\t\tif (e === _earlyReturn) {\n\t\t\tthrow e;\n\t\t}\n\t\treturn recover(e);\n\t});\n}\n\n// Asynchronous generator class; accepts the entrypoint of the generator, to which it passes itself when the generator should start\nexport const _AsyncGenerator = /*#__PURE__*/(function() {\n\tfunction _AsyncGenerator(entry) {\n\t\tthis._entry = entry;\n\t\tthis._pact = null;\n\t\tthis._resolve = null;\n\t\tthis._return = null;\n\t\tthis._promise = null;\n\t}\n\n\tfunction _wrapReturnedValue(value) {\n\t\treturn { value: value, done: true };\n\t}\n\tfunction _wrapYieldedValue(value) {\n\t\treturn { value: value, done: false };\n\t}\n\n\t_AsyncGenerator.prototype._yield = function(value) {\n\t\t// Yield the value to the pending next call\n\t\tthis._resolve(value && value.then ? value.then(_wrapYieldedValue) : _wrapYieldedValue(value));\n\t\t// Return a pact for an upcoming next/return/throw call\n\t\treturn this._pact = new _Pact();\n\t};\n\t_AsyncGenerator.prototype.next = function(value) {\n\t\t// Advance the generator, starting it if it has yet to be started\n\t\tconst _this = this;\n\t\treturn _this._promise = new Promise(function (resolve) {\n\t\t\tconst _pact = _this._pact;\n\t\t\tif (_pact === null) {\n\t\t\t\tconst _entry = _this._entry;\n\t\t\t\tif (_entry === null) {\n\t\t\t\t\t// Generator is started, but not awaiting a yield expression\n\t\t\t\t\t// Abandon the next call!\n\t\t\t\t\treturn resolve(_this._promise);\n\t\t\t\t}\n\t\t\t\t// Start the generator\n\t\t\t\t_this._entry = null;\n\t\t\t\t_this._resolve = resolve;\n\t\t\t\tfunction returnValue(value) {\n\t\t\t\t\t_this._resolve(value && value.then ? value.then(_wrapReturnedValue) : _wrapReturnedValue(value));\n\t\t\t\t\t_this._pact = null;\n\t\t\t\t\t_this._resolve = null;\n\t\t\t\t}\n\t\t\t\tvar result = _entry(_this);\n\t\t\t\tif (result && result.then) {\n\t\t\t\t\tresult.then(returnValue, function(error) {\n\t\t\t\t\t\tif (error === _earlyReturn) {\n\t\t\t\t\t\t\treturnValue(_this._return);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tconst pact = new _Pact();\n\t\t\t\t\t\t\t_this._resolve(pact);\n\t\t\t\t\t\t\t_this._pact = null;\n\t\t\t\t\t\t\t_this._resolve = null;\n\t\t\t\t\t\t\t_resolve(pact, 2, error);\n\t\t\t\t\t\t}\n\t\t\t\t\t});\n\t\t\t\t} else {\n\t\t\t\t\treturnValue(result);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\t// Generator is started and a yield expression is pending, settle it\n\t\t\t\t_this._pact = null;\n\t\t\t\t_this._resolve = resolve;\n\t\t\t\t_settle(_pact, 1, value);\n\t\t\t}\n\t\t});\n\t};\n\t_AsyncGenerator.prototype.return = function(value) {\n\t\t// Early return from the generator if started, otherwise abandons the generator\n\t\tconst _this = this;\n\t\treturn _this._promise = new Promise(function (resolve) {\n\t\t\tconst _pact = _this._pact;\n\t\t\tif (_pact === null) {\n\t\t\t\tif (_this._entry === null) {\n\t\t\t\t\t// Generator is started, but not awaiting a yield expression\n\t\t\t\t\t// Abandon the return call!\n\t\t\t\t\treturn resolve(_this._promise);\n\t\t\t\t}\n\t\t\t\t// Generator is not started, abandon it and return the specified value\n\t\t\t\t_this._entry = null;\n\t\t\t\treturn resolve(value && value.then ? value.then(_wrapReturnedValue) : _wrapReturnedValue(value));\n\t\t\t}\n\t\t\t// Settle the yield expression with a rejected "early return" value\n\t\t\t_this._return = value;\n\t\t\t_this._resolve = resolve;\n\t\t\t_this._pact = null;\n\t\t\t_settle(_pact, 2, _earlyReturn);\n\t\t});\n\t};\n\t_AsyncGenerator.prototype.throw = function(error) {\n\t\t// Inject an exception into the pending yield expression\n\t\tconst _this = this;\n\t\treturn _this._promise = new Promise(function (resolve, reject) {\n\t\t\tconst _pact = _this._pact;\n\t\t\tif (_pact === null) {\n\t\t\t\tif (_this._entry === null) {\n\t\t\t\t\t// Generator is started, but not awaiting a yield expression\n\t\t\t\t\t// Abandon the throw call!\n\t\t\t\t\treturn resolve(_this._promise);\n\t\t\t\t}\n\t\t\t\t// Generator is not started, abandon it and return a rejected Promise containing the error\n\t\t\t\t_this._entry = null;\n\t\t\t\treturn reject(error);\n\t\t\t}\n\t\t\t// Settle the yield expression with the value as a rejection\n\t\t\t_this._resolve = resolve;\n\t\t\t_this._pact = null;\n\t\t\t_settle(_pact, 2, error);\n\t\t});\n\t};\n\n\t_AsyncGenerator.prototype[_asyncIteratorSymbol] = function() {\n\t\treturn this;\n\t};\n\t\n\treturn _AsyncGenerator;\n})();\n';
 
@@ -16371,7 +16468,7 @@ const convertJsModuleToJsClassic = async ({
       asyncAwait: false,
       // already handled + we might not needs it at all
       topLevelAwait: "simple"
-    }], babelPluginTransformImportMetaUrl, requireFromJsenv("@babel/plugin-transform-modules-umd")])],
+    }], babelPluginTransformImportMetaUrl, babelPluginTransformImportMetaResolve, requireFromJsenv("@babel/plugin-transform-modules-umd")])],
     urlInfo: jsModuleUrlInfo
   });
   let sourcemap = jsModuleUrlInfo.sourcemap;
@@ -16418,10 +16515,10 @@ const jsenvPluginAsJsClassicConversion = ({
   generateJsClassicFilename
 }) => {
   const isReferencingJsModule = reference => {
-    if (reference.type === "js_import_export" || reference.subtype === "system_register_arg" || reference.subtype === "system_import_arg") {
+    if (reference.type === "js_import" || reference.subtype === "system_register_arg" || reference.subtype === "system_import_arg") {
       return true;
     }
-    if (reference.type === "js_url_specifier" && reference.expectedType === "js_module") {
+    if (reference.type === "js_url" && reference.expectedType === "js_module") {
       return true;
     }
     return false;
@@ -16483,14 +16580,14 @@ const jsenvPluginAsJsClassicConversion = ({
       await context.fetchUrlContent(jsModuleUrlInfo, {
         reference: jsModuleReference
       });
-      if (context.scenarios.dev) {
+      if (context.dev) {
         context.referenceUtils.found({
-          type: "js_import_export",
+          type: "js_import",
           subtype: jsModuleReference.subtype,
           specifier: jsModuleReference.url,
           expectedType: "js_module"
         });
-      } else if (context.scenarios.build && jsModuleUrlInfo.dependents.size === 0) {
+      } else if (context.build && jsModuleUrlInfo.dependents.size === 0) {
         context.urlGraph.deleteUrlInfo(jsModuleUrlInfo.url);
       }
       const {
@@ -16554,7 +16651,7 @@ const jsenvPluginAsJsClassicHtml = ({
         }
         return null;
       },
-      js_url_specifier: reference => {
+      js_url: reference => {
         if (shouldTransformScriptTypeModule && reference.expectedType === "js_module") {
           return turnIntoJsClassicProxy(reference);
         }
@@ -16646,7 +16743,7 @@ const jsenvPluginAsJsClassicHtml = ({
                   break;
                 }
               } catch (e) {
-                if (context.scenarios.dev) {
+                if (context.dev) {
                   needsSystemJs = true;
                   // ignore cooking error, the browser will trigger it again on fetch
                   // + disable cache for this html file because when browser will reload
@@ -16744,7 +16841,7 @@ const jsenvPluginAsJsClassicWorkers = () => {
     name: "jsenv:as_js_classic_workers",
     appliesDuring: "*",
     redirectUrl: {
-      js_url_specifier: (reference, context) => {
+      js_url: (reference, context) => {
         if (reference.expectedType !== "js_module") {
           return null;
         }
@@ -17084,7 +17181,7 @@ const rollupPluginJsenv = ({
       const urlInfo = urlGraph.getUrlInfo(fileUrl);
       return {
         code: urlInfo.content,
-        map: urlInfo.sourcemap ? sourcemapConverter.toFilePaths(urlInfo.sourcemap) : null
+        map: (sourcemaps === "file" || sourcemaps === "inline") && urlInfo.sourcemap ? sourcemapConverter.toFilePaths(urlInfo.sourcemap) : null
       };
     }
   };
@@ -17252,15 +17349,15 @@ const jsenvPluginAsJsClassicLibrary = ({
         }
       });
       const jsModuleBundledUrlInfo = bundleUrlInfos[jsModuleUrlInfo.url];
-      if (context.scenarios.dev) {
+      if (context.dev) {
         jsModuleBundledUrlInfo.sourceUrls.forEach(sourceUrl => {
           context.referenceUtils.inject({
-            type: "js_url_specifier",
+            type: "js_url",
             specifier: sourceUrl,
             isImplicit: true
           });
         });
-      } else if (context.scenarios.build) {
+      } else if (context.build) {
         jsModuleBundledUrlInfo.sourceUrls.forEach(sourceUrl => {
           const sourceUrlInfo = context.urlGraph.getUrlInfo(sourceUrl);
           if (sourceUrlInfo && sourceUrlInfo.dependents.size === 0) {
@@ -17971,7 +18068,7 @@ const jsenvPluginImportmap = () => {
     name: "jsenv:importmap",
     appliesDuring: "*",
     resolveUrl: {
-      js_import_export: reference => {
+      js_import: reference => {
         if (!finalImportmap) {
           return null;
         }
@@ -18113,7 +18210,7 @@ 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.scenarios.build) {
+        if (context.build) {
           removeHtmlNode(importmap);
         }
         return {
@@ -19088,7 +19185,7 @@ const createNodeEsmResolver = ({
       parentUrl,
       specifier: reference.specifier
     });
-    if (context.scenarios.dev) {
+    if (context.dev) {
       const dependsOnPackageJson = type !== "relative_specifier" && type !== "absolute_specifier" && type !== "node_builtin_specifier";
       if (dependsOnPackageJson) {
         // this reference depends on package.json and node_modules
@@ -19102,7 +19199,7 @@ const createNodeEsmResolver = ({
         });
       }
     }
-    if (context.scenarios.dev) {
+    if (context.dev) {
       // without this check a file inside a project without package.json
       // could be considered as a node module if there is a ancestor package.json
       // but we want to version only node modules
@@ -19161,7 +19258,6 @@ const addRelationshipWithPackageJson = ({
  * and the rest uses the web standard url resolution (new URL):
  * - "http_request"
  * - "entry_point"
- * - "js_import_export"
  * - "link_href"
  * - "script_src"
  * - "a_href"
@@ -19174,9 +19270,10 @@ const addRelationshipWithPackageJson = ({
  * - "use_href"
  * - "css_@import"
  * - "css_url"
- * - "sourcemap_comment"
- * - "js_url_specifier"
+ * - "js_import"
+ * - "js_url"
  * - "js_inline_content"
+ * - "sourcemap_comment"
  * - "webmanifest_icon_src"
  * - "package_json"
  */
@@ -19764,7 +19861,7 @@ const jsenvPluginSupervisor = ({
           }
         });
         const [scriptTypeModuleSupervisorFileReference] = context.referenceUtils.inject({
-          type: "js_import_export",
+          type: "js_import",
           expectedType: "js_module",
           specifier: scriptTypeModuleSupervisorFileUrl
         });
@@ -19854,7 +19951,7 @@ const jsenvPluginCommonJsGlobals = () => {
     }
     const isJsModule = urlInfo.type === "js_module";
     const replaceMap = {
-      "process.env.NODE_ENV": `("${context.scenarios.dev ? "development" : "production"}")`,
+      "process.env.NODE_ENV": `("${context.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`
@@ -20024,7 +20121,7 @@ const jsenvPluginImportMetaScenarios = () => {
             value
           });
         };
-        if (context.scenarios.build) {
+        if (context.build) {
           // during build ensure replacement for tree-shaking
           dev.forEach(path => {
             replace(path, "undefined");
@@ -20180,14 +20277,14 @@ 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.scenarios.build) {
+      if (context.build) {
         transpilations.json = true;
         transpilations.css = true;
         transpilations.text = true;
       }
     },
     redirectUrl: {
-      js_import_export: (reference, context) => {
+      js_import: (reference, context) => {
         if (!reference.assert) {
           return null;
         }
@@ -20226,14 +20323,14 @@ const jsenvPluginAsModules = () => {
       await context.fetchUrlContent(jsonUrlInfo, {
         reference: jsonReference
       });
-      if (context.scenarios.dev) {
+      if (context.dev) {
         context.referenceUtils.found({
-          type: "js_import_export",
+          type: "js_import",
           subtype: jsonReference.subtype,
           specifier: jsonReference.url,
           expectedType: "js_module"
         });
-      } else if (context.scenarios.build && jsonUrlInfo.dependents.size === 0) {
+      } else if (context.build && jsonUrlInfo.dependents.size === 0) {
         context.urlGraph.deleteUrlInfo(jsonUrlInfo.url);
       }
       const jsonText = JSON.stringify(jsonUrlInfo.content.trim());
@@ -20266,14 +20363,14 @@ const jsenvPluginAsModules = () => {
       await context.fetchUrlContent(cssUrlInfo, {
         reference: cssReference
       });
-      if (context.scenarios.dev) {
+      if (context.dev) {
         context.referenceUtils.found({
-          type: "js_import_export",
+          type: "js_import",
           subtype: cssReference.subtype,
           specifier: cssReference.url,
           expectedType: "js_module"
         });
-      } else if (context.scenarios.build && cssUrlInfo.dependents.size === 0) {
+      } else if (context.build && cssUrlInfo.dependents.size === 0) {
         context.urlGraph.deleteUrlInfo(cssUrlInfo.url);
       }
       const cssText = JS_QUOTES.escapeSpecialChars(cssUrlInfo.content, {
@@ -20313,14 +20410,14 @@ const jsenvPluginAsModules = () => {
       await context.fetchUrlContent(textUrlInfo, {
         reference: textReference
       });
-      if (context.scenarios.dev) {
+      if (context.dev) {
         context.referenceUtils.found({
-          type: "js_import_export",
+          type: "js_import",
           subtype: textReference.subtype,
           specifier: textReference.url,
           expectedType: "js_module"
         });
-      } else if (context.scenarios.build && textUrlInfo.dependents.size === 0) {
+      } else if (context.build && textUrlInfo.dependents.size === 0) {
         context.urlGraph.deleteUrlInfo(textUrlInfo.url);
       }
       const textPlain = JS_QUOTES.escapeSpecialChars(urlInfo.content, {
@@ -20345,6 +20442,121 @@ export default inlineContent.text`,
   return [asJsonModule, asCssModule, asTextModule];
 };
 
+const convertJsClassicToJsModule = async ({
+  urlInfo,
+  jsClassicUrlInfo
+}) => {
+  const {
+    code,
+    map
+  } = await applyBabelPlugins({
+    babelPlugins: [[babelPluginReplaceTopLevelThis, {
+      isWebWorker: isWebWorkerUrlInfo(urlInfo)
+    }]],
+    urlInfo: jsClassicUrlInfo
+  });
+  const sourcemap = await composeTwoSourcemaps(jsClassicUrlInfo.sourcemap, map);
+  return {
+    content: code,
+    sourcemap
+  };
+};
+const babelPluginReplaceTopLevelThis = () => {
+  return {
+    name: "replace-top-level-this",
+    visitor: {
+      Program: (programPath, state) => {
+        const {
+          isWebWorker
+        } = state.opts;
+        programPath.traverse({
+          ThisExpression: path => {
+            const closestFunction = path.getFunctionParent();
+            if (!closestFunction) {
+              path.replaceWithSourceString(isWebWorker ? "self" : "window");
+            }
+          }
+        });
+      }
+    }
+  };
+};
+
+/*
+ * Js modules might not be able to import js meant to be loaded by <script>
+ * Among other things this happens for a top level this:
+ * - With <script> this is window
+ * - With an import this is undefined
+ * Example of this: https://github.com/video-dev/hls.js/issues/2911
+ *
+ * This plugin fix this issue by rewriting top level this into window
+ * and can be used like this for instance import("hls?as_js_module")
+ */
+const jsenvPluginAsJsModule = () => {
+  return {
+    name: "jsenv:as_js_module",
+    appliesDuring: "*",
+    redirectUrl: reference => {
+      if (reference.searchParams.has("as_js_module")) {
+        reference.expectedType = "js_module";
+        const filename = urlToFilename$1(reference.url);
+        const [basename] = splitFileExtension$1(filename);
+        reference.filename = `${basename}.mjs`;
+      }
+    },
+    fetchUrlContent: async (urlInfo, context) => {
+      const [jsClassicReference, jsClassicUrlInfo] = context.getWithoutSearchParam({
+        urlInfo,
+        context,
+        searchParam: "as_js_module",
+        // override the expectedType to "js_classic"
+        // because when there is ?as_js_module it means the underlying resource
+        // is js_classic
+        expectedType: "js_classic"
+      });
+      if (!jsClassicReference) {
+        return null;
+      }
+      await context.fetchUrlContent(jsClassicUrlInfo, {
+        reference: jsClassicReference
+      });
+      if (context.dev) {
+        context.referenceUtils.found({
+          type: "js_import",
+          subtype: jsClassicReference.subtype,
+          specifier: jsClassicReference.url,
+          expectedType: "js_classic"
+        });
+      } else if (context.build && jsClassicUrlInfo.dependents.size === 0) {
+        context.urlGraph.deleteUrlInfo(jsClassicUrlInfo.url);
+      }
+      const {
+        content,
+        sourcemap
+      } = await convertJsClassicToJsModule({
+        urlInfo,
+        jsClassicUrlInfo
+      });
+      return {
+        content,
+        contentType: "text/javascript",
+        type: "js_module",
+        originalUrl: jsClassicUrlInfo.originalUrl,
+        originalContent: jsClassicUrlInfo.originalContent,
+        sourcemap,
+        data: jsClassicUrlInfo.data
+      };
+    }
+  };
+};
+const splitFileExtension$1 = filename => {
+  const dotLastIndex = filename.lastIndexOf(".");
+  if (dotLastIndex === -1) {
+    return [filename, ""];
+  }
+  return [filename.slice(0, dotLastIndex), filename.slice(dotLastIndex)];
+};
+
 // https://github.com/istanbuljs/babel-plugin-istanbul/blob/321740f7b25d803f881466ea819d870f7ed6a254/src/index.js
 
 const babelPluginInstrument = (api, {
@@ -21166,7 +21378,7 @@ const jsenvPluginBabel = ({
     const isSupported = feature => RUNTIME_COMPAT.isSupported(context.clientRuntimeCompat, feature);
     const getImportSpecifier = clientFileUrl => {
       const [reference] = context.referenceUtils.inject({
-        type: "js_import_export",
+        type: "js_import",
         expectedType: "js_module",
         specifier: clientFileUrl
       });
@@ -21178,7 +21390,7 @@ const jsenvPluginBabel = ({
       isJsModule,
       getImportSpecifier
     });
-    if (context.scenarios.dev) {
+    if (context.dev) {
       const requestHeaders = context.request.headers;
       if (requestHeaders["x-coverage-instanbul"]) {
         const coverageConfig = JSON.parse(requestHeaders["x-coverage-instanbul"]);
@@ -21248,16 +21460,19 @@ const jsenvPluginTopLevelAwait = () => {
   return {
     name: "jsenv:top_level_await",
     appliesDuring: "*",
+    init: context => {
+      if (context.isSupportedOnCurrentClients("top_level_await")) {
+        return false;
+      }
+      // keep it untouched, systemjs will handle it
+      const willTransformJsModules = !context.isSupportedOnCurrentClients("script_type_module") || !context.isSupportedOnCurrentClients("import_dynamic") || !context.isSupportedOnCurrentClients("import_meta");
+      if (willTransformJsModules) {
+        return false;
+      }
+      return true;
+    },
     transformUrlContent: {
-      js_module: async (urlInfo, context) => {
-        if (context.isSupportedOnCurrentClients("top_level_await")) {
-          return null;
-        }
-        const willTransformJsModules = !context.isSupportedOnCurrentClients("script_type_module") || !context.isSupportedOnCurrentClients("import_dynamic") || !context.isSupportedOnCurrentClients("import_meta");
-        // keep it untouched, systemjs will handle it
-        if (willTransformJsModules) {
-          return null;
-        }
+      js_module: async urlInfo => {
         const usesTLA = await usesTopLevelAwait(urlInfo);
         if (!usesTLA) {
           return null;
@@ -21275,7 +21490,7 @@ const jsenvPluginTopLevelAwait = () => {
             // externalHelpers: true,
             // externalHelpersPath: JSON.parse(
             //   context.referenceUtils.inject({
-            //     type: "js_import_export",
+            //     type: "js_import",
             //     expectedType: "js_module",
             //     specifier:
             //       "babel-plugin-transform-async-to-promises/helpers.mjs",
@@ -21325,6 +21540,51 @@ const babelPluginMetadataUsesTopLevelAwait = () => {
   };
 };
 
+const jsenvPluginImportMetaResolve = () => {
+  return {
+    name: "jsenv:import_meta_resolve",
+    appliesDuring: "*",
+    init: context => {
+      if (context.isSupportedOnCurrentClients("import_meta_resolve")) {
+        return false;
+      }
+      const willTransformJsModules = !context.isSupportedOnCurrentClients("script_type_module") || !context.isSupportedOnCurrentClients("import_dynamic") || !context.isSupportedOnCurrentClients("import_meta");
+      // keep it untouched, systemjs will handle it
+      if (willTransformJsModules) {
+        return false;
+      }
+      return true;
+    },
+    transformUrlContent: {
+      js_module: async (urlInfo, context) => {
+        const magicSource = createMagicSource(urlInfo.content);
+        context.referenceUtils._references.forEach(ref => {
+          if (ref.subtype === "import_meta_resolve") {
+            const originalSpecifierLength = Buffer.byteLength(ref.specifier);
+            const specifierLength = Buffer.byteLength(ref.generatedSpecifier.slice(1, -1) // remove `"` around
+            );
+
+            const specifierLengthDiff = specifierLength - originalSpecifierLength;
+            const end = ref.node.end + specifierLengthDiff;
+            magicSource.replace({
+              start: ref.node.start,
+              end,
+              replacement: `new URL(${ref.generatedSpecifier}, import.meta.url).href`
+            });
+            const currentLengthBeforeSpecifier = "import.meta.resolve(".length;
+            const newLengthBeforeSpecifier = "new URL(".length;
+            const lengthDiff = currentLengthBeforeSpecifier - newLengthBeforeSpecifier;
+            ref.specifierColumn -= lengthDiff;
+            ref.specifierStart -= lengthDiff;
+            ref.specifierEnd = ref.specifierStart + Buffer.byteLength(ref.generatedSpecifier);
+          }
+        });
+        return magicSource.toContentAndSourcemap();
+      }
+    }
+  };
+};
+
 /*
  * Transforms code to make it compatible with browser that would not be able to
  * run it otherwise. For instance:
@@ -21343,13 +21603,14 @@ const jsenvPluginTranspilation = ({
   jsClassicFallback = true,
   systemJsInjection = true,
   topLevelAwait = true,
+  importMetaResolve = true,
   babelHelpersAsImport = true,
   getCustomBabelPlugins
 }) => {
   if (importAssertions === true) {
     importAssertions = {};
   }
-  return [...(importAssertions ? [jsenvPluginImportAssertions(importAssertions)] : []),
+  return [...(importMetaResolve ? [jsenvPluginImportMetaResolve()] : []), ...(importAssertions ? [jsenvPluginImportAssertions(importAssertions)] : []),
   // babel also so that rollup can bundle babel helpers for instance
   jsenvPluginBabel({
     topLevelAwait,
@@ -21359,7 +21620,7 @@ const jsenvPluginTranspilation = ({
     jsClassicLibrary,
     jsClassicFallback,
     systemJsInjection
-  }),
+  }), jsenvPluginAsJsModule(),
   // topLevelAwait must come after jsenvPluginAsJsClassic because it's related to the module format
   // so we want to wait to know the module format before transforming things related to top level await
   ...(topLevelAwait ? [jsenvPluginTopLevelAwait()] : []), ...(css ? [jsenvPluginCssParcel()] : [])];
@@ -21996,7 +22257,7 @@ const jsenvPluginImportMetaHot = () => {
     transformUrlContent: {
       html: (htmlUrlInfo, context) => {
         // during build we don't really care to parse html hot dependencies
-        if (context.scenarios.build) {
+        if (context.build) {
           return;
         }
         const htmlAst = parseHtmlString(htmlUrlInfo.content);
@@ -22047,7 +22308,7 @@ const jsenvPluginImportMetaHot = () => {
         if (importMetaHotPaths.length === 0) {
           return null;
         }
-        if (context.scenarios.build) {
+        if (context.build) {
           return removeImportMetaHots(urlInfo, importMetaHotPaths);
         }
         return injectImportMetaHot(urlInfo, context, importMetaHotClientFileUrl);
@@ -22074,7 +22335,7 @@ const removeImportMetaHots = (urlInfo, importMetaHotPaths) => {
 const injectImportMetaHot = (urlInfo, context, importMetaHotClientFileUrl) => {
   const [importMetaHotClientFileReference] = context.referenceUtils.inject({
     parentUrl: urlInfo.url,
-    type: "js_import_export",
+    type: "js_import",
     expectedType: "js_module",
     specifier: importMetaHotClientFileUrl
   });
@@ -22496,7 +22757,7 @@ const jsenvPluginRibbon = ({
           specifier: ribbonClientFileUrl.href
         });
         const paramsJson = JSON.stringify({
-          text: context.scenarios.dev ? "DEV" : "BUILD"
+          text: context.dev ? "DEV" : "BUILD"
         }, null, "  ");
         const scriptNode = createHtmlNode({
           tagName: "script",
@@ -23053,9 +23314,7 @@ build ${entryPointKeys.length} entry points`);
       logLevel,
       rootDirectoryUrl,
       urlGraph: rawGraph,
-      scenarios: {
-        build: true
-      },
+      build: true,
       runtimeCompat,
       plugins: [...plugins, {
         appliesDuring: "build",
@@ -23118,9 +23377,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
       logLevel,
       rootDirectoryUrl: buildDirectoryUrl,
       urlGraph: finalGraph,
-      scenarios: {
-        build: true
-      },
+      build: true,
       runtimeCompat,
       plugins: [urlAnalysisPlugin, jsenvPluginAsJsClassic({
         jsClassicLibrary: false,
@@ -23282,6 +23539,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           const generatedUrlObject = new URL(reference.generatedUrl);
           generatedUrlObject.searchParams.delete("as_js_classic");
           generatedUrlObject.searchParams.delete("as_js_classic_library");
+          generatedUrlObject.searchParams.delete("as_js_module");
           generatedUrlObject.searchParams.delete("as_json_module");
           generatedUrlObject.searchParams.delete("as_css_module");
           generatedUrlObject.searchParams.delete("as_text_module");
@@ -23447,7 +23705,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   if (dependencyUrlInfo.type === "js_module") {
                     // bundle inline script type module deps
                     dependencyUrlInfo.references.forEach(inlineScriptRef => {
-                      if (inlineScriptRef.type === "js_import_export") {
+                      if (inlineScriptRef.type === "js_import") {
                         const inlineUrlInfo = rawGraph.getUrlInfo(inlineScriptRef.url);
                         addToBundlerIfAny(inlineUrlInfo);
                       }
@@ -23476,7 +23734,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
           // For instance we will bundle service worker/workers detected like this
           if (rawUrlInfo.type === "js_module") {
             rawUrlInfo.references.forEach(reference => {
-              if (reference.type !== "js_url_specifier") {
+              if (reference.type !== "js_url") {
                 return;
               }
               const referencedUrlInfo = rawGraph.getUrlInfo(reference.url);
@@ -23489,7 +23747,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                 const dependentUrlInfo = rawGraph.getUrlInfo(dependent);
                 for (const reference of dependentUrlInfo.references) {
                   if (reference.url === referencedUrlInfo.url) {
-                    willAlreadyBeBundled = reference.type === "js_import_export" && reference.subtype === "import_dynamic" || reference.type === "script_src";
+                    willAlreadyBeBundled = reference.type === "js_import" && reference.subtype === "import_dynamic" || reference.type === "script_src";
                   }
                 }
               }
@@ -23681,7 +23939,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                     // __v__() makes versioning dynamic: no need to take into account
                     return null;
                   }
-                  if (reference.type === "js_url_specifier" || reference.subtype === "import_dynamic") {
+                  if (reference.type === "js_url" || reference.subtype === "import_dynamic") {
                     // __v__() makes versioning dynamic: no need to take into account
                     return null;
                   }
@@ -23712,6 +23970,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
               // this information is already hold into ".nomodule"
               buildUrlObject.searchParams.delete("as_js_classic");
               buildUrlObject.searchParams.delete("as_js_classic_library");
+              buildUrlObject.searchParams.delete("as_js_module");
               buildUrlObject.searchParams.delete("as_json_module");
               buildUrlObject.searchParams.delete("as_css_module");
               buildUrlObject.searchParams.delete("as_text_module");
@@ -23733,9 +23992,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
             logLevel: logger.level,
             rootDirectoryUrl: buildDirectoryUrl,
             urlGraph: finalGraph,
-            scenarios: {
-              build: true
-            },
+            build: true,
             runtimeCompat,
             plugins: [urlAnalysisPlugin, jsenvPluginInline({
               fetchInlineUrls: false,
@@ -23802,7 +24059,7 @@ ${ANSI.color(buildUrl, ANSI.MAGENTA)}
                   usedVersionMappings.add(reference.specifier);
                   return () => `${parentUrlInfo.jsQuote}+__v__(${JSON.stringify(reference.specifier)})+${parentUrlInfo.jsQuote}`;
                 }
-                if (reference.type === "js_url_specifier" || reference.subtype === "import_dynamic") {
+                if (reference.type === "js_url" || reference.subtype === "import_dynamic" || reference.subtype === "import_meta_resolve") {
                   usedVersionMappings.add(reference.specifier);
                   return () => `__v__(${JSON.stringify(reference.specifier)})`;
                 }
@@ -24384,7 +24641,6 @@ const createFileService = ({
   serverStopCallbacks,
   serverEventsDispatcher,
   rootDirectoryUrl,
-  scenarios,
   runtimeCompat,
   plugins,
   urlAnalysis,
@@ -24483,7 +24739,7 @@ const createFileService = ({
       signal,
       logLevel,
       rootDirectoryUrl,
-      scenarios,
+      dev: true,
       runtimeCompat,
       clientRuntimeCompat: {
         [runtimeName]: runtimeVersion
@@ -24508,7 +24764,7 @@ const createFileService = ({
       sourcemapsSourcesProtocol,
       sourcemapsSourcesContent,
       writeGeneratedFiles,
-      outDirectoryUrl: scenarios.dev ? `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/` : `${rootDirectoryUrl}.jsenv/build/${runtimeName}@${runtimeVersion}/`
+      outDirectoryUrl: `${rootDirectoryUrl}.jsenv/${runtimeName}@${runtimeVersion}/`
     });
     urlGraph.createUrlInfoCallbackRef.current = urlInfo => {
       const {
@@ -24582,7 +24838,7 @@ const createFileService = ({
           allServerEvents[serverEventName]({
             rootDirectoryUrl,
             urlGraph,
-            scenarios,
+            dev: true,
             sendServerEvent: data => {
               serverEventsDispatcher.dispatch({
                 type: serverEventName,
@@ -24597,7 +24853,7 @@ const createFileService = ({
     }
     const context = {
       rootDirectoryUrl,
-      scenarios,
+      dev: true,
       runtimeName,
       runtimeVersion,
       urlGraph,
@@ -24985,9 +25241,6 @@ const startDevServer = async ({
         serverStopCallbacks,
         serverEventsDispatcher,
         rootDirectoryUrl,
-        scenarios: {
-          dev: true
-        },
         runtimeCompat,
         plugins,
         urlAnalysis,