@merkur/integration 0.29.2 → 0.30.0

package/lib/index.cjs

@@ -52,22 +52,15 @@ function _loadScript(asset, root) {
     const scriptElement = root.querySelector(`script[src='${asset.source}']`);
 
     if (scriptElement) {
-      if (
-        (performance &&
-          performance.getEntriesByName &&
-          performance
-            .getEntriesByName(scriptElement.src)
-            .find(
-              (entry) => entry.entryType === 'resource' && entry.responseEnd
-            )) ||
-        !performance ||
-        !performance.getEntriesByName
-      ) {
-        setTimeout(resolve, 0);
-        return;
+      if (!asset.test) {
+        resolve();
       }
 
       scriptElement.addEventListener('load', resolve);
+      scriptElement.addEventListener(
+        'error',
+        asset.optional ? resolve : reject
+      );
       return;
     }
 
@@ -144,7 +137,7 @@ function loadStyleAssets(assets, root = document.head) {
   return Promise.all(stylesToRender.map((asset) => _loadStyle(asset, root)));
 }
 
-function loadScriptAssets(assets, root = document.head) {
+async function loadScriptAssets(assets, root = document.head) {
   const scriptElements = root.querySelectorAll('script');
   const scriptsToRender = assets.reduce((scripts, asset) => {
     const { source } = asset;
@@ -164,9 +157,16 @@ function loadScriptAssets(assets, root = document.head) {
       }
 
       if (!_asset.source) {
-        console.warn(
-          `Asset '${_asset.name}' is missing ES variant and could not be loaded.`
-        );
+        const message = `Asset '${_asset.name}' is missing ES variant and could not be loaded.`;
+
+        if (!_asset.optional) {
+          const error = new Error(message);
+          error.asset = _asset;
+
+          throw error;
+        }
+
+        console.warn(message);
         return scripts;
       }
     }

package/lib/index.es5.js

@@ -1 +1 @@
-"use strict";var e,r;require("core-js/modules/es.object.define-property.js"),require("core-js/modules/es.regexp.exec.js"),require("core-js/modules/es.object.values.js"),require("core-js/modules/es.object.to-string.js"),require("core-js/modules/es.promise.js"),require("core-js/modules/es.array.find.js"),require("core-js/modules/web.timers.js"),require("core-js/modules/es.object.keys.js"),require("core-js/modules/es.array.filter.js"),require("core-js/modules/es.array.reduce.js"),require("core-js/modules/es.array.from.js"),require("core-js/modules/es.string.iterator.js"),require("core-js/modules/es.array.iterator.js"),require("core-js/modules/web.dom-collections.iterator.js"),require("core-js/modules/es.array.map.js"),require("core-js/modules/es.object.assign.js"),require("core-js/modules/es.function.name.js"),Object.defineProperty(exports,"__esModule",{value:!0});var t={isES9Supported:function(){return void 0===e&&(e=t.test("return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()")&&!!Object.values),e},isES11Supported:function(){return void 0===r&&(r=t.test("return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()")&&t.test('return typeof Promise.allSettled === "function"')&&t.test('return typeof globalThis !== "undefined"')&&t.test('return typeof 9007199254740991n === "bigint"')),r},test:function(e){try{return!!new Function(e)()}catch(e){return!1}}};function s(e,r){return new Promise((function(t,s){var o=r.querySelector("script[src='".concat(e.source,"']"));if(o)return performance&&performance.getEntriesByName&&performance.getEntriesByName(o.src).find((function(e){return"resource"===e.entryType&&e.responseEnd}))||!performance||!performance.getEntriesByName?void setTimeout(t,0):void o.addEventListener("load",t);var n=document.createElement("script");if("script"===e.type){n.defer=!0,n.onload=t,n.onerror=e.optional?t:s,n.src=e.source;var u=e.attr;if(u&&Object.keys(u).length)for(var c in u){var i=u[c];"boolean"==typeof i?i?n.setAttribute(c,""):n.removeAttribute(c):n.setAttribute(c,i)}}else n.text=e.source,t();r.appendChild(n)}))}function o(e,r){return new Promise((function(t,s){if("stylesheet"===e.type){var o=document.createElement("link");o.onload=t,o.onerror=s,o.rel="stylesheet",o.href=e.source,r.appendChild(o)}else{var n=document.createElement("style");n.innerHTML=e.source,r.appendChild(n),t()}}))}function n(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,t=r.querySelectorAll("style"),s=e.filter((function(e){return e.source&&("stylesheet"===e.type&&!r.querySelector("link[href='".concat(e.source,"']"))||"inlineStyle"===e.type&&Array.from(t).reduce((function(r,t){return t.innerHTML!==e.source&&r}),!0))}));return Promise.all(s.map((function(e){return o(e,r)})))}function u(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,o=r.querySelectorAll("script"),n=e.reduce((function(e,r){var s=r.source,n=Object.assign({},r);return"script"!==n.type&&"inlineScript"!==n.type?e:s!==Object(s)||(s.es11&&t.isES11Supported()?n.source=s.es11:s.es9&&t.isES9Supported()?n.source=s.es9:n.source=s.es5,n.source)?(Array.from(o).reduce((function(e,r){return r.text===n.source||e}),!1)||n.test&&t.test(n.test)||e.push(n),e):(console.warn("Asset '".concat(n.name,"' is missing ES variant and could not be loaded.")),e)}),[]);return Promise.all(n.map((function(e){return s(e,r)})))}exports.loadAssets=function(e,r){return Promise.all([u(e,r),n(e,r)])},exports.loadScriptAssets=u,exports.loadStyleAssets=n,exports.testScript=t;
+"use strict";function e(t){return e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},e(t)}function t(){/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */t=function(){return r};var r={},o=Object.prototype,n=o.hasOwnProperty,i=Object.defineProperty||function(e,t,r){e[t]=r.value},s="function"==typeof Symbol?Symbol:{},u=s.iterator||"@@iterator",c=s.asyncIterator||"@@asyncIterator",a=s.toStringTag||"@@toStringTag";function l(e,t,r){return Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}),e[t]}try{l({},"")}catch(e){l=function(e,t,r){return e[t]=r}}function f(e,t,r,o){var n=t&&t.prototype instanceof d?t:d,s=Object.create(n.prototype),u=new O(o||[]);return i(s,"_invoke",{value:q(e,r,u)}),s}function h(e,t,r){try{return{type:"normal",arg:e.call(t,r)}}catch(e){return{type:"throw",arg:e}}}r.wrap=f;var p={};function d(){}function y(){}function m(){}var v={};l(v,u,(function(){return this}));var j=Object.getPrototypeOf,g=j&&j(j(_([])));g&&g!==o&&n.call(g,u)&&(v=g);var b=m.prototype=d.prototype=Object.create(v);function w(e){["next","throw","return"].forEach((function(t){l(e,t,(function(e){return this._invoke(t,e)}))}))}function x(t,r){function o(i,s,u,c){var a=h(t[i],t,s);if("throw"!==a.type){var l=a.arg,f=l.value;return f&&"object"==e(f)&&n.call(f,"__await")?r.resolve(f.__await).then((function(e){o("next",e,u,c)}),(function(e){o("throw",e,u,c)})):r.resolve(f).then((function(e){l.value=e,u(l)}),(function(e){return o("throw",e,u,c)}))}c(a.arg)}var s;i(this,"_invoke",{value:function(e,t){function n(){return new r((function(r,n){o(e,t,r,n)}))}return s=s?s.then(n,n):n()}})}function q(e,t,r){var o="suspendedStart";return function(n,i){if("executing"===o)throw new Error("Generator is already running");if("completed"===o){if("throw"===n)throw i;return P()}for(r.method=n,r.arg=i;;){var s=r.delegate;if(s){var u=E(s,r);if(u){if(u===p)continue;return u}}if("next"===r.method)r.sent=r._sent=r.arg;else if("throw"===r.method){if("suspendedStart"===o)throw o="completed",r.arg;r.dispatchException(r.arg)}else"return"===r.method&&r.abrupt("return",r.arg);o="executing";var c=h(e,t,r);if("normal"===c.type){if(o=r.done?"completed":"suspendedYield",c.arg===p)continue;return{value:c.arg,done:r.done}}"throw"===c.type&&(o="completed",r.method="throw",r.arg=c.arg)}}}function E(e,t){var r=e.iterator[t.method];if(void 0===r){if(t.delegate=null,"throw"===t.method){if(e.iterator.return&&(t.method="return",t.arg=void 0,E(e,t),"throw"===t.method))return p;t.method="throw",t.arg=new TypeError("The iterator does not provide a 'throw' method")}return p}var o=h(r,e.iterator,t.arg);if("throw"===o.type)return t.method="throw",t.arg=o.arg,t.delegate=null,p;var n=o.arg;return n?n.done?(t[e.resultName]=n.value,t.next=e.nextLoc,"return"!==t.method&&(t.method="next",t.arg=void 0),t.delegate=null,p):n:(t.method="throw",t.arg=new TypeError("iterator result is not an object"),t.delegate=null,p)}function L(e){var t={tryLoc:e[0]};1 in e&&(t.catchLoc=e[1]),2 in e&&(t.finallyLoc=e[2],t.afterLoc=e[3]),this.tryEntries.push(t)}function S(e){var t=e.completion||{};t.type="normal",delete t.arg,e.completion=t}function O(e){this.tryEntries=[{tryLoc:"root"}],e.forEach(L,this),this.reset(!0)}function _(e){if(e){var t=e[u];if(t)return t.call(e);if("function"==typeof e.next)return e;if(!isNaN(e.length)){var r=-1,o=function t(){for(;++r<e.length;)if(n.call(e,r))return t.value=e[r],t.done=!1,t;return t.value=void 0,t.done=!0,t};return o.next=o}}return{next:P}}function P(){return{value:void 0,done:!0}}return y.prototype=m,i(b,"constructor",{value:m,configurable:!0}),i(m,"constructor",{value:y,configurable:!0}),y.displayName=l(m,a,"GeneratorFunction"),r.isGeneratorFunction=function(e){var t="function"==typeof e&&e.constructor;return!!t&&(t===y||"GeneratorFunction"===(t.displayName||t.name))},r.mark=function(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,m):(e.__proto__=m,l(e,a,"GeneratorFunction")),e.prototype=Object.create(b),e},r.awrap=function(e){return{__await:e}},w(x.prototype),l(x.prototype,c,(function(){return this})),r.AsyncIterator=x,r.async=function(e,t,o,n,i){void 0===i&&(i=Promise);var s=new x(f(e,t,o,n),i);return r.isGeneratorFunction(t)?s:s.next().then((function(e){return e.done?e.value:s.next()}))},w(b),l(b,a,"Generator"),l(b,u,(function(){return this})),l(b,"toString",(function(){return"[object Generator]"})),r.keys=function(e){var t=Object(e),r=[];for(var o in t)r.push(o);return r.reverse(),function e(){for(;r.length;){var o=r.pop();if(o in t)return e.value=o,e.done=!1,e}return e.done=!0,e}},r.values=_,O.prototype={constructor:O,reset:function(e){if(this.prev=0,this.next=0,this.sent=this._sent=void 0,this.done=!1,this.delegate=null,this.method="next",this.arg=void 0,this.tryEntries.forEach(S),!e)for(var t in this)"t"===t.charAt(0)&&n.call(this,t)&&!isNaN(+t.slice(1))&&(this[t]=void 0)},stop:function(){this.done=!0;var e=this.tryEntries[0].completion;if("throw"===e.type)throw e.arg;return this.rval},dispatchException:function(e){if(this.done)throw e;var t=this;function r(r,o){return s.type="throw",s.arg=e,t.next=r,o&&(t.method="next",t.arg=void 0),!!o}for(var o=this.tryEntries.length-1;o>=0;--o){var i=this.tryEntries[o],s=i.completion;if("root"===i.tryLoc)return r("end");if(i.tryLoc<=this.prev){var u=n.call(i,"catchLoc"),c=n.call(i,"finallyLoc");if(u&&c){if(this.prev<i.catchLoc)return r(i.catchLoc,!0);if(this.prev<i.finallyLoc)return r(i.finallyLoc)}else if(u){if(this.prev<i.catchLoc)return r(i.catchLoc,!0)}else{if(!c)throw new Error("try statement without catch or finally");if(this.prev<i.finallyLoc)return r(i.finallyLoc)}}}},abrupt:function(e,t){for(var r=this.tryEntries.length-1;r>=0;--r){var o=this.tryEntries[r];if(o.tryLoc<=this.prev&&n.call(o,"finallyLoc")&&this.prev<o.finallyLoc){var i=o;break}}i&&("break"===e||"continue"===e)&&i.tryLoc<=t&&t<=i.finallyLoc&&(i=null);var s=i?i.completion:{};return s.type=e,s.arg=t,i?(this.method="next",this.next=i.finallyLoc,p):this.complete(s)},complete:function(e,t){if("throw"===e.type)throw e.arg;return"break"===e.type||"continue"===e.type?this.next=e.arg:"return"===e.type?(this.rval=this.arg=e.arg,this.method="return",this.next="end"):"normal"===e.type&&t&&(this.next=t),p},finish:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t];if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),S(r),p}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t];if(r.tryLoc===e){var o=r.completion;if("throw"===o.type){var n=o.arg;S(r)}return n}}throw new Error("illegal catch attempt")},delegateYield:function(e,t,r){return this.delegate={iterator:_(e),resultName:t,nextLoc:r},"next"===this.method&&(this.arg=void 0),p}},r}function r(e,t,r,o,n,i,s){try{var u=e[i](s),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(o,n)}function o(e){return function(){var t=this,o=arguments;return new Promise((function(n,i){var s=e.apply(t,o);function u(e){r(s,n,i,u,c,"next",e)}function c(e){r(s,n,i,u,c,"throw",e)}u(void 0)}))}}var n,i;require("core-js/modules/es.object.define-property.js"),require("core-js/modules/es.regexp.exec.js"),require("core-js/modules/es.object.values.js"),require("core-js/modules/es.object.to-string.js"),require("core-js/modules/es.promise.js"),require("core-js/modules/es.object.keys.js"),require("core-js/modules/es.array.filter.js"),require("core-js/modules/es.array.reduce.js"),require("core-js/modules/es.array.from.js"),require("core-js/modules/es.string.iterator.js"),require("core-js/modules/es.array.iterator.js"),require("core-js/modules/web.dom-collections.iterator.js"),require("core-js/modules/es.array.map.js"),require("core-js/modules/es.object.assign.js"),require("core-js/modules/es.function.name.js"),require("core-js/modules/es.symbol.js"),require("core-js/modules/es.symbol.description.js"),require("core-js/modules/es.symbol.iterator.js"),require("core-js/modules/es.symbol.async-iterator.js"),require("core-js/modules/es.symbol.to-string-tag.js"),require("core-js/modules/es.json.to-string-tag.js"),require("core-js/modules/es.math.to-string-tag.js"),require("core-js/modules/es.object.create.js"),require("core-js/modules/es.object.get-prototype-of.js"),require("core-js/modules/es.array.for-each.js"),require("core-js/modules/web.dom-collections.for-each.js"),require("core-js/modules/es.object.set-prototype-of.js"),require("core-js/modules/es.array.reverse.js"),require("core-js/modules/es.array.slice.js"),Object.defineProperty(exports,"__esModule",{value:!0});var s={isES9Supported:function(){return void 0===n&&(n=s.test("return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()")&&!!Object.values),n},isES11Supported:function(){return void 0===i&&(i=s.test("return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()")&&s.test('return typeof Promise.allSettled === "function"')&&s.test('return typeof globalThis !== "undefined"')&&s.test('return typeof 9007199254740991n === "bigint"')),i},test:function(e){try{return!!new Function(e)()}catch(e){return!1}}};function u(e,t){return new Promise((function(r,o){var n=t.querySelector("script[src='".concat(e.source,"']"));if(n)return e.test||r(),n.addEventListener("load",r),void n.addEventListener("error",e.optional?r:o);var i=document.createElement("script");if("script"===e.type){i.defer=!0,i.onload=r,i.onerror=e.optional?r:o,i.src=e.source;var s=e.attr;if(s&&Object.keys(s).length)for(var u in s){var c=s[u];"boolean"==typeof c?c?i.setAttribute(u,""):i.removeAttribute(u):i.setAttribute(u,c)}}else i.text=e.source,r();t.appendChild(i)}))}function c(e,t){return new Promise((function(r,o){if("stylesheet"===e.type){var n=document.createElement("link");n.onload=r,n.onerror=o,n.rel="stylesheet",n.href=e.source,t.appendChild(n)}else{var i=document.createElement("style");i.innerHTML=e.source,t.appendChild(i),r()}}))}function a(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("style"),o=e.filter((function(e){return e.source&&("stylesheet"===e.type&&!t.querySelector("link[href='".concat(e.source,"']"))||"inlineStyle"===e.type&&Array.from(r).reduce((function(t,r){return r.innerHTML!==e.source&&t}),!0))}));return Promise.all(o.map((function(e){return c(e,t)})))}function l(e){return f.apply(this,arguments)}function f(){return f=o(t().mark((function e(r){var o,n,i,c=arguments;return t().wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return o=c.length>1&&void 0!==c[1]?c[1]:document.head,n=o.querySelectorAll("script"),i=r.reduce((function(e,t){var r=t.source,o=Object.assign({},t);if("script"!==o.type&&"inlineScript"!==o.type)return e;if(r===Object(r)&&(r.es11&&s.isES11Supported()?o.source=r.es11:r.es9&&s.isES9Supported()?o.source=r.es9:o.source=r.es5,!o.source)){var i="Asset '".concat(o.name,"' is missing ES variant and could not be loaded.");if(!o.optional){var u=new Error(i);throw u.asset=o,u}return console.warn(i),e}return Array.from(n).reduce((function(e,t){return t.text===o.source||e}),!1)||o.test&&s.test(o.test)||e.push(o),e}),[]),e.abrupt("return",Promise.all(i.map((function(e){return u(e,o)}))));case 4:case"end":return e.stop()}}),e)}))),f.apply(this,arguments)}exports.loadAssets=function(e,t){return Promise.all([l(e,t),a(e,t)])},exports.loadScriptAssets=l,exports.loadStyleAssets=a,exports.testScript=s;

