@jsenv/core 22.0.1 → 22.2.1

package/dist/jsenv_browser_system.js

@@ -1346,46 +1346,7 @@
   // fallback to this polyfill (or even use an existing polyfill would be better)
   // https://github.com/github/fetch/blob/master/fetch.js
 
-  function _await$b(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  function _async$b(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
-  function _call$1(body, then, direct) {
-    if (direct) {
-      return then ? then(body()) : body();
-    }
-
-    try {
-      var result = Promise.resolve(body());
-      return then ? result.then(then) : result;
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }
-
-  var fetchUsingXHR = _async$b(function (url) {
+  var fetchUsingXHR = async function fetchUsingXHR(url) {
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
         _ref$cancellationToke = _ref.cancellationToken,
         cancellationToken = _ref$cancellationToke === void 0 ? createCancellationToken() : _ref$cancellationToke,
@@ -1468,108 +1429,122 @@
     }
 
     xhr.send(body);
-    return _await$b(headersPromise, function () {
-      // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseURL
-      var responseUrl = "responseURL" in xhr ? xhr.responseURL : headers["x-request-url"];
-      var responseStatus = xhr.status;
-      var responseStatusText = xhr.statusText;
-      var responseHeaders = getHeadersFromXHR(xhr);
-
-      var readBody = function readBody() {
-        return _await$b(bodyPromise, function () {
-          var status = xhr.status; // in Chrome on file:/// URLs, status is 0
-
-          if (status === 0) {
-            responseStatus = 200;
-          }
+    await headersPromise; // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseURL
 
-          var body = "response" in xhr ? xhr.response : xhr.responseText;
-          return {
-            responseBody: body,
-            responseBodyType: detectBodyType(body)
-          };
-        });
+    var responseUrl = "responseURL" in xhr ? xhr.responseURL : headers["x-request-url"];
+    var responseStatus = xhr.status;
+    var responseStatusText = xhr.statusText;
+    var responseHeaders = getHeadersFromXHR(xhr);
+
+    var readBody = async function readBody() {
+      await bodyPromise;
+      var status = xhr.status; // in Chrome on file:/// URLs, status is 0
+
+      if (status === 0) {
+        responseStatus = 200;
+      }
+
+      var body = "response" in xhr ? xhr.response : xhr.responseText;
+      return {
+        responseBody: body,
+        responseBodyType: detectBodyType(body)
       };
+    };
 
-      var text = function text() {
-        return _call$1(readBody, function (_ref2) {
-          var responseBody = _ref2.responseBody,
-              responseBodyType = _ref2.responseBodyType;
+    var text = async function text() {
+      var _await$readBody = await readBody(),
+          responseBody = _await$readBody.responseBody,
+          responseBodyType = _await$readBody.responseBodyType;
 
-          if (responseBodyType === "blob") {
-            return blobToText(responseBody);
-          }
+      if (responseBodyType === "blob") {
+        return blobToText(responseBody);
+      }
 
-          if (responseBodyType === "formData") {
-            throw new Error("could not read FormData body as text");
-          }
+      if (responseBodyType === "formData") {
+        throw new Error("could not read FormData body as text");
+      }
 
-          return responseBodyType === "dataView" ? arrayBufferToText(responseBody.buffer) : responseBodyType === "arrayBuffer" ? arrayBufferToText(responseBody) : String(responseBody);
-        });
-      };
+      if (responseBodyType === "dataView") {
+        return arrayBufferToText(responseBody.buffer);
+      }
 
-      var json = function json() {
-        return _call$1(text, JSON.parse);
-      };
+      if (responseBodyType === "arrayBuffer") {
+        return arrayBufferToText(responseBody);
+      } // if (responseBodyType === "text" || responseBodyType === 'searchParams') {
+      //   return body
+      // }
 
-      var blob = _async$b(function () {
-        if (!hasBlob) {
-          throw new Error("blob not supported");
-        }
 
-        return _call$1(readBody, function (_ref3) {
-          var responseBody = _ref3.responseBody,
-              responseBodyType = _ref3.responseBodyType;
+      return String(responseBody);
+    };
 
-          if (responseBodyType === "blob") {
-            return responseBody;
-          }
+    var json = async function json() {
+      var responseText = await text();
+      return JSON.parse(responseText);
+    };
 
-          if (responseBodyType === "dataView") {
-            return new Blob([cloneBuffer(responseBody.buffer)]);
-          }
+    var blob = async function blob() {
+      if (!hasBlob) {
+        throw new Error("blob not supported");
+      }
 
-          if (responseBodyType === "arrayBuffer") {
-            return new Blob([cloneBuffer(responseBody)]);
-          }
+      var _await$readBody2 = await readBody(),
+          responseBody = _await$readBody2.responseBody,
+          responseBodyType = _await$readBody2.responseBodyType;
 
-          if (responseBodyType === "formData") {
-            throw new Error("could not read FormData body as blob");
-          }
+      if (responseBodyType === "blob") {
+        return responseBody;
+      }
 
-          return new Blob([String(responseBody)]);
-        });
-      });
+      if (responseBodyType === "dataView") {
+        return new Blob([cloneBuffer(responseBody.buffer)]);
+      }
 
-      var arrayBuffer = function arrayBuffer() {
-        return _call$1(readBody, function (_ref4) {
-          var responseBody = _ref4.responseBody,
-              responseBodyType = _ref4.responseBodyType;
-          return responseBodyType === "arrayBuffer" ? cloneBuffer(responseBody) : _call$1(blob, blobToArrayBuffer);
-        });
-      };
+      if (responseBodyType === "arrayBuffer") {
+        return new Blob([cloneBuffer(responseBody)]);
+      }
 
-      var formData = _async$b(function () {
-        if (!hasFormData) {
-          throw new Error("formData not supported");
-        }
+      if (responseBodyType === "formData") {
+        throw new Error("could not read FormData body as blob");
+      }
 
-        return _call$1(text, textToFormData);
-      });
+      return new Blob([String(responseBody)]);
+    };
 
-      return {
-        url: responseUrl,
-        status: responseStatus,
-        statusText: responseStatusText,
-        headers: responseHeaders,
-        text: text,
-        json: json,
-        blob: blob,
-        arrayBuffer: arrayBuffer,
-        formData: formData
-      };
-    });
-  });
+    var arrayBuffer = async function arrayBuffer() {
+      var _await$readBody3 = await readBody(),
+          responseBody = _await$readBody3.responseBody,
+          responseBodyType = _await$readBody3.responseBodyType;
+
+      if (responseBodyType === "arrayBuffer") {
+        return cloneBuffer(responseBody);
+      }
+
+      var responseBlob = await blob();
+      return blobToArrayBuffer(responseBlob);
+    };
+
+    var formData = async function formData() {
+      if (!hasFormData) {
+        throw new Error("formData not supported");
+      }
+
+      var responseText = await text();
+      return textToFormData(responseText);
+    };
+
+    return {
+      url: responseUrl,
+      status: responseStatus,
+      statusText: responseStatusText,
+      headers: responseHeaders,
+      text: text,
+      json: json,
+      blob: blob,
+      arrayBuffer: arrayBuffer,
+      formData: formData
+    };
+  };
 
   var canUseBlob = function canUseBlob() {
     if (typeof window.FileReader !== "function") return false;
@@ -1589,8 +1564,8 @@
   var hasArrayBuffer = typeof window.ArrayBuffer === "function";
   var hasSearchParams = typeof window.URLSearchParams === "function";
 
-  var createRequestError = function createRequestError(error, _ref5) {
-    var url = _ref5.url;
+  var createRequestError = function createRequestError(error, _ref2) {
+    var url = _ref2.url;
     return new Error(createDetailedMessage("error during xhr request on ".concat(url, "."), _defineProperty({}, "error stack", error.stack)));
   };
 
@@ -1614,9 +1589,9 @@
   }; // https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch
 
 
-  var computeWithCredentials = function computeWithCredentials(_ref6) {
-    var credentials = _ref6.credentials,
-        url = _ref6.url;
+  var computeWithCredentials = function computeWithCredentials(_ref3) {
+    var credentials = _ref3.credentials,
+        url = _ref3.url;
 
     if (credentials === "same-origin") {
       return originSameAsGlobalOrigin(url);
@@ -1730,12 +1705,12 @@
     return form;
   };
 
-  var blobToArrayBuffer = _async$b(function (blob) {
+  var blobToArrayBuffer = async function blobToArrayBuffer(blob) {
     var reader = new FileReader();
     var promise = fileReaderReady(reader);
     reader.readAsArrayBuffer(blob);
     return promise;
-  });
+  };
 
   var blobToText = function blobToText(blob) {
     var reader = new FileReader();
@@ -1781,20 +1756,7 @@
 
   var _excluded = ["cancellationToken", "mode"];
 
-  function _await$a(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  var fetchNative = _async$a(function (url) {
-
+  var fetchNative = async function fetchNative(url) {
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
     var _ref$cancellationToke = _ref.cancellationToken,
@@ -1810,57 +1772,42 @@
       abortController.abort(reason);
     });
     var response;
-    return _continue$3(_catch$5(function () {
-      return _await$a(window.fetch(url, _objectSpread2({
+
+    try {
+      response = await window.fetch(url, _objectSpread2({
         signal: abortController.signal,
         mode: mode
-      }, options)), function (_window$fetch) {
-        response = _window$fetch;
-      });
-    }, function (e) {
+      }, options));
+    } catch (e) {
       if (cancelError && e.name === "AbortError") {
         throw cancelError;
       }
 
       throw e;
-    }), function (_result) {
-      return {
-        url: response.url,
-        status: response.status,
-        statusText: "",
-        headers: responseToHeaders$1(response),
-        text: function text() {
-          return response.text();
-        },
-        json: function json() {
-          return response.json();
-        },
-        blob: function blob() {
-          return response.blob();
-        },
-        arrayBuffer: function arrayBuffer() {
-          return response.arrayBuffer();
-        },
-        formData: function formData() {
-          return response.formData();
-        }
-      };
-    });
-  });
-
-  function _catch$5(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
     }
 
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
-
-    return result;
-  }
+    return {
+      url: response.url,
+      status: response.status,
+      statusText: "",
+      headers: responseToHeaders$1(response),
+      text: function text() {
+        return response.text();
+      },
+      json: function json() {
+        return response.json();
+      },
+      blob: function blob() {
+        return response.blob();
+      },
+      arrayBuffer: function arrayBuffer() {
+        return response.arrayBuffer();
+      },
+      formData: function formData() {
+        return response.formData();
+      }
+    };
+  };
 
   var responseToHeaders$1 = function responseToHeaders(response) {
     var headers = {};
@@ -1870,24 +1817,6 @@
     return headers;
   };
 
-  function _continue$3(value, then) {
-    return value && value.then ? value.then(then) : then(value);
-  }
-
-  function _async$a(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
   var fetchUrl = typeof window.fetch === "function" && typeof window.AbortController === "function" ? fetchNative : fetchUsingXHR;
 
   var pathnameToExtension$1 = function pathnameToExtension(pathname) {
@@ -2078,60 +2007,6 @@
     return url;
   };
 
-  function _await$9(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  function _catch$4(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
-    }
-
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
-
-    return result;
-  }
-
-  function _invoke$5(body, then) {
-    var result = body();
-
-    if (result && result.then) {
-      return result.then(then);
-    }
-
-    return then(result);
-  }
-
-  function _continue$2(value, then) {
-    return value && value.then ? value.then(then) : then(value);
-  }
-
-  function _async$9(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
   var fromFunctionReturningNamespace = function fromFunctionReturningNamespace(fn, data) {
     return fromFunctionReturningRegisteredModule(function () {
       // should we compute the namespace here
@@ -2163,7 +2038,7 @@
     }
   };
 
-  var fromUrl = _async$9(function (_ref) {
+  var fromUrl = async function fromUrl(_ref) {
     var url = _ref.url,
         importerUrl = _ref.importerUrl,
         fetchSource = _ref.fetchSource,
@@ -2171,131 +2046,116 @@
         compileServerOrigin = _ref.compileServerOrigin,
         compileDirectoryRelativeUrl = _ref.compileDirectoryRelativeUrl;
     var moduleResponse;
-    return _continue$2(_catch$4(function () {
-      return _await$9(fetchSource(url, {
+
+    try {
+      moduleResponse = await fetchSource(url, {
         importerUrl: importerUrl
-      }), function (_fetchSource) {
-        moduleResponse = _fetchSource;
-
-        if (moduleResponse.status === 404) {
-          throw new Error(createDetailedMessage("Module file cannot be found.", getModuleDetails({
-            url: url,
-            importerUrl: importerUrl,
-            compileServerOrigin: compileServerOrigin,
-            compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
-            notFound: true
-          })));
-        }
       });
-    }, function (e) {
+
+      if (moduleResponse.status === 404) {
+        throw new Error(createDetailedMessage("Module file cannot be found.", getModuleDetails({
+          url: url,
+          importerUrl: importerUrl,
+          compileServerOrigin: compileServerOrigin,
+          compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
+          notFound: true
+        })));
+      }
+    } catch (e) {
       e.code = "NETWORK_FAILURE";
       throw e;
-    }), function (_result) {
-      var contentType = moduleResponse.headers["content-type"] || "";
-      return _invoke$5(function () {
-        if (moduleResponse.status === 500 && contentType === "application/json") {
-          return _await$9(moduleResponse.json(), function (bodyAsJson) {
-            if (bodyAsJson.message && bodyAsJson.filename && "columnNumber" in bodyAsJson) {
-              var error = new Error(createDetailedMessage("Module file cannot be parsed.", _objectSpread2(_defineProperty({}, "parsing error message", bodyAsJson.message), getModuleDetails({
-                url: url,
-                importerUrl: importerUrl,
-                compileServerOrigin: compileServerOrigin,
-                compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-              }))));
-              error.parsingError = bodyAsJson;
-              throw error;
-            }
-          });
-        }
-      }, function (_result2) {
-        var _exit3 = false;
-
-        if (moduleResponse.status < 200 || moduleResponse.status >= 300) {
-          var _objectSpread4;
-
-          throw new Error(createDetailedMessage("Module file response status is unexpected.", _objectSpread2((_objectSpread4 = {}, _defineProperty(_objectSpread4, "status", moduleResponse.status), _defineProperty(_objectSpread4, "allowed status", "200 to 299"), _defineProperty(_objectSpread4, "statusText", moduleResponse.statusText), _objectSpread4), getModuleDetails({
-            url: url,
-            importerUrl: importerUrl,
-            compileServerOrigin: compileServerOrigin,
-            compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-          }))));
-        } // don't forget to keep in sync with loadModule in createJsenvRollupPlugin.js
-
-
-        return _invoke$5(function () {
-          if (contentType === "application/javascript" || contentType === "text/javascript") {
-            return _await$9(moduleResponse.text(), function (bodyAsText) {
-              _exit3 = true;
-              return fromFunctionReturningRegisteredModule(function () {
-                return instantiateJavaScript(bodyAsText, moduleResponse.url);
-              }, {
-                url: moduleResponse.url,
-                importerUrl: importerUrl,
-                compileServerOrigin: compileServerOrigin,
-                compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-              });
-            });
-          }
-        }, function (_result3) {
-          var _exit4 = false;
-          if (_exit3) return _result3;
-          return _invoke$5(function () {
-            if (contentType === "application/json" || contentType.endsWith("+json")) {
-              return _await$9(moduleResponse.json(), function (bodyAsJson) {
-                _exit4 = true;
-                return fromFunctionReturningNamespace(function () {
-                  return {
-                    default: bodyAsJson
-                  };
-                }, {
-                  url: moduleResponse.url,
-                  importerUrl: importerUrl,
-                  compileServerOrigin: compileServerOrigin,
-                  compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-                });
-              });
-            }
-          }, function (_result4) {
-            if (_exit4) return _result4;
-
-            if (contentType) {
-              console.warn(createDetailedMessage("Ressource content-type is unusual", _objectSpread2(_objectSpread2({
-                "content-type": contentType,
-                "allowed content-type": ["application/javascript", "application/json"]
-              }, getModuleDetails({
-                url: url,
-                importerUrl: importerUrl,
-                compileServerOrigin: compileServerOrigin,
-                compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-              })), {}, {
-                "suggestion": "Prefer import.meta.url as documented in https://github.com/jsenv/jsenv-core/blob/master/docs/building/readme.md#How-to-reference-js-assets"
-              })));
-            } else {
-              console.warn("Ressource content-type is missing", _objectSpread2({
-                "allowed content-type": ["application/javascript", "application/json"]
-              }, getModuleDetails({
-                url: url,
-                importerUrl: importerUrl,
-                compileServerOrigin: compileServerOrigin,
-                compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-              })));
-            }
+    }
 
-            return fromFunctionReturningNamespace(function () {
-              return {
-                default: moduleResponse.url
-              };
-            }, {
-              url: moduleResponse.url,
-              importerUrl: importerUrl,
-              compileServerOrigin: compileServerOrigin,
-              compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
-            });
-          });
-        });
+    var contentType = moduleResponse.headers["content-type"] || "";
+
+    if (moduleResponse.status === 500 && contentType === "application/json") {
+      var bodyAsJson = await moduleResponse.json();
+
+      if (bodyAsJson.message && bodyAsJson.filename && "columnNumber" in bodyAsJson) {
+        var error = new Error(createDetailedMessage("Module file cannot be parsed.", _objectSpread2(_defineProperty({}, "parsing error message", bodyAsJson.message), getModuleDetails({
+          url: url,
+          importerUrl: importerUrl,
+          compileServerOrigin: compileServerOrigin,
+          compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
+        }))));
+        error.parsingError = bodyAsJson;
+        throw error;
+      }
+    }
+
+    if (moduleResponse.status < 200 || moduleResponse.status >= 300) {
+      var _objectSpread4;
+
+      throw new Error(createDetailedMessage("Module file response status is unexpected.", _objectSpread2((_objectSpread4 = {}, _defineProperty(_objectSpread4, "status", moduleResponse.status), _defineProperty(_objectSpread4, "allowed status", "200 to 299"), _defineProperty(_objectSpread4, "statusText", moduleResponse.statusText), _objectSpread4), getModuleDetails({
+        url: url,
+        importerUrl: importerUrl,
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
+      }))));
+    } // don't forget to keep in sync with loadModule in createJsenvRollupPlugin.js
+
+
+    if (contentType === "application/javascript" || contentType === "text/javascript") {
+      var bodyAsText = await moduleResponse.text();
+      return fromFunctionReturningRegisteredModule(function () {
+        return instantiateJavaScript(bodyAsText, moduleResponse.url);
+      }, {
+        url: moduleResponse.url,
+        importerUrl: importerUrl,
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
+      });
+    }
+
+    if (contentType === "application/json" || contentType.endsWith("+json")) {
+      var _bodyAsJson = await moduleResponse.json();
+
+      return fromFunctionReturningNamespace(function () {
+        return {
+          default: _bodyAsJson
+        };
+      }, {
+        url: moduleResponse.url,
+        importerUrl: importerUrl,
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
       });
+    }
+
+    if (contentType) {
+      console.warn(createDetailedMessage("Ressource content-type is unusual", _objectSpread2(_objectSpread2({
+        "content-type": contentType,
+        "allowed content-type": ["application/javascript", "application/json"]
+      }, getModuleDetails({
+        url: url,
+        importerUrl: importerUrl,
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
+      })), {}, {
+        "suggestion": "Prefer import.meta.url as documented in https://github.com/jsenv/jsenv-core/blob/master/docs/building/readme.md#How-to-reference-js-assets"
+      })));
+    } else {
+      console.warn("Ressource content-type is missing", _objectSpread2({
+        "allowed content-type": ["application/javascript", "application/json"]
+      }, getModuleDetails({
+        url: url,
+        importerUrl: importerUrl,
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
+      })));
+    }
+
+    return fromFunctionReturningNamespace(function () {
+      return {
+        default: moduleResponse.url
+      };
+    }, {
+      url: moduleResponse.url,
+      importerUrl: importerUrl,
+      compileServerOrigin: compileServerOrigin,
+      compileDirectoryRelativeUrl: compileDirectoryRelativeUrl
     });
-  }); // const textToBase64 =
+  }; // const textToBase64 =
   //   typeof window === "object"
   //     ? (text) => window.btoa(window.unescape(window.encodeURIComponent(text)))
   //     : (text) => Buffer.from(text, "utf8").toString("base64")
@@ -2394,19 +2254,7 @@
     return extension;
   };
 
-  function _await$8(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  var createImportResolverForImportmap = function createImportResolverForImportmap(_ref) {
+  var createImportResolverForImportmap = async function createImportResolverForImportmap(_ref) {
     var compileServerOrigin = _ref.compileServerOrigin,
         compileDirectoryRelativeUrl = _ref.compileDirectoryRelativeUrl,
         importMap = _ref.importMap,
@@ -2447,9 +2295,9 @@
       });
     };
 
-    return _await$8({
+    return {
       resolveImport: _resolveImport
-    });
+    };
   };
 
   var _createBareSpecifierError = function _createBareSpecifierError(_ref3) {
@@ -2471,50 +2319,19 @@
   /* eslint-env browser */
   var _window$1 = window,
       performance$1 = _window$1.performance;
-
-  function _rethrow(thrown, value) {
-    if (thrown) throw value;
-    return value;
-  }
-
-  function _finallyRethrows(body, finalizer) {
-    try {
-      var result = body();
-    } catch (e) {
-      return finalizer(true, e);
-    }
-
-    if (result && result.then) {
-      return result.then(finalizer.bind(null, false), finalizer.bind(null, true));
-    }
-
-    return finalizer(false, result);
-  }
-
-  function _async$8(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
-  var measureAsyncFnPerf = performance$1 ? _async$8(function (fn, name) {
+  var measureAsyncFnPerf = performance$1 ? async function (fn, name) {
     var perfMarkStartName = "".concat(name, "_start");
     performance$1.mark(perfMarkStartName);
-    return _finallyRethrows(fn, function (_wasThrown, _result) {
+
+    try {
+      var value = await fn();
+      return value;
+    } finally {
       performance$1.measure(name, perfMarkStartName);
-      return _rethrow(_wasThrown, _result);
-    });
-  }) : _async$8(function (fn) {
+    }
+  } : async function (fn) {
     return fn();
-  });
+  };
 
   /*
   * SJS 6.10.3
@@ -3449,55 +3266,29 @@
     };
   };
 
-  function _await$7(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
   var _window = window,
       Notification = _window.Notification;
 
-  function _async$7(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
   var displayErrorNotificationNotAvailable = function displayErrorNotificationNotAvailable() {};
 
-  var displayErrorNotificationImplementation = _async$7(function (error) {
+  var displayErrorNotificationImplementation = async function displayErrorNotificationImplementation(error) {
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
         icon = _ref.icon;
 
-    return _await$7(Notification.requestPermission(), function (permission) {
-      if (permission === "granted") {
-        var notification = new Notification("An error occured", {
-          lang: "en",
-          body: error.stack,
-          icon: icon
-        });
+    var permission = await Notification.requestPermission();
 
-        notification.onclick = function () {
-          window.focus();
-        };
-      }
-    });
-  });
+    if (permission === "granted") {
+      var notification = new Notification("An error occured", {
+        lang: "en",
+        body: error.stack,
+        icon: icon
+      });
+
+      notification.onclick = function () {
+        window.focus();
+      };
+    }
+  };
 
   var displayErrorNotification = typeof Notification === "function" ? displayErrorNotificationImplementation : displayErrorNotificationNotAvailable;
 
@@ -3580,216 +3371,153 @@
   var supportedTypes = ["Boolean", "Number", "String", "Date", "RegExp", "Blob", "FileList", "ImageData", "ImageBitmap", "ArrayBuffer"];
   var maybeTypes = ["Array", "Object", "Map", "Set"];
 
-  function _await$6(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
+  var memoizedCreateBrowserSystem = memoize(createBrowserSystem);
+  var createBrowserRuntime = async function createBrowserRuntime(_ref) {
+    var compileServerOrigin = _ref.compileServerOrigin,
+        outDirectoryRelativeUrl = _ref.outDirectoryRelativeUrl,
+        compileId = _ref.compileId;
 
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
+    var fetchSource = function fetchSource(url) {
+      return fetchUrl(url, {
+        credentials: "same-origin"
+      });
+    };
 
-    return then ? value.then(then) : value;
-  }
+    var fetchJson = async function fetchJson(url) {
+      var response = await fetchSource(url);
+      var json = await response.json();
+      return json;
+    };
 
-  var memoizedCreateBrowserSystem = memoize(createBrowserSystem);
+    var outDirectoryUrl = "".concat(compileServerOrigin, "/").concat(outDirectoryRelativeUrl);
+    var envUrl = String(new URL("env.json", outDirectoryUrl));
 
-  function _invoke$4(body, then) {
-    var result = body();
+    var _await$fetchJson = await fetchJson(envUrl),
+        importDefaultExtension = _await$fetchJson.importDefaultExtension;
 
-    if (result && result.then) {
-      return result.then(then);
-    }
+    var compileDirectoryRelativeUrl = "".concat(outDirectoryRelativeUrl).concat(compileId, "/"); // if there is an importmap in the document we use it instead of fetching.
+    // systemjs style with systemjs-importmap
 
-    return then(result);
-  }
+    var importmapScript = document.querySelector("script[type=\"jsenv-importmap\"]");
+    var importMap;
+    var importMapUrl;
 
-  function _async$6(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
+    if (importmapScript) {
+      var importmapRaw;
 
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
+      if (importmapScript.src) {
+        importMapUrl = importmapScript.src;
+        var importmapFileResponse = await fetchSource(importMapUrl);
+        importmapRaw = importmapFileResponse.status === 404 ? {} : await importmapFileResponse.json();
+      } else {
+        importMapUrl = document.location.href;
+        importmapRaw = JSON.parse(importmapScript.textContent) || {};
       }
-    };
-  }
 
-  function _catch$3(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
+      importMap = normalizeImportMap(importmapRaw, importMapUrl);
     }
 
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
-
-    return result;
-  }
-
-  function _continue$1(value, then) {
-    return value && value.then ? value.then(then) : then(value);
-  }
-
-  var createBrowserRuntime = _async$6(function (_ref) {
-    var compileServerOrigin = _ref.compileServerOrigin,
-        outDirectoryRelativeUrl = _ref.outDirectoryRelativeUrl,
-        compileId = _ref.compileId;
+    var importResolver = await createImportResolverForImportmap({
+      // projectDirectoryUrl,
+      compileServerOrigin: compileServerOrigin,
+      compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
+      importMap: importMap,
+      importMapUrl: importMapUrl,
+      importDefaultExtension: importDefaultExtension
+    });
 
-    var fetchSource = function fetchSource(url) {
-      return fetchUrl(url, {
-        credentials: "same-origin"
+    var importFile = async function importFile(specifier) {
+      var browserSystem = await memoizedCreateBrowserSystem({
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
+        fetchSource: fetchSource,
+        importResolver: importResolver
       });
+      return browserSystem.import(specifier);
     };
 
-    var fetchJson = _async$6(function (url) {
-      return _await$6(fetchSource(url), function (response) {
-        return _await$6(response.json());
+    var executeFile = async function executeFile(specifier) {
+      var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+          _ref2$transferableNam = _ref2.transferableNamespace,
+          transferableNamespace = _ref2$transferableNam === void 0 ? false : _ref2$transferableNam,
+          _ref2$errorExposureIn = _ref2.errorExposureInConsole,
+          errorExposureInConsole = _ref2$errorExposureIn === void 0 ? true : _ref2$errorExposureIn,
+          _ref2$errorExposureIn2 = _ref2.errorExposureInNotification,
+          errorExposureInNotification = _ref2$errorExposureIn2 === void 0 ? false : _ref2$errorExposureIn2,
+          _ref2$errorExposureIn3 = _ref2.errorExposureInDocument,
+          errorExposureInDocument = _ref2$errorExposureIn3 === void 0 ? true : _ref2$errorExposureIn3,
+          _ref2$executionExposu = _ref2.executionExposureOnWindow,
+          executionExposureOnWindow = _ref2$executionExposu === void 0 ? false : _ref2$executionExposu,
+          _ref2$errorTransform = _ref2.errorTransform,
+          errorTransform = _ref2$errorTransform === void 0 ? function (error) {
+        return error;
+      } : _ref2$errorTransform,
+          measurePerformance = _ref2.measurePerformance;
+
+      var browserSystem = await memoizedCreateBrowserSystem({
+        compileServerOrigin: compileServerOrigin,
+        compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
+        fetchSource: fetchSource,
+        importResolver: importResolver
       });
-    });
 
-    var outDirectoryUrl = "".concat(compileServerOrigin, "/").concat(outDirectoryRelativeUrl);
-    var envUrl = String(new URL("env.json", outDirectoryUrl));
-    return _await$6(fetchJson(envUrl), function (_ref2) {
-      var importDefaultExtension = _ref2.importDefaultExtension;
-      var compileDirectoryRelativeUrl = "".concat(outDirectoryRelativeUrl).concat(compileId, "/"); // if there is an importmap in the document we use it instead of fetching.
-      // systemjs style with systemjs-importmap
-
-      var importmapScript = document.querySelector("script[type=\"jsenv-importmap\"]");
-      var importMap;
-      var importMapUrl;
-      return _invoke$4(function () {
-        if (importmapScript) {
-          var importmapRaw;
-          return _invoke$4(function () {
-            if (importmapScript.src) {
-              importMapUrl = importmapScript.src;
-              return _await$6(fetchSource(importMapUrl), function (importmapFileResponse) {
-                var _temp = importmapFileResponse.status === 404;
-
-                return _await$6(_temp ? {} : importmapFileResponse.json(), function (_importmapFileRespons) {
-                  importmapRaw = _importmapFileRespons;
-                }, _temp);
-              });
-            } else {
-              importMapUrl = document.location.href;
-              importmapRaw = JSON.parse(importmapScript.textContent) || {};
-            }
-          }, function () {
-            importMap = normalizeImportMap(importmapRaw, importMapUrl);
-          });
-        }
-      }, function () {
-        return _await$6(createImportResolverForImportmap({
-          // projectDirectoryUrl,
-          compileServerOrigin: compileServerOrigin,
-          compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
-          importMap: importMap,
-          importMapUrl: importMapUrl,
-          importDefaultExtension: importDefaultExtension
-        }), function (importResolver) {
-          var importFile = _async$6(function (specifier) {
-            return _await$6(memoizedCreateBrowserSystem({
-              compileServerOrigin: compileServerOrigin,
-              compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
-              fetchSource: fetchSource,
-              importResolver: importResolver
-            }), function (browserSystem) {
-              return browserSystem.import(specifier);
-            });
-          });
+      var importUsingSystemJs = async function importUsingSystemJs() {
+        try {
+          var namespace = await browserSystem.import(specifier);
 
-          var executeFile = _async$6(function (specifier) {
-            var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-                _ref3$transferableNam = _ref3.transferableNamespace,
-                transferableNamespace = _ref3$transferableNam === void 0 ? false : _ref3$transferableNam,
-                _ref3$errorExposureIn = _ref3.errorExposureInConsole,
-                errorExposureInConsole = _ref3$errorExposureIn === void 0 ? true : _ref3$errorExposureIn,
-                _ref3$errorExposureIn2 = _ref3.errorExposureInNotification,
-                errorExposureInNotification = _ref3$errorExposureIn2 === void 0 ? false : _ref3$errorExposureIn2,
-                _ref3$errorExposureIn3 = _ref3.errorExposureInDocument,
-                errorExposureInDocument = _ref3$errorExposureIn3 === void 0 ? true : _ref3$errorExposureIn3,
-                _ref3$executionExposu = _ref3.executionExposureOnWindow,
-                executionExposureOnWindow = _ref3$executionExposu === void 0 ? false : _ref3$executionExposu,
-                _ref3$errorTransform = _ref3.errorTransform,
-                errorTransform = _ref3$errorTransform === void 0 ? function (error) {
-              return error;
-            } : _ref3$errorTransform,
-                measurePerformance = _ref3.measurePerformance;
-
-            return _await$6(memoizedCreateBrowserSystem({
-              compileServerOrigin: compileServerOrigin,
-              compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
-              fetchSource: fetchSource,
-              importResolver: importResolver
-            }), function (browserSystem) {
-              var importUsingSystemJs = _async$6(function () {
-                return _catch$3(function () {
-                  return _await$6(browserSystem.import(specifier), function (namespace) {
-                    if (transferableNamespace) {
-                      namespace = makeNamespaceTransferable(namespace);
-                    }
-
-                    return {
-                      status: "completed",
-                      namespace: namespace,
-                      coverage: readCoverage()
-                    };
-                  });
-                }, function (error) {
-                  var transformedError;
-                  return _continue$1(_catch$3(function () {
-                    return _await$6(errorTransform(error), function (_errorTransform) {
-                      transformedError = _errorTransform;
-                    });
-                  }, function () {
-                    transformedError = error;
-                  }), function () {
-                    if (errorExposureInConsole) {
-                      displayErrorInConsole(transformedError);
-                    }
-
-                    if (errorExposureInNotification) {
-                      displayErrorNotification(transformedError);
-                    }
-
-                    if (errorExposureInDocument) {
-                      displayErrorInDocument(transformedError);
-                    }
-
-                    return {
-                      status: "errored",
-                      exceptionSource: unevalException(transformedError),
-                      coverage: readCoverage()
-                    };
-                  });
-                });
-              });
-
-              return _await$6(measurePerformance ? measureAsyncFnPerf(importUsingSystemJs, "jsenv_file_import") : importUsingSystemJs(), function (executionResult) {
-                if (executionExposureOnWindow) {
-                  window.__executionResult__ = executionResult;
-                }
-
-                return executionResult;
-              });
-            });
-          });
+          if (transferableNamespace) {
+            namespace = makeNamespaceTransferable(namespace);
+          }
 
           return {
-            compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
-            importFile: importFile,
-            executeFile: executeFile
+            status: "completed",
+            namespace: namespace,
+            coverage: readCoverage()
           };
-        });
-      });
-    });
-  });
+        } catch (error) {
+          var transformedError;
+
+          try {
+            transformedError = await errorTransform(error);
+          } catch (e) {
+            transformedError = error;
+          }
+
+          if (errorExposureInConsole) {
+            displayErrorInConsole(transformedError);
+          }
+
+          if (errorExposureInNotification) {
+            displayErrorNotification(transformedError);
+          }
+
+          if (errorExposureInDocument) {
+            displayErrorInDocument(transformedError);
+          }
+
+          return {
+            status: "errored",
+            exceptionSource: unevalException(transformedError),
+            coverage: readCoverage()
+          };
+        }
+      };
+
+      var executionResult = await (measurePerformance ? measureAsyncFnPerf(importUsingSystemJs, "jsenv_file_import") : importUsingSystemJs());
+
+      if (executionExposureOnWindow) {
+        window.__executionResult__ = executionResult;
+      }
+
+      return executionResult;
+    };
+
+    return {
+      compileDirectoryRelativeUrl: compileDirectoryRelativeUrl,
+      importFile: importFile,
+      executeFile: executeFile
+    };
+  };
 
   var readCoverage = function readCoverage() {
     return window.__coverage__;
@@ -3889,44 +3617,7 @@
     return string.replace(/\\/g, "/");
   };
 
-  function _await$5(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  function _invoke$3(body, then) {
-    var result = body();
-
-    if (result && result.then) {
-      return result.then(then);
-    }
-
-    return then(result);
-  }
-
-  function _async$5(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
-  var remapCallSite = _async$5(function (callSite, _ref) {
-    var _exit = false;
+  var remapCallSite = async function remapCallSite(callSite, _ref) {
     var urlToSourcemapConsumer = _ref.urlToSourcemapConsumer,
         resolveFile = _ref.resolveFile,
         readErrorStack = _ref.readErrorStack,
@@ -3940,80 +3631,71 @@
 
 
     var source = callSite.getFileName() || callSite.getScriptNameOrSourceURL();
-    return _invoke$3(function () {
-      if (source) {
-        var line = callSite.getLineNumber();
-        var column = callSite.getColumnNumber() - 1;
-        return _await$5(remapSourcePosition({
-          source: source,
-          line: line,
-          column: column,
+
+    if (source) {
+      var line = callSite.getLineNumber();
+      var column = callSite.getColumnNumber() - 1;
+      var originalPosition = await remapSourcePosition({
+        source: source,
+        line: line,
+        column: column,
+        resolveFile: resolveFile,
+        urlToSourcemapConsumer: urlToSourcemapConsumer,
+        readErrorStack: readErrorStack,
+        onFailure: onFailure
+      });
+      var callSiteClone = cloneCallSite(callSite);
+
+      callSiteClone.getFunctionName = function () {
+        return originalPosition.name || callSite.getFunctionName();
+      };
+
+      callSiteClone.getFileName = function () {
+        return originalPosition.source;
+      };
+
+      callSiteClone.getLineNumber = function () {
+        return originalPosition.line;
+      };
+
+      callSiteClone.getColumnNumber = function () {
+        return originalPosition.column + 1;
+      };
+
+      callSiteClone.getScriptNameOrSourceURL = function () {
+        return originalPosition.source;
+      };
+
+      return callSiteClone;
+    } // Code called using eval() needs special handling
+
+
+    if (callSite.isEval()) {
+      var origin = callSite.getEvalOrigin();
+
+      if (origin) {
+        var _callSiteClone = cloneCallSite(callSite);
+
+        var originalEvalOrigin = await remapEvalOrigin(origin, {
           resolveFile: resolveFile,
           urlToSourcemapConsumer: urlToSourcemapConsumer,
           readErrorStack: readErrorStack,
           onFailure: onFailure
-        }), function (originalPosition) {
-          var callSiteClone = cloneCallSite(callSite);
+        });
 
-          callSiteClone.getFunctionName = function () {
-            return originalPosition.name || callSite.getFunctionName();
-          };
+        _callSiteClone.getEvalOrigin = function () {
+          return originalEvalOrigin;
+        };
 
-          callSiteClone.getFileName = function () {
-            return originalPosition.source;
-          };
+        return _callSiteClone;
+      }
 
-          callSiteClone.getLineNumber = function () {
-            return originalPosition.line;
-          };
+      return callSite;
+    } // If we get here then we were unable to change the source position
 
-          callSiteClone.getColumnNumber = function () {
-            return originalPosition.column + 1;
-          };
 
-          callSiteClone.getScriptNameOrSourceURL = function () {
-            return originalPosition.source;
-          };
-
-          _exit = true;
-          return callSiteClone;
-        });
-      }
-    }, function (_result) {
-      var _exit2 = false;
-      if (_exit) return _result;
-      // Code called using eval() needs special handling
-      return _invoke$3(function () {
-        if (callSite.isEval()) {
-          var origin = callSite.getEvalOrigin();
-          return _invoke$3(function () {
-            if (origin) {
-              var callSiteClone = cloneCallSite(callSite);
-              return _await$5(remapEvalOrigin(origin, {
-                resolveFile: resolveFile,
-                urlToSourcemapConsumer: urlToSourcemapConsumer,
-                readErrorStack: readErrorStack,
-                onFailure: onFailure
-              }), function (originalEvalOrigin) {
-                callSiteClone.getEvalOrigin = function () {
-                  return originalEvalOrigin;
-                };
-
-                _exit2 = true;
-                return callSiteClone;
-              });
-            }
-          }, function (_result2) {
-            if (_exit2) return _result2;
-            _exit2 = true;
-            return callSite;
-          });
-        }
-      }, function (_result3) {
-        return _exit2 ? _result3 : callSite;
-      }); // If we get here then we were unable to change the source position
-    });
-  });
+    return callSite;
+  };
 
   var cloneCallSite = function cloneCallSite(callSite) {
     var callSiteClone = {};
@@ -4130,53 +3812,45 @@
   // https://code.google.com/p/v8/source/browse/trunk/src/messages.js
 
 
-  var remapEvalOrigin = _async$5(function (origin, _ref3) {
-    var _exit3 = false;
+  var remapEvalOrigin = async function remapEvalOrigin(origin, _ref3) {
     var resolveFile = _ref3.resolveFile,
         urlToSourcemapConsumer = _ref3.urlToSourcemapConsumer,
         onFailure = _ref3.onFailure;
     // Most eval() calls are in this format
     var topLevelEvalMatch = /^eval at ([^(]+) \((.+):(\d+):(\d+)\)$/.exec(origin);
-    return _invoke$3(function () {
-      if (topLevelEvalMatch) {
-        var source = topLevelEvalMatch[2];
-        var line = Number(topLevelEvalMatch[3]);
-        var column = topLevelEvalMatch[4] - 1;
-        return _await$5(remapSourcePosition({
-          source: source,
-          line: line,
-          column: column,
-          resolveFile: resolveFile,
-          urlToSourcemapConsumer: urlToSourcemapConsumer,
-          onFailure: onFailure
-        }), function (originalPosition) {
-          _exit3 = true;
-          return "eval at ".concat(topLevelEvalMatch[1], " (").concat(originalPosition.source, ":").concat(originalPosition.line, ":").concat(originalPosition.column + 1, ")");
-        });
-      }
-    }, function (_result4) {
-      var _exit4 = false;
-      if (_exit3) return _result4;
-      // Parse nested eval() calls using recursion
-      var nestedEvalMatch = /^eval at ([^(]+) \((.+)\)$/.exec(origin);
-      return _invoke$3(function () {
-        if (nestedEvalMatch) {
-          return _await$5(remapEvalOrigin(nestedEvalMatch[2], {
-            resolveFile: resolveFile,
-            urlToSourcemapConsumer: urlToSourcemapConsumer,
-            onFailure: onFailure
-          }), function (originalEvalOrigin) {
-            _exit4 = true;
-            return "eval at ".concat(nestedEvalMatch[1], " (").concat(originalEvalOrigin, ")");
-          });
-        }
-      }, function (_result5) {
-        return _exit4 ? _result5 : origin;
-      }); // Make sure we still return useful information if we didn't find anything
-    });
-  });
 
-  var remapSourcePosition = _async$5(function (_ref4) {
+    if (topLevelEvalMatch) {
+      var source = topLevelEvalMatch[2];
+      var line = Number(topLevelEvalMatch[3]);
+      var column = topLevelEvalMatch[4] - 1;
+      var originalPosition = await remapSourcePosition({
+        source: source,
+        line: line,
+        column: column,
+        resolveFile: resolveFile,
+        urlToSourcemapConsumer: urlToSourcemapConsumer,
+        onFailure: onFailure
+      });
+      return "eval at ".concat(topLevelEvalMatch[1], " (").concat(originalPosition.source, ":").concat(originalPosition.line, ":").concat(originalPosition.column + 1, ")");
+    } // Parse nested eval() calls using recursion
+
+
+    var nestedEvalMatch = /^eval at ([^(]+) \((.+)\)$/.exec(origin);
+
+    if (nestedEvalMatch) {
+      var originalEvalOrigin = await remapEvalOrigin(nestedEvalMatch[2], {
+        resolveFile: resolveFile,
+        urlToSourcemapConsumer: urlToSourcemapConsumer,
+        onFailure: onFailure
+      });
+      return "eval at ".concat(nestedEvalMatch[1], " (").concat(originalEvalOrigin, ")");
+    } // Make sure we still return useful information if we didn't find anything
+
+
+    return origin;
+  };
+
+  var remapSourcePosition = async function remapSourcePosition(_ref4) {
     var source = _ref4.source,
         line = _ref4.line,
         column = _ref4.column,
@@ -4192,30 +3866,30 @@
     var url = sourceToUrl(source, {
       resolveFile: resolveFile
     });
-    return url ? _await$5(urlToSourcemapConsumer(url), function (sourceMapConsumer) {
-      if (!sourceMapConsumer) return position;
+    if (!url) return position;
+    var sourceMapConsumer = await urlToSourcemapConsumer(url);
+    if (!sourceMapConsumer) return position;
 
-      try {
-        var originalPosition = sourceMapConsumer.originalPositionFor(position); // Only return the original position if a matching line was found. If no
-        // matching line is found then we return position instead, which will cause
-        // the stack trace to print the path and line for the compiled file. It is
-        // better to give a precise location in the compiled file than a vague
-        // location in the original file.
-
-        var originalSource = originalPosition.source;
-        if (originalSource === null) return position;
-        originalPosition.source = resolveFile(originalSource, url, {
-          type: "file-original"
-        });
-        return originalPosition;
-      } catch (e) {
-        var _createDetailedMessag;
+    try {
+      var originalPosition = sourceMapConsumer.originalPositionFor(position); // Only return the original position if a matching line was found. If no
+      // matching line is found then we return position instead, which will cause
+      // the stack trace to print the path and line for the compiled file. It is
+      // better to give a precise location in the compiled file than a vague
+      // location in the original file.
+
+      var originalSource = originalPosition.source;
+      if (originalSource === null) return position;
+      originalPosition.source = resolveFile(originalSource, url, {
+        type: "file-original"
+      });
+      return originalPosition;
+    } catch (e) {
+      var _createDetailedMessag;
 
-        onFailure(createDetailedMessage("error while remapping position.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag, "source", source), _defineProperty(_createDetailedMessag, "line", line), _defineProperty(_createDetailedMessag, "column", column), _createDetailedMessag)));
-        return position;
-      }
-    }) : position;
-  });
+      onFailure(createDetailedMessage("error while remapping position.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag, "source", source), _defineProperty(_createDetailedMessag, "line", line), _defineProperty(_createDetailedMessag, "column", column), _createDetailedMessag)));
+      return position;
+    }
+  };
 
   var sourceToUrl = function sourceToUrl(source, _ref5) {
     var resolveFile = _ref5.resolveFile;
@@ -4260,237 +3934,157 @@
     return /^[a-zA-Z]{2,}:/.test(string);
   };
 
-  function _await$4(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
+  var getOriginalCallsites = async function getOriginalCallsites(_ref) {
+    var stack = _ref.stack,
+        resolveFile = _ref.resolveFile,
+        fetchFile = _ref.fetchFile,
+        SourceMapConsumer = _ref.SourceMapConsumer,
+        readErrorStack = _ref.readErrorStack,
+        onFailure = _ref.onFailure;
+    var urlToSourcemapConsumer = memoizeByFirstArgStringValue(async function (stackTraceFileUrl) {
+      if (stackTraceFileUrl.startsWith("node:")) {
+        return null;
+      }
 
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
+      try {
+        var text;
 
-    return then ? value.then(then) : value;
-  }
+        try {
+          var fileResponse = await fetchFile(stackTraceFileUrl);
+          var status = fileResponse.status;
 
-  function _async$4(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
+          if (status !== 200) {
+            if (status === 404) {
+              onFailure("stack trace file not found at ".concat(stackTraceFileUrl));
+            } else {
+              var _createDetailedMessag;
 
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
+              onFailure(createDetailedMessage("unexpected response fetching stack trace file.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "response status", status), _defineProperty(_createDetailedMessag, "response text", fileResponse.body), _defineProperty(_createDetailedMessag, "stack trace file", stackTraceFileUrl), _createDetailedMessag)));
+            }
 
-  function _catch$2(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
-    }
+            return null;
+          }
 
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
+          text = await fileResponse.text();
+        } catch (e) {
+          var _createDetailedMessag2;
 
-    return result;
-  }
+          onFailure(createDetailedMessage("error while fetching stack trace file.", (_createDetailedMessag2 = {}, _defineProperty(_createDetailedMessag2, "fetch error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag2, "stack trace file", stackTraceFileUrl), _createDetailedMessag2)));
+          return null;
+        }
 
-  function _invoke$2(body, then) {
-    var result = body();
+        var jsSourcemapUrl = getJavaScriptSourceMappingUrl(text);
 
-    if (result && result.then) {
-      return result.then(then);
-    }
+        if (!jsSourcemapUrl) {
+          return null;
+        }
 
-    return then(result);
-  }
+        var sourcemapUrl;
+        var sourcemapString;
 
-  function _continue(value, then) {
-    return value && value.then ? value.then(then) : then(value);
-  }
+        if (jsSourcemapUrl.startsWith("data:")) {
+          sourcemapUrl = stackTraceFileUrl;
+          sourcemapString = dataUrlToRawData(parseDataUrl(jsSourcemapUrl));
+        } else {
+          sourcemapUrl = resolveFile(jsSourcemapUrl, stackTraceFileUrl, {
+            type: "source-map"
+          });
 
-  var getOriginalCallsites = _async$4(function (_ref) {
-    var stack = _ref.stack,
-        resolveFile = _ref.resolveFile,
-        fetchFile = _ref.fetchFile,
-        SourceMapConsumer = _ref.SourceMapConsumer,
-        readErrorStack = _ref.readErrorStack,
-        onFailure = _ref.onFailure;
-    var urlToSourcemapConsumer = memoizeByFirstArgStringValue(_async$4(function (stackTraceFileUrl) {
-      var _exit = false;
-      return stackTraceFileUrl.startsWith("node:") ? null : _catch$2(function () {
-        var text;
-        return _continue(_catch$2(function () {
-          return _await$4(fetchFile(stackTraceFileUrl), function (fileResponse) {
-            var status = fileResponse.status;
+          try {
+            var sourcemapResponse = await fetchFile(sourcemapUrl);
+            var _status = sourcemapResponse.status;
 
-            if (status !== 200) {
-              if (status === 404) {
-                onFailure("stack trace file not found at ".concat(stackTraceFileUrl));
+            if (_status !== 200) {
+              if (_status === 404) {
+                onFailure("sourcemap file not found at ".concat(sourcemapUrl));
               } else {
-                var _createDetailedMessag;
+                var _createDetailedMessag3;
 
-                onFailure(createDetailedMessage("unexpected response fetching stack trace file.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "response status", status), _defineProperty(_createDetailedMessag, "response text", fileResponse.body), _defineProperty(_createDetailedMessag, "stack trace file", stackTraceFileUrl), _createDetailedMessag)));
+                onFailure(createDetailedMessage("unexpected response for sourcemap file.", (_createDetailedMessag3 = {}, _defineProperty(_createDetailedMessag3, "response status", _status), _defineProperty(_createDetailedMessag3, "response text", await sourcemapResponse.text()), _defineProperty(_createDetailedMessag3, "sourcemap url", sourcemapUrl), _createDetailedMessag3)));
               }
 
-              _exit = true;
               return null;
             }
 
-            return _await$4(fileResponse.text(), function (_fileResponse$text) {
-              text = _fileResponse$text;
-            });
-          });
-        }, function (e) {
-          var _createDetailedMessag2;
-
-          onFailure(createDetailedMessage("error while fetching stack trace file.", (_createDetailedMessag2 = {}, _defineProperty(_createDetailedMessag2, "fetch error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag2, "stack trace file", stackTraceFileUrl), _createDetailedMessag2)));
-          _exit = true;
-          return null;
-        }), function (_result) {
-          var _exit2 = false;
-          if (_exit) return _result;
-          var jsSourcemapUrl = getJavaScriptSourceMappingUrl(text);
+            sourcemapString = await sourcemapResponse.text();
+          } catch (e) {
+            var _createDetailedMessag4;
 
-          if (!jsSourcemapUrl) {
+            onFailure(createDetailedMessage("error while fetching sourcemap.", (_createDetailedMessag4 = {}, _defineProperty(_createDetailedMessag4, "fetch error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag4, "sourcemap url", sourcemapUrl), _createDetailedMessag4)));
             return null;
           }
+        }
 
-          var sourcemapUrl;
-          var sourcemapString;
-          return _invoke$2(function () {
-            if (jsSourcemapUrl.startsWith("data:")) {
-              sourcemapUrl = stackTraceFileUrl;
-              sourcemapString = dataUrlToRawData(parseDataUrl(jsSourcemapUrl));
-            } else {
-              sourcemapUrl = resolveFile(jsSourcemapUrl, stackTraceFileUrl, {
-                type: "source-map"
-              });
-              return _catch$2(function () {
-                return _await$4(fetchFile(sourcemapUrl), function (sourcemapResponse) {
-                  var _exit3 = false;
-                  var status = sourcemapResponse.status;
-                  return _invoke$2(function () {
-                    if (status !== 200) {
-                      return _invoke$2(function () {
-                        if (status === 404) {
-                          onFailure("sourcemap file not found at ".concat(sourcemapUrl));
-                        } else {
-                          var _temp2 = "unexpected response for sourcemap file.";
-                          return _await$4(sourcemapResponse.text(), function (_sourcemapResponse$te) {
-                            var _createDetailedMessag3;
-
-                            onFailure(createDetailedMessage(_temp2, (_createDetailedMessag3 = {}, _defineProperty(_createDetailedMessag3, "response status", status), _defineProperty(_createDetailedMessag3, "response text", _sourcemapResponse$te), _defineProperty(_createDetailedMessag3, "sourcemap url", sourcemapUrl), _createDetailedMessag3)));
-                          });
-                        }
-                      }, function () {
-                        _exit2 = true;
-                        return null;
-                      });
-                    }
-                  }, function (_result3) {
-                    return _exit3 ? _result3 : _await$4(sourcemapResponse.text(), function (_sourcemapResponse$te2) {
-                      sourcemapString = _sourcemapResponse$te2;
-                    });
-                  });
-                });
-              }, function (e) {
-                var _createDetailedMessag4;
-
-                onFailure(createDetailedMessage("error while fetching sourcemap.", (_createDetailedMessag4 = {}, _defineProperty(_createDetailedMessag4, "fetch error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag4, "sourcemap url", sourcemapUrl), _createDetailedMessag4)));
-                _exit2 = true;
-                return null;
-              });
-            }
-          }, function (_result4) {
-            if (_exit2) return _result4;
-            var sourceMap;
+        var sourceMap;
 
-            try {
-              sourceMap = JSON.parse(sourcemapString);
-            } catch (e) {
-              var _createDetailedMessag5;
+        try {
+          sourceMap = JSON.parse(sourcemapString);
+        } catch (e) {
+          var _createDetailedMessag5;
 
-              onFailure(createDetailedMessage("error while parsing sourcemap.", (_createDetailedMessag5 = {}, _defineProperty(_createDetailedMessag5, "parse error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag5, "sourcemap url", sourcemapUrl), _createDetailedMessag5)));
-              return null;
-            }
+          onFailure(createDetailedMessage("error while parsing sourcemap.", (_createDetailedMessag5 = {}, _defineProperty(_createDetailedMessag5, "parse error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag5, "sourcemap url", sourcemapUrl), _createDetailedMessag5)));
+          return null;
+        }
 
-            var _sourceMap = sourceMap,
-                sourcesContent = _sourceMap.sourcesContent;
+        var _sourceMap = sourceMap,
+            sourcesContent = _sourceMap.sourcesContent;
 
-            if (!sourcesContent) {
-              sourcesContent = [];
-              sourceMap.sourcesContent = sourcesContent;
-            }
+        if (!sourcesContent) {
+          sourcesContent = [];
+          sourceMap.sourcesContent = sourcesContent;
+        }
+
+        var firstSourceMapSourceFailure = null;
+        await Promise.all(sourceMap.sources.map(async function (source, index) {
+          if (index in sourcesContent) return;
+          var sourcemapSourceUrl = resolveFile(source, sourcemapUrl, {
+            type: "source"
+          });
+
+          try {
+            var sourceResponse = await fetchFile(sourcemapSourceUrl);
+            var _status2 = sourceResponse.status;
+
+            if (_status2 !== 200) {
+              var _createDetailedMessag7;
+
+              if (firstSourceMapSourceFailure) return;
+
+              if (_status2 === 404) {
+                var _createDetailedMessag6;
 
-            var firstSourceMapSourceFailure = null;
-            return _await$4(Promise.all(sourceMap.sources.map(_async$4(function (source, index) {
-              if (index in sourcesContent) return;
-              var sourcemapSourceUrl = resolveFile(source, sourcemapUrl, {
-                type: "source"
-              });
-              return _catch$2(function () {
-                return _await$4(fetchFile(sourcemapSourceUrl), function (sourceResponse) {
-                  var _exit4 = false;
-                  var status = sourceResponse.status;
-                  return _invoke$2(function () {
-                    if (status !== 200) {
-                      if (firstSourceMapSourceFailure) {
-                        _exit4 = true;
-                        return;
-                      }
-
-                      if (status === 404) {
-                        var _createDetailedMessag6;
-
-                        firstSourceMapSourceFailure = createDetailedMessage("sourcemap source not found.", (_createDetailedMessag6 = {}, _defineProperty(_createDetailedMessag6, "sourcemap source url", sourcemapSourceUrl), _defineProperty(_createDetailedMessag6, "sourcemap url", sourcemapUrl), _createDetailedMessag6));
-                        _exit4 = true;
-                        return;
-                      }
-
-                      var _temp4 = "unexpected response for sourcemap source.";
-                      return _await$4(sourceResponse.text(), function (_sourceResponse$text) {
-                        var _createDetailedMessag7;
-
-                        firstSourceMapSourceFailure = createDetailedMessage(_temp4, (_createDetailedMessag7 = {}, _defineProperty(_createDetailedMessag7, "response status", status), _defineProperty(_createDetailedMessag7, "response text", _sourceResponse$text), _defineProperty(_createDetailedMessag7, "sourcemap source url", sourcemapSourceUrl), _defineProperty(_createDetailedMessag7, "sourcemap url", sourcemapUrl), _createDetailedMessag7));
-                        _exit4 = true;
-                      });
-                    }
-                  }, function (_result6) {
-                    return _exit4 ? _result6 : _await$4(sourceResponse.text(), function (sourceString) {
-                      sourcesContent[index] = sourceString;
-                    });
-                  });
-                });
-              }, function (e) {
-                var _createDetailedMessag8;
-
-                if (firstSourceMapSourceFailure) return;
-                firstSourceMapSourceFailure = createDetailedMessage("error while fetching sourcemap source.", (_createDetailedMessag8 = {}, _defineProperty(_createDetailedMessag8, "fetch error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag8, "sourcemap source url", sourcemapSourceUrl), _defineProperty(_createDetailedMessag8, "sourcemap url", sourcemapUrl), _createDetailedMessag8));
-              });
-            }))), function () {
-              if (firstSourceMapSourceFailure) {
-                onFailure(firstSourceMapSourceFailure);
-                return null;
+                firstSourceMapSourceFailure = createDetailedMessage("sourcemap source not found.", (_createDetailedMessag6 = {}, _defineProperty(_createDetailedMessag6, "sourcemap source url", sourcemapSourceUrl), _defineProperty(_createDetailedMessag6, "sourcemap url", sourcemapUrl), _createDetailedMessag6));
+                return;
               }
 
-              return new SourceMapConsumer(sourceMap);
-            });
-          });
-        });
-      }, function (e) {
+              firstSourceMapSourceFailure = createDetailedMessage("unexpected response for sourcemap source.", (_createDetailedMessag7 = {}, _defineProperty(_createDetailedMessag7, "response status", _status2), _defineProperty(_createDetailedMessag7, "response text", await sourceResponse.text()), _defineProperty(_createDetailedMessag7, "sourcemap source url", sourcemapSourceUrl), _defineProperty(_createDetailedMessag7, "sourcemap url", sourcemapUrl), _createDetailedMessag7));
+              return;
+            }
+
+            var sourceString = await sourceResponse.text();
+            sourcesContent[index] = sourceString;
+          } catch (e) {
+            var _createDetailedMessag8;
+
+            if (firstSourceMapSourceFailure) return;
+            firstSourceMapSourceFailure = createDetailedMessage("error while fetching sourcemap source.", (_createDetailedMessag8 = {}, _defineProperty(_createDetailedMessag8, "fetch error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag8, "sourcemap source url", sourcemapSourceUrl), _defineProperty(_createDetailedMessag8, "sourcemap url", sourcemapUrl), _createDetailedMessag8));
+          }
+        }));
+
+        if (firstSourceMapSourceFailure) {
+          onFailure(firstSourceMapSourceFailure);
+          return null;
+        }
+
+        return new SourceMapConsumer(sourceMap);
+      } catch (e) {
         var _createDetailedMessag9;
 
         onFailure(createDetailedMessage("error while preparing a sourceMap consumer for a stack trace file.", (_createDetailedMessag9 = {}, _defineProperty(_createDetailedMessag9, "error stack", readErrorStack(e)), _defineProperty(_createDetailedMessag9, "stack trace file", stackTraceFileUrl), _createDetailedMessag9)));
         return null;
-      });
-    }));
-    return Promise.all(stack.map(function (callSite) {
+      }
+    });
+    var originalCallsites = await Promise.all(stack.map(function (callSite) {
       return remapCallSite(callSite, {
         resolveFile: resolveFile,
         urlToSourcemapConsumer: urlToSourcemapConsumer,
@@ -4498,7 +4092,8 @@
         onFailure: onFailure
       });
     }));
-  });
+    return originalCallsites;
+  };
 
   var memoizeByFirstArgStringValue = function memoizeByFirstArgStringValue(fn) {
     var stringValueCache = {};
@@ -4510,56 +4105,6 @@
     };
   };
 
-  function _await$3(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  function _catch$1(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
-    }
-
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
-
-    return result;
-  }
-
-  function _invoke$1(body, then) {
-    var result = body();
-
-    if (result && result.then) {
-      return result.then(then);
-    }
-
-    return then(result);
-  }
-
-  function _async$3(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
   var installErrorStackRemapping = function installErrorStackRemapping(_ref) {
     var fetchFile = _ref.fetchFile,
         resolveFile = _ref.resolveFile,
@@ -4635,9 +4180,7 @@
       });
     };
 
-    var getErrorOriginalStackString = _async$3(function (error) {
-      var _exit = false;
-
+    var getErrorOriginalStackString = async function getErrorOriginalStackString(error) {
       var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
           _ref2$onFailure = _ref2.onFailure,
           onFailure = _ref2$onFailure === void 0 ? function (message) {
@@ -4657,39 +4200,35 @@
 
       var stack = error.stack;
       var promise = errorRemappingCache.get(error);
-      return _invoke$1(function () {
-        if (promise) {
-          return _catch$1(function () {
-            return _await$3(promise, function (originalCallsites) {
-              errorRemapFailureCallbackMap.get(error);
-              var firstCall = originalCallsites[0];
-
-              if (firstCall) {
-                Object.assign(error, {
-                  filename: firstCall.getFileName(),
-                  lineno: firstCall.getLineNumber(),
-                  columnno: firstCall.getColumnNumber()
-                });
-              }
 
-              _exit = true;
-              return stackToString(originalCallsites, {
-                error: error,
-                indent: indent
-              });
+      if (promise) {
+        try {
+          var originalCallsites = await promise;
+          errorRemapFailureCallbackMap.get(error);
+          var firstCall = originalCallsites[0];
+
+          if (firstCall) {
+            Object.assign(error, {
+              filename: firstCall.getFileName(),
+              lineno: firstCall.getLineNumber(),
+              columnno: firstCall.getColumnNumber()
             });
-          }, function (e) {
-            var _createDetailedMessag;
+          }
 
-            onFailure(createDetailedMessage("error while computing original stack.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "stack from error while computing", readErrorStack(e)), _defineProperty(_createDetailedMessag, "stack from error to remap", stack), _createDetailedMessag)));
-            _exit = true;
-            return stack;
+          return stackToString(originalCallsites, {
+            error: error,
+            indent: indent
           });
+        } catch (e) {
+          var _createDetailedMessag;
+
+          onFailure(createDetailedMessage("error while computing original stack.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "stack from error while computing", readErrorStack(e)), _defineProperty(_createDetailedMessag, "stack from error to remap", stack), _createDetailedMessag)));
+          return stack;
         }
-      }, function (_result) {
-        return _exit ? _result : stack;
-      });
-    });
+      }
+
+      return stack;
+    };
 
     install();
     return {
@@ -4700,7 +4239,7 @@
 
   var memoizeFetch = function memoizeFetch(fetchUrl) {
     var urlCache = {};
-    return _async$3(function (url) {
+    return async function (url) {
       if (url in urlCache) {
         return urlCache[url];
       }
@@ -4708,62 +4247,35 @@
       var responsePromise = fetchUrl(url);
       urlCache[url] = responsePromise;
       return responsePromise;
-    });
-  };
-
-  function _await$2(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
-  function _async$2(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
     };
-  }
+  };
 
   var installBrowserErrorStackRemapping = function installBrowserErrorStackRemapping() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     return installErrorStackRemapping(_objectSpread2({
-      fetchFile: _async$2(function (url) {
+      fetchFile: async function fetchFile(url) {
         // browser having Error.captureStackTrace got window.fetch
         // and this executes only when Error.captureStackTrace exists
         // so no need for polyfill or whatever here
-        return _await$2(window.fetch(url), function (response) {
-          // we read response test before anything because once memoized fetch
-          // gets annoying preventing you to read
-          // body multiple times, even using response.clone()
-          return _await$2(response.text(), function (_text) {
-            return {
-              status: response.status,
-              url: response.url,
-              statusText: response.statusText,
-              headers: responseToHeaders(response),
-              text: function text() {
-                return _text;
-              },
-              json: response.json.bind(response),
-              blob: response.blob.bind(response),
-              arrayBuffer: response.arrayBuffer.bind(response)
-            };
-          });
-        });
-      }),
+        var response = await window.fetch(url); // we read response test before anything because once memoized fetch
+        // gets annoying preventing you to read
+        // body multiple times, even using response.clone()
+
+        var _text = await response.text();
+
+        return {
+          status: response.status,
+          url: response.url,
+          statusText: response.statusText,
+          headers: responseToHeaders(response),
+          text: function text() {
+            return _text;
+          },
+          json: response.json.bind(response),
+          blob: response.blob.bind(response),
+          arrayBuffer: response.arrayBuffer.bind(response)
+        };
+      },
       resolveFile: function resolveFile(specifier) {
         var importer = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : window.location.href;
         // browsers having Error.captureStrackTrace got window.URL
@@ -4781,67 +4293,26 @@
     return headers;
   };
 
-  function _await$1(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
+  var fetchAndEvalUsingFetch = async function fetchAndEvalUsingFetch(url) {
+    var response = await fetchUrl(url);
 
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
+    if (response.status >= 200 && response.status <= 299) {
+      var text = await response.text(); // eslint-disable-next-line no-eval
 
-    return then ? value.then(then) : value;
-  }
-
-  function _async$1(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
+      window.eval(appendSourceURL(text, url));
+    } else {
+      var _createDetailedMessag;
 
-  var fetchAndEvalUsingFetch = _async$1(function (url) {
-    return _await$1(fetchUrl(url), function (response) {
-      return function () {
-        if (response.status >= 200 && response.status <= 299) {
-          return _await$1(response.text(), function (text) {
-            // eslint-disable-next-line no-eval
-            window.eval(appendSourceURL(text, url));
-          });
-        } else {
-          return _await$1(response.text(), function (text) {
-            var _createDetailedMessag;
+      var _text = await response.text();
 
-            throw new Error(createDetailedMessage("Unexpected response for script.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "script url", url), _defineProperty(_createDetailedMessag, "response body", text), _defineProperty(_createDetailedMessag, "response status", response.status), _createDetailedMessag)));
-          });
-        }
-      }();
-    });
-  });
+      throw new Error(createDetailedMessage("Unexpected response for script.", (_createDetailedMessag = {}, _defineProperty(_createDetailedMessag, "script url", url), _defineProperty(_createDetailedMessag, "response body", _text), _defineProperty(_createDetailedMessag, "response status", response.status), _createDetailedMessag)));
+    }
+  };
 
   var appendSourceURL = function appendSourceURL(code, sourceURL) {
     return "".concat(code, "\n", "//#", " sourceURL=").concat(sourceURL);
   };
 
-  function _await(value, then, direct) {
-    if (direct) {
-      return then ? then(value) : value;
-    }
-
-    if (!value || !value.then) {
-      value = Promise.resolve(value);
-    }
-
-    return then ? value.then(then) : value;
-  }
-
   var getNavigationStartTime = function getNavigationStartTime() {
     try {
       return window.performance.timing.navigationStart;
@@ -4850,36 +4321,7 @@
     }
   };
 
-  function _async(f) {
-    return function () {
-      for (var args = [], i = 0; i < arguments.length; i++) {
-        args[i] = arguments[i];
-      }
-
-      try {
-        return Promise.resolve(f.apply(this, args));
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-  }
-
   var navigationStartTime = getNavigationStartTime();
-
-  function _catch(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
-    }
-
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
-
-    return result;
-  }
-
   var readyPromise = new Promise(function (resolve) {
     if (document.readyState === "complete") {
       resolve();
@@ -4892,33 +4334,8 @@
       window.addEventListener("load", loadCallback);
     }
   });
-
-  function _call(body, then, direct) {
-    if (direct) {
-      return then ? then(body()) : body();
-    }
-
-    try {
-      var result = Promise.resolve(body());
-      return then ? result.then(then) : result;
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  }
-
   var fileExecutionMap = {};
-
-  function _invoke(body, then) {
-    var result = body();
-
-    if (result && result.then) {
-      return result.then(then);
-    }
-
-    return then(result);
-  }
-
-  var executionResultPromise = readyPromise.then(_async(function () {
+  var executionResultPromise = readyPromise.then(async function () {
     var fileExecutionResultMap = {};
     var fileExecutionResultPromises = [];
     var status = "completed";
@@ -4937,52 +4354,50 @@
         }
       });
     });
-    return _await(Promise.all(fileExecutionResultPromises), function () {
-      return _objectSpread2(_objectSpread2({
-        status: status
-      }, status === "errored" ? {
-        exceptionSource: exceptionSource
-      } : {}), {}, {
-        startTime: navigationStartTime,
-        endTime: Date.now(),
-        fileExecutionResultMap: fileExecutionResultMap
-      });
+    await Promise.all(fileExecutionResultPromises);
+    return _objectSpread2(_objectSpread2({
+      status: status
+    }, status === "errored" ? {
+      exceptionSource: exceptionSource
+    } : {}), {}, {
+      startTime: navigationStartTime,
+      endTime: Date.now(),
+      fileExecutionResultMap: fileExecutionResultMap
     });
-  }));
+  });
 
-  var executeFileUsingDynamicImport = _async(function (specifier) {
+  var executeFileUsingDynamicImport = async function executeFileUsingDynamicImport(specifier) {
     var identifier = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : specifier;
     var _document = document,
         currentScript = _document.currentScript;
 
-    var fileExecutionResultPromise = _async(function () {
-      return _catch(function () {
+    var fileExecutionResultPromise = async function () {
+      try {
         var url = new URL(specifier, document.location.href).href;
         performance.mark("jsenv_file_import_start");
-        return _await(import(url), function (namespace) {
-          performance.measure("jsenv_file_import", "jsenv_file_import_start");
-          var executionResult = {
-            status: "completed",
-            namespace: namespace
-          };
-          return executionResult;
-        });
-      }, function (e) {
+        var namespace = await import(url);
         performance.measure("jsenv_file_import", "jsenv_file_import_start");
         var executionResult = {
+          status: "completed",
+          namespace: namespace
+        };
+        return executionResult;
+      } catch (e) {
+        performance.measure("jsenv_file_import", "jsenv_file_import_start");
+        var _executionResult = {
           status: "errored",
           exceptionSource: unevalException(e)
         };
-        onExecutionError(executionResult, {
+        onExecutionError(_executionResult, {
           currentScript: currentScript
         });
-        return executionResult;
-      });
-    })();
+        return _executionResult;
+      }
+    }();
 
     fileExecutionMap[identifier] = fileExecutionResultPromise;
     return fileExecutionResultPromise;
-  });
+  };
 
   var executeFileUsingSystemJs = function executeFileUsingSystemJs(specifier) {
     // si on a déja importer ce fichier ??
@@ -4991,21 +4406,20 @@
     var _document2 = document,
         currentScript = _document2.currentScript;
 
-    var fileExecutionResultPromise = function () {
-      return _call(getBrowserRuntime, function (browserRuntime) {
-        return _await(browserRuntime.executeFile(specifier, {
-          measurePerformance: true,
-          collectPerformance: true
-        }), function (executionResult) {
-          if (executionResult.status === "errored") {
-            onExecutionError(executionResult, {
-              currentScript: currentScript
-            });
-          }
+    var fileExecutionResultPromise = async function () {
+      var browserRuntime = await getBrowserRuntime();
+      var executionResult = await browserRuntime.executeFile(specifier, {
+        measurePerformance: true,
+        collectPerformance: true
+      });
 
-          return executionResult;
+      if (executionResult.status === "errored") {
+        onExecutionError(executionResult, {
+          currentScript: currentScript
         });
-      });
+      }
+
+      return executionResult;
     }();
 
     fileExecutionMap[specifier] = fileExecutionResultPromise;
@@ -5042,60 +4456,57 @@
     }
   };
 
-  var getBrowserRuntime = memoize(_async(function () {
+  var getBrowserRuntime = memoize(async function () {
     var compileServerOrigin = document.location.origin;
-    return _await(fetchUrl("".concat(compileServerOrigin, "/.jsenv/compile-meta.json")), function (compileMetaResponse) {
-      return _await(compileMetaResponse.json(), function (compileMeta) {
-        var outDirectoryRelativeUrl = compileMeta.outDirectoryRelativeUrl,
-            errorStackRemapping = compileMeta.errorStackRemapping;
-        var outDirectoryUrl = "".concat(compileServerOrigin, "/").concat(outDirectoryRelativeUrl);
-        var afterOutDirectory = document.location.href.slice(outDirectoryUrl.length);
-        var parts = afterOutDirectory.split("/");
-        var compileId = parts[0];
-        return _await(createBrowserRuntime({
-          compileServerOrigin: compileServerOrigin,
-          outDirectoryRelativeUrl: outDirectoryRelativeUrl,
-          compileId: compileId
-        }), function (browserRuntime) {
-          return _invoke(function () {
-            if (errorStackRemapping && Error.captureStackTrace) {
-              var sourcemapMainFileRelativeUrl = compileMeta.sourcemapMainFileRelativeUrl,
-                  sourcemapMappingFileRelativeUrl = compileMeta.sourcemapMappingFileRelativeUrl;
-              return _await(fetchAndEvalUsingFetch("".concat(compileServerOrigin, "/").concat(sourcemapMainFileRelativeUrl)), function () {
-                var SourceMapConsumer = window.sourceMap.SourceMapConsumer;
-                SourceMapConsumer.initialize({
-                  "lib/mappings.wasm": "".concat(compileServerOrigin, "/").concat(sourcemapMappingFileRelativeUrl)
-                });
-
-                var _installBrowserErrorS = installBrowserErrorStackRemapping({
-                  SourceMapConsumer: SourceMapConsumer
-                }),
-                    getErrorOriginalStackString = _installBrowserErrorS.getErrorOriginalStackString;
-
-                var errorTransform = _async(function (error) {
-                  return !error || !(error instanceof Error) ? error : _await(getErrorOriginalStackString(error), function (originalStack) {
-                    error.stack = originalStack;
-                    return error;
-                  });
-                });
-
-                var executeFile = browserRuntime.executeFile;
-
-                browserRuntime.executeFile = function (file) {
-                  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-                  return executeFile(file, _objectSpread2({
-                    errorTransform: errorTransform
-                  }, options));
-                };
-              });
-            }
-          }, function () {
-            return browserRuntime;
-          });
-        });
-      });
+    var compileMetaResponse = await fetchUrl("".concat(compileServerOrigin, "/.jsenv/compile-meta.json"));
+    var compileMeta = await compileMetaResponse.json();
+    var outDirectoryRelativeUrl = compileMeta.outDirectoryRelativeUrl,
+        errorStackRemapping = compileMeta.errorStackRemapping;
+    var outDirectoryUrl = "".concat(compileServerOrigin, "/").concat(outDirectoryRelativeUrl);
+    var afterOutDirectory = document.location.href.slice(outDirectoryUrl.length);
+    var parts = afterOutDirectory.split("/");
+    var compileId = parts[0];
+    var browserRuntime = await createBrowserRuntime({
+      compileServerOrigin: compileServerOrigin,
+      outDirectoryRelativeUrl: outDirectoryRelativeUrl,
+      compileId: compileId
     });
-  }));
+
+    if (errorStackRemapping && Error.captureStackTrace) {
+      var sourcemapMainFileRelativeUrl = compileMeta.sourcemapMainFileRelativeUrl,
+          sourcemapMappingFileRelativeUrl = compileMeta.sourcemapMappingFileRelativeUrl;
+      await fetchAndEvalUsingFetch("".concat(compileServerOrigin, "/").concat(sourcemapMainFileRelativeUrl));
+      var SourceMapConsumer = window.sourceMap.SourceMapConsumer;
+      SourceMapConsumer.initialize({
+        "lib/mappings.wasm": "".concat(compileServerOrigin, "/").concat(sourcemapMappingFileRelativeUrl)
+      });
+
+      var _installBrowserErrorS = installBrowserErrorStackRemapping({
+        SourceMapConsumer: SourceMapConsumer
+      }),
+          getErrorOriginalStackString = _installBrowserErrorS.getErrorOriginalStackString;
+
+      var errorTransform = async function errorTransform(error) {
+        // code can throw something else than an error
+        // in that case return it unchanged
+        if (!error || !(error instanceof Error)) return error;
+        var originalStack = await getErrorOriginalStackString(error);
+        error.stack = originalStack;
+        return error;
+      };
+
+      var executeFile = browserRuntime.executeFile;
+
+      browserRuntime.executeFile = function (file) {
+        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+        return executeFile(file, _objectSpread2({
+          errorTransform: errorTransform
+        }, options));
+      };
+    }
+
+    return browserRuntime;
+  });
   window.__jsenv__ = {
     executionResultPromise: executionResultPromise,
     executeFileUsingDynamicImport: executeFileUsingDynamicImport,