package/lib/index.es9.cjs

@@ -3,27 +3,20 @@
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-
 let _isES9Supported;
-
 let _isES11Supported;
-
 function isES9Supported() {
   if (_isES9Supported === undefined) {
     _isES9Supported = exported.test('return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()') && !!Object.values;
   }
-
   return _isES9Supported;
 }
-
 function isES11Supported() {
   if (_isES11Supported === undefined) {
     _isES11Supported = exported.test('return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()') && exported.test('return typeof Promise.allSettled === "function"') && exported.test('return typeof globalThis !== "undefined"') && exported.test('return typeof 9007199254740991n === "bigint"');
   }
-
   return _isES11Supported;
 }
-
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -33,29 +26,23 @@ function test(snippet) {
     return false;
   }
 }
-
 const exported = {
   isES9Supported,
   isES11Supported,
   test
 };
-
 function _loadScript(asset, root) {
   return new Promise((resolve, reject) => {
     const scriptElement = root.querySelector(`script[src='${asset.source}']`);
-
     if (scriptElement) {
-      if (performance && performance.getEntriesByName && performance.getEntriesByName(scriptElement.src).find(entry => entry.entryType === 'resource' && entry.responseEnd) || !performance || !performance.getEntriesByName) {
-        setTimeout(resolve, 0);
-        return;
+      if (!asset.test) {
+        resolve();
       }
-
       scriptElement.addEventListener('load', resolve);
+      scriptElement.addEventListener('error', asset.optional ? resolve : reject);
       return;
     }
-
     const script = document.createElement('script');
-
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
@@ -64,11 +51,9 @@ function _loadScript(asset, root) {
       const {
         attr
       } = asset;
-
       if (attr && Object.keys(attr).length) {
         for (const name in attr) {
           const value = attr[name];
-
           if (typeof value === 'boolean') {
             if (value) {
               script.setAttribute(name, '');
@@ -84,11 +69,9 @@ function _loadScript(asset, root) {
       script.text = asset.source;
       resolve();
     }
-
     root.appendChild(script);
   });
 }
-
 function _loadStyle(asset, root) {
   return new Promise((resolve, reject) => {
     if (asset.type === 'stylesheet') {
@@ -106,32 +89,26 @@ function _loadStyle(asset, root) {
     }
   });
 }
-
 function loadStyleAssets(assets, root = document.head) {
   const styleElements = root.querySelectorAll('style');
   const stylesToRender = assets.filter(asset => asset.source && (asset.type === 'stylesheet' && !root.querySelector(`link[href='${asset.source}']`) || asset.type === 'inlineStyle' && Array.from(styleElements).reduce((acc, cur) => {
     if (cur.innerHTML === asset.source) {
       return false;
     }
-
     return acc;
   }, true)));
   return Promise.all(stylesToRender.map(asset => _loadStyle(asset, root)));
 }
-
-function loadScriptAssets(assets, root = document.head) {
+async function loadScriptAssets(assets, root = document.head) {
   const scriptElements = root.querySelectorAll('script');
   const scriptsToRender = assets.reduce((scripts, asset) => {
     const {
       source
     } = asset;
-
     const _asset = Object.assign({}, asset);
-
     if (_asset.type !== 'script' && _asset.type !== 'inlineScript') {
       return scripts;
     }
-
     if (source === Object(source)) {
       if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
@@ -140,33 +117,33 @@ function loadScriptAssets(assets, root = document.head) {
       } else {
         _asset.source = source.es5;
       }
-
       if (!_asset.source) {
-        console.warn(`Asset '${_asset.name}' is missing ES variant and could not be loaded.`);
+        const message = `Asset '${_asset.name}' is missing ES variant and could not be loaded.`;
+        if (!_asset.optional) {
+          const error = new Error(message);
+          error.asset = _asset;
+          throw error;
+        }
+        console.warn(message);
         return scripts;
       }
     }
-
     if (Array.from(scriptElements).reduce((acc, cur) => {
       if (cur.text === _asset.source) {
         return true;
       }
-
       return acc;
     }, false) || (_asset.test ? exported.test(_asset.test) : false)) {
       return scripts;
     }
-
     scripts.push(_asset);
     return scripts;
   }, []);
   return Promise.all(scriptsToRender.map(asset => _loadScript(asset, root)));
 }
-
 function loadAssets(assets, root) {
   return Promise.all([loadScriptAssets(assets, root), loadStyleAssets(assets, root)]);
 }
-
 exports.loadAssets = loadAssets;
 exports.loadScriptAssets = loadScriptAssets;
 exports.loadStyleAssets = loadStyleAssets;

package/lib/index.es9.mjs

@@ -1,23 +1,17 @@
 let _isES9Supported;
-
 let _isES11Supported;
-
 function isES9Supported() {
   if (_isES9Supported === undefined) {
     _isES9Supported = exported.test('return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()') && !!Object.values;
   }
-
   return _isES9Supported;
 }
-
 function isES11Supported() {
   if (_isES11Supported === undefined) {
     _isES11Supported = exported.test('return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()') && exported.test('return typeof Promise.allSettled === "function"') && exported.test('return typeof globalThis !== "undefined"') && exported.test('return typeof 9007199254740991n === "bigint"');
   }
-
   return _isES11Supported;
 }
-
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -27,29 +21,23 @@ function test(snippet) {
     return false;
   }
 }
-
 const exported = {
   isES9Supported,
   isES11Supported,
   test
 };
-
 function _loadScript(asset, root) {
   return new Promise((resolve, reject) => {
     const scriptElement = root.querySelector(`script[src='${asset.source}']`);
-
     if (scriptElement) {
-      if (performance && performance.getEntriesByName && performance.getEntriesByName(scriptElement.src).find(entry => entry.entryType === 'resource' && entry.responseEnd) || !performance || !performance.getEntriesByName) {
-        setTimeout(resolve, 0);
-        return;
+      if (!asset.test) {
+        resolve();
       }
-
       scriptElement.addEventListener('load', resolve);
+      scriptElement.addEventListener('error', asset.optional ? resolve : reject);
       return;
     }
-
     const script = document.createElement('script');
-
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
@@ -58,11 +46,9 @@ function _loadScript(asset, root) {
       const {
         attr
       } = asset;
-
       if (attr && Object.keys(attr).length) {
         for (const name in attr) {
           const value = attr[name];
-
           if (typeof value === 'boolean') {
             if (value) {
               script.setAttribute(name, '');
@@ -78,11 +64,9 @@ function _loadScript(asset, root) {
       script.text = asset.source;
       resolve();
     }
-
     root.appendChild(script);
   });
 }
-
 function _loadStyle(asset, root) {
   return new Promise((resolve, reject) => {
     if (asset.type === 'stylesheet') {
@@ -100,32 +84,26 @@ function _loadStyle(asset, root) {
     }
   });
 }
-
 function loadStyleAssets(assets, root = document.head) {
   const styleElements = root.querySelectorAll('style');
   const stylesToRender = assets.filter(asset => asset.source && (asset.type === 'stylesheet' && !root.querySelector(`link[href='${asset.source}']`) || asset.type === 'inlineStyle' && Array.from(styleElements).reduce((acc, cur) => {
     if (cur.innerHTML === asset.source) {
       return false;
     }
-
     return acc;
   }, true)));
   return Promise.all(stylesToRender.map(asset => _loadStyle(asset, root)));
 }
-
-function loadScriptAssets(assets, root = document.head) {
+async function loadScriptAssets(assets, root = document.head) {
   const scriptElements = root.querySelectorAll('script');
   const scriptsToRender = assets.reduce((scripts, asset) => {
     const {
       source
     } = asset;
-
     const _asset = Object.assign({}, asset);
-
     if (_asset.type !== 'script' && _asset.type !== 'inlineScript') {
       return scripts;
     }
-
     if (source === Object(source)) {
       if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
@@ -134,31 +112,31 @@ function loadScriptAssets(assets, root = document.head) {
       } else {
         _asset.source = source.es5;
       }
-
       if (!_asset.source) {
-        console.warn(`Asset '${_asset.name}' is missing ES variant and could not be loaded.`);
+        const message = `Asset '${_asset.name}' is missing ES variant and could not be loaded.`;
+        if (!_asset.optional) {
+          const error = new Error(message);
+          error.asset = _asset;
+          throw error;
+        }
+        console.warn(message);
         return scripts;
       }
     }
-
     if (Array.from(scriptElements).reduce((acc, cur) => {
       if (cur.text === _asset.source) {
         return true;
       }
-
       return acc;
     }, false) || (_asset.test ? exported.test(_asset.test) : false)) {
       return scripts;
     }
-
     scripts.push(_asset);
     return scripts;
   }, []);
   return Promise.all(scriptsToRender.map(asset => _loadScript(asset, root)));
 }
-
 function loadAssets(assets, root) {
   return Promise.all([loadScriptAssets(assets, root), loadStyleAssets(assets, root)]);
 }
-
 export { loadAssets, loadScriptAssets, loadStyleAssets, exported as testScript };

package/lib/index.js

@@ -52,22 +52,15 @@ function _loadScript(asset, root) {
     const scriptElement = root.querySelector(`script[src='${asset.source}']`);
 
     if (scriptElement) {
-      if (
-        (performance &&
-          performance.getEntriesByName &&
-          performance
-            .getEntriesByName(scriptElement.src)
-            .find(
-              (entry) => entry.entryType === 'resource' && entry.responseEnd
-            )) ||
-        !performance ||
-        !performance.getEntriesByName
-      ) {
-        setTimeout(resolve, 0);
-        return;
+      if (!asset.test) {
+        resolve();
       }
 
       scriptElement.addEventListener('load', resolve);
+      scriptElement.addEventListener(
+        'error',
+        asset.optional ? resolve : reject
+      );
       return;
     }
 
@@ -144,7 +137,7 @@ function loadStyleAssets(assets, root = document.head) {
   return Promise.all(stylesToRender.map((asset) => _loadStyle(asset, root)));
 }
 
-function loadScriptAssets(assets, root = document.head) {
+async function loadScriptAssets(assets, root = document.head) {
   const scriptElements = root.querySelectorAll('script');
   const scriptsToRender = assets.reduce((scripts, asset) => {
     const { source } = asset;
@@ -164,9 +157,16 @@ function loadScriptAssets(assets, root = document.head) {
       }
 
       if (!_asset.source) {
-        console.warn(
-          `Asset '${_asset.name}' is missing ES variant and could not be loaded.`
-        );
+        const message = `Asset '${_asset.name}' is missing ES variant and could not be loaded.`;
+
+        if (!_asset.optional) {
+          const error = new Error(message);
+          error.asset = _asset;
+
+          throw error;
+        }
+
+        console.warn(message);
         return scripts;
       }
     }

package/lib/index.mjs

@@ -48,22 +48,15 @@ function _loadScript(asset, root) {
     const scriptElement = root.querySelector(`script[src='${asset.source}']`);
 
     if (scriptElement) {
-      if (
-        (performance &&
-          performance.getEntriesByName &&
-          performance
-            .getEntriesByName(scriptElement.src)
-            .find(
-              (entry) => entry.entryType === 'resource' && entry.responseEnd
-            )) ||
-        !performance ||
-        !performance.getEntriesByName
-      ) {
-        setTimeout(resolve, 0);
-        return;
+      if (!asset.test) {
+        resolve();
       }
 
       scriptElement.addEventListener('load', resolve);
+      scriptElement.addEventListener(
+        'error',
+        asset.optional ? resolve : reject
+      );
       return;
     }
 
@@ -140,7 +133,7 @@ function loadStyleAssets(assets, root = document.head) {
   return Promise.all(stylesToRender.map((asset) => _loadStyle(asset, root)));
 }
 
-function loadScriptAssets(assets, root = document.head) {
+async function loadScriptAssets(assets, root = document.head) {
   const scriptElements = root.querySelectorAll('script');
   const scriptsToRender = assets.reduce((scripts, asset) => {
     const { source } = asset;
@@ -160,9 +153,16 @@ function loadScriptAssets(assets, root = document.head) {
       }
 
       if (!_asset.source) {
-        console.warn(
-          `Asset '${_asset.name}' is missing ES variant and could not be loaded.`
-        );
+        const message = `Asset '${_asset.name}' is missing ES variant and could not be loaded.`;
+
+        if (!_asset.optional) {
+          const error = new Error(message);
+          error.asset = _asset;
+
+          throw error;
+        }
+
+        console.warn(message);
         return scripts;
       }
     }

package/lib/index.umd.js

@@ -1 +1 @@
-!function(e,t){if("function"==typeof define&&define.amd)define("@merkur/integration",["exports"],t);else if("undefined"!=typeof exports)t(exports);else{var r={exports:{}};t(r.exports),e.Merkur=e.Merkur||{},e.Merkur.Integration=r.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(e){var t,r;Object.defineProperty(e,"__esModule",{value:!0}),e.loadAssets=function(e,t){return Promise.all([u(e,t),i(e,t)])},e.loadScriptAssets=u,e.loadStyleAssets=i,e.testScript=void 0;var n={isES9Supported:function(){return void 0===t&&(t=n.test("return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()")&&!!Object.values),t},isES11Supported:function(){return void 0===r&&(r=n.test("return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()")&&n.test('return typeof Promise.allSettled === "function"')&&n.test('return typeof globalThis !== "undefined"')&&n.test('return typeof 9007199254740991n === "bigint"')),r},test:function(e){try{return!!new Function(e)()}catch(e){return!1}}};function o(e,t){return new Promise((function(r,n){var o=t.querySelector("script[src='".concat(e.source,"']"));if(o)return performance&&performance.getEntriesByName&&performance.getEntriesByName(o.src).find((function(e){return"resource"===e.entryType&&e.responseEnd}))||!performance||!performance.getEntriesByName?void setTimeout(r,0):void o.addEventListener("load",r);var s=document.createElement("script");if("script"===e.type){s.defer=!0,s.onload=r,s.onerror=e.optional?r:n,s.src=e.source;var i=e.attr;if(i&&Object.keys(i).length)for(var u in i){var c=i[u];"boolean"==typeof c?c?s.setAttribute(u,""):s.removeAttribute(u):s.setAttribute(u,c)}}else s.text=e.source,r();t.appendChild(s)}))}function s(e,t){return new Promise((function(r,n){if("stylesheet"===e.type){var o=document.createElement("link");o.onload=r,o.onerror=n,o.rel="stylesheet",o.href=e.source,t.appendChild(o)}else{var s=document.createElement("style");s.innerHTML=e.source,t.appendChild(s),r()}}))}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("style"),n=e.filter((function(e){return e.source&&("stylesheet"===e.type&&!t.querySelector("link[href='".concat(e.source,"']"))||"inlineStyle"===e.type&&Array.from(r).reduce((function(t,r){return r.innerHTML!==e.source&&t}),!0))}));return Promise.all(n.map((function(e){return s(e,t)})))}function u(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("script"),s=e.reduce((function(e,t){var o=t.source,s=Object.assign({},t);return"script"!==s.type&&"inlineScript"!==s.type?e:o!==Object(o)||(o.es11&&n.isES11Supported()?s.source=o.es11:o.es9&&n.isES9Supported()?s.source=o.es9:s.source=o.es5,s.source)?(Array.from(r).reduce((function(e,t){return t.text===s.source||e}),!1)||s.test&&n.test(s.test)||e.push(s),e):(console.warn("Asset '".concat(s.name,"' is missing ES variant and could not be loaded.")),e)}),[]);return Promise.all(s.map((function(e){return o(e,t)})))}e.testScript=n}));
+!function(e,t){if("function"==typeof define&&define.amd)define("@merkur/integration",["exports"],t);else if("undefined"!=typeof exports)t(exports);else{var r={exports:{}};t(r.exports),e.Merkur=e.Merkur||{},e.Merkur.Integration=r.exports}}("undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:this,(function(e){function t(e,t,r,n,o,i,s){try{var u=e[i](s),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,o)}function r(e){return function(){var r=this,n=arguments;return new Promise((function(o,i){var s=e.apply(r,n);function u(e){t(s,o,i,u,c,"next",e)}function c(e){t(s,o,i,u,c,"throw",e)}u(void 0)}))}}var n,o;Object.defineProperty(e,"__esModule",{value:!0}),e.loadAssets=function(e,t){return Promise.all([a(e,t),c(e,t)])},e.loadScriptAssets=a,e.loadStyleAssets=c,e.testScript=void 0;var i={isES9Supported:function(){return void 0===n&&(n=i.test("return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()")&&!!Object.values),n},isES11Supported:function(){return void 0===o&&(o=i.test("return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()")&&i.test('return typeof Promise.allSettled === "function"')&&i.test('return typeof globalThis !== "undefined"')&&i.test('return typeof 9007199254740991n === "bigint"')),o},test:function(e){try{return!!new Function(e)()}catch(e){return!1}}};function s(e,t){return new Promise((function(r,n){var o=t.querySelector("script[src='".concat(e.source,"']"));if(o)return e.test||r(),o.addEventListener("load",r),void o.addEventListener("error",e.optional?r:n);var i=document.createElement("script");if("script"===e.type){i.defer=!0,i.onload=r,i.onerror=e.optional?r:n,i.src=e.source;var s=e.attr;if(s&&Object.keys(s).length)for(var u in s){var c=s[u];"boolean"==typeof c?c?i.setAttribute(u,""):i.removeAttribute(u):i.setAttribute(u,c)}}else i.text=e.source,r();t.appendChild(i)}))}function u(e,t){return new Promise((function(r,n){if("stylesheet"===e.type){var o=document.createElement("link");o.onload=r,o.onerror=n,o.rel="stylesheet",o.href=e.source,t.appendChild(o)}else{var i=document.createElement("style");i.innerHTML=e.source,t.appendChild(i),r()}}))}function c(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("style"),n=e.filter((function(e){return e.source&&("stylesheet"===e.type&&!t.querySelector("link[href='".concat(e.source,"']"))||"inlineStyle"===e.type&&Array.from(r).reduce((function(t,r){return r.innerHTML!==e.source&&t}),!0))}));return Promise.all(n.map((function(e){return u(e,t)})))}function a(e){return l.apply(this,arguments)}function l(){return l=r((function*(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("script"),n=e.reduce((function(e,t){var n=t.source,o=Object.assign({},t);if("script"!==o.type&&"inlineScript"!==o.type)return e;if(n===Object(n)&&(n.es11&&i.isES11Supported()?o.source=n.es11:n.es9&&i.isES9Supported()?o.source=n.es9:o.source=n.es5,!o.source)){var s="Asset '".concat(o.name,"' is missing ES variant and could not be loaded.");if(!o.optional){var u=new Error(s);throw u.asset=o,u}return console.warn(s),e}return Array.from(r).reduce((function(e,t){return t.text===o.source||e}),!1)||o.test&&i.test(o.test)||e.push(o),e}),[]);return Promise.all(n.map((function(e){return s(e,t)})))})),l.apply(this,arguments)}e.testScript=i}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/integration",
-  "version": "0.29.2",
+  "version": "0.30.0",
   "description": "Merkur module for easy integration with other apps.",
   "main": "lib/index",
   "module": "lib/index",
@@ -49,11 +49,11 @@
   },
   "homepage": "https://merkur.js.org/",
   "devDependencies": {
-    "@merkur/core": "^0.29.1",
+    "@merkur/core": "^0.30.0",
     "rollup": "^2.70.2"
   },
   "peerDependencies": {
     "@merkur/core": "*"
   },
-  "gitHead": "47cd30885b91c8159239d313a6ef4b7f78a09a41"
+  "gitHead": "13a0ac12f77f381b1d829cffe9b21d453c26ca7a"
 }