@merkur/integration 0.27.0 → 0.28.0

package/lib/index.cjs

@@ -54,7 +54,7 @@ function _loadScript(asset, root) {
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
-      script.onerror = reject;
+      script.onerror = asset.optional ? resolve : reject;
       script.src = asset.source;
 
       const { attr } = asset;

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.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"),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=document.createElement("script");if("script"===e.type){o.defer=!0,o.onload=t,o.onerror=s,o.src=e.source;var n=e.attr;if(n&&Object.keys(n).length)for(var u in n){var c=n[u];"boolean"==typeof c?c?o.setAttribute(u,""):o.removeAttribute(u):o.setAttribute(u,c)}}else o.text=e.source,t();r.appendChild(o)}))}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,s){var n=s.source,u=Object.assign({},s);return"script"!==u.type&&"inlineScript"!==u.type?e:n!==Object(n)||(n.es11&&t.isES11Supported()?u.source=n.es11:n.es9&&t.isES9Supported()?u.source=n.es9:u.source=n.es5,u.source)?(r.querySelector("script[src='".concat(u.source,"']"))||Array.from(o).reduce((function(e,r){return r.text===u.source||e}),!1)||u.test&&t.test(u.test)||e.push(u),e):(console.warn("Asset '".concat(u.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";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.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=document.createElement("script");if("script"===e.type){o.defer=!0,o.onload=t,o.onerror=e.optional?t:s,o.src=e.source;var n=e.attr;if(n&&Object.keys(n).length)for(var u in n){var c=n[u];"boolean"==typeof c?c?o.setAttribute(u,""):o.removeAttribute(u):o.setAttribute(u,c)}}else o.text=e.source,t();r.appendChild(o)}))}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,s){var n=s.source,u=Object.assign({},s);return"script"!==u.type&&"inlineScript"!==u.type?e:n!==Object(n)||(n.es11&&t.isES11Supported()?u.source=n.es11:n.es9&&t.isES9Supported()?u.source=n.es9:u.source=n.es5,u.source)?(r.querySelector("script[src='".concat(u.source,"']"))||Array.from(o).reduce((function(e,r){return r.text===u.source||e}),!1)||u.test&&t.test(u.test)||e.push(u),e):(console.warn("Asset '".concat(u.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;

package/lib/index.es9.cjs

@@ -47,7 +47,7 @@ function _loadScript(asset, root) {
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
-      script.onerror = reject;
+      script.onerror = asset.optional ? resolve : reject;
       script.src = asset.source;
       const {
         attr

package/lib/index.es9.mjs

@@ -41,7 +41,7 @@ function _loadScript(asset, root) {
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
-      script.onerror = reject;
+      script.onerror = asset.optional ? resolve : reject;
       script.src = asset.source;
       const {
         attr

package/lib/index.js

@@ -54,7 +54,7 @@ function _loadScript(asset, root) {
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
-      script.onerror = reject;
+      script.onerror = asset.optional ? resolve : reject;
       script.src = asset.source;
 
       const { attr } = asset;

package/lib/index.mjs

@@ -50,7 +50,7 @@ function _loadScript(asset, root) {
     if (asset.type === 'script') {
       script.defer = true;
       script.onload = resolve;
-      script.onerror = reject;
+      script.onerror = asset.optional ? resolve : reject;
       script.src = asset.source;
 
       const { attr } = asset;

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([i(e,t),u(e,t)])},e.loadScriptAssets=i,e.loadStyleAssets=u,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=document.createElement("script");if("script"===e.type){o.defer=!0,o.onload=r,o.onerror=n,o.src=e.source;var s=e.attr;if(s&&Object.keys(s).length)for(var u in s){var i=s[u];"boolean"==typeof i?i?o.setAttribute(u,""):o.removeAttribute(u):o.setAttribute(u,i)}}else o.text=e.source,r();t.appendChild(o)}))}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 u(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 i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("script"),s=e.reduce((function(e,o){var s=o.source,u=Object.assign({},o);return"script"!==u.type&&"inlineScript"!==u.type?e:s!==Object(s)||(s.es11&&n.isES11Supported()?u.source=s.es11:s.es9&&n.isES9Supported()?u.source=s.es9:u.source=s.es5,u.source)?(t.querySelector("script[src='".concat(u.source,"']"))||Array.from(r).reduce((function(e,t){return t.text===u.source||e}),!1)||u.test&&n.test(u.test)||e.push(u),e):(console.warn("Asset '".concat(u.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){var t,r;Object.defineProperty(e,"__esModule",{value:!0}),e.loadAssets=function(e,t){return Promise.all([i(e,t),u(e,t)])},e.loadScriptAssets=i,e.loadStyleAssets=u,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=document.createElement("script");if("script"===e.type){o.defer=!0,o.onload=r,o.onerror=e.optional?r:n,o.src=e.source;var s=e.attr;if(s&&Object.keys(s).length)for(var u in s){var i=s[u];"boolean"==typeof i?i?o.setAttribute(u,""):o.removeAttribute(u):o.setAttribute(u,i)}}else o.text=e.source,r();t.appendChild(o)}))}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 u(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 i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:document.head,r=t.querySelectorAll("script"),s=e.reduce((function(e,o){var s=o.source,u=Object.assign({},o);return"script"!==u.type&&"inlineScript"!==u.type?e:s!==Object(s)||(s.es11&&n.isES11Supported()?u.source=s.es11:s.es9&&n.isES9Supported()?u.source=s.es9:u.source=s.es5,u.source)?(t.querySelector("script[src='".concat(u.source,"']"))||Array.from(r).reduce((function(e,t){return t.text===u.source||e}),!1)||u.test&&n.test(u.test)||e.push(u),e):(console.warn("Asset '".concat(u.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}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/integration",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "Merkur module for easy integration with other apps.",
   "main": "lib/index",
   "module": "lib/index",
@@ -26,7 +26,7 @@
   "scripts": {
     "preversion": "npm test",
     "test": "../../node_modules/.bin/jest --no-watchman -c ./jest.config.js",
-    "test:es:version": "../../node_modules/.bin/es-check es5 ./lib/index.es5.js && ../../node_modules/.bin/es-check --module es11 ./lib/index.mjs  && ../../node_modules/.bin/es-check --module es9 ./lib/index.es9.mjs && ../../node_modules/.bin/es-check --module es9 ./lib/index.es9.cjs",
+    "test:es:version": "../../node_modules/.bin/es-check es5 ./lib/index.es5.js && ../../node_modules/.bin/es-check es11 ./lib/index.mjs --module && ../../node_modules/.bin/es-check es9 ./lib/index.es9.mjs --module && ../../node_modules/.bin/es-check es9 ./lib/index.es9.cjs --module",
     "build": "node_modules/.bin/rollup -c",
     "prepare": "npm run build"
   },
@@ -49,11 +49,11 @@
   },
   "homepage": "https://merkur.js.org/",
   "devDependencies": {
-    "@merkur/core": "^0.27.0",
-    "rollup": "^2.56.2"
+    "@merkur/core": "^0.28.0",
+    "rollup": "^2.70.2"
   },
   "peerDependencies": {
     "@merkur/core": "*"
   },
-  "gitHead": "355cec8cff98356d1ecda30e54957aef076ba7fb"
+  "gitHead": "8760a1cedbbfc37348055418bacbfc69199a3c06"
 }

package/server/__tests__/__snapshots__/indexSpec.js.snap

@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`createAssets method should read manifests and add source to assets 1`] = `
+Array [
+  Object {
+    "name": "widget.js",
+    "source": Object {
+      "es11": "https://seznam.cz/static/es11/widget.53fbc48b6fb616ecfd1b.js",
+      "es5": "https://seznam.cz/static/es5/widget.e5e3d41ecc1f5964c3e3.js",
+      "es9": "https://seznam.cz/static/es9/widget.fdf95165e917b666fc62.js",
+    },
+    "type": "script",
+  },
+  Object {
+    "name": "style.css",
+    "source": "https://seznam.cz/static/css/style.c3e64bd85803ef0e5583.css",
+    "type": "stylesheet",
+  },
+]
+`;

package/server/__tests__/indexSpec.js

@@ -0,0 +1,97 @@
+const { createAssets } = require('../index');
+const fs = require('fs');
+
+const staticFolder = 'build/static';
+const staticBaseUrl = 'https://seznam.cz/static';
+const folders = ['es11', 'es9', 'es5', 'css'];
+
+const manifests = {
+  'build/static/css/manifest.json':
+    '{"style.css":"style.c3e64bd85803ef0e5583.css"}',
+  'build/static/es5/manifest.json':
+    '{"widget.css": "widget.96a1e61f8f77442b9837.css", "widget.js": "widget.e5e3d41ecc1f5964c3e3.js"}',
+  'build/static/es9/manifest.json':
+    '{"widget.css": "widget.96a1e61f8f77442b9837.css", "widget.js": "widget.fdf95165e917b666fc62.js"}',
+  'build/static/es11/manifest.json':
+    '{"widget.css": "widget.6f79bbbdbeda640aeda0.css", "widget.js": "widget.53fbc48b6fb616ecfd1b.js"}',
+};
+
+jest.mock('fs', () => ({
+  promises: {
+    readFile: jest.fn((path) => manifests[path]),
+  },
+}));
+
+global.console.warn = jest.fn();
+
+describe('createAssets method', () => {
+  let assets = {};
+
+  beforeEach(() => {
+    assets = [
+      {
+        name: 'polyfill.js',
+        type: 'script',
+      },
+      {
+        name: 'widget.js',
+        type: 'script',
+      },
+      {
+        name: 'style.css',
+        type: 'stylesheet',
+      },
+    ];
+  });
+
+  it('should read manifests and add source to assets', async () => {
+    const processed = await createAssets({
+      assets,
+      staticFolder,
+      staticBaseUrl,
+      folders,
+    });
+
+    expect(fs.promises.readFile).toHaveBeenCalled();
+    expect(processed).toMatchSnapshot();
+  });
+
+  it('should warn about excluded files', async () => {
+    await createAssets({
+      assets,
+      staticFolder,
+      staticBaseUrl,
+      folders,
+    });
+
+    expect(console.warn).toHaveBeenCalledWith(
+      expect.stringContaining('polyfill.js')
+    );
+  });
+
+  it('should not modifi original assets', async () => {
+    await createAssets({
+      assets,
+      staticFolder,
+      staticBaseUrl,
+      folders,
+    });
+
+    expect(assets).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "name": "polyfill.js",
+          "type": "script",
+        },
+        Object {
+          "name": "widget.js",
+          "type": "script",
+        },
+        Object {
+          "name": "style.css",
+          "type": "stylesheet",
+        },
+      ]
+    `);
+  });
+});

package/server/index.js

@@ -16,55 +16,79 @@ function memo(fn, options = { generateKey: () => {} }) {
   };
 }
 
+async function processAssetInFolder({
+  asset,
+  folder,
+  fileName,
+  staticFolder,
+  staticBaseUrl,
+}) {
+  if (!asset.name || !fileName || typeof asset.source === 'string') {
+    return asset;
+  }
+
+  if (asset.type.includes('inline')) {
+    asset.source = await fsp.readFile(
+      path.join(staticFolder, folder, fileName),
+      { encoding: 'utf-8' }
+    );
+
+    return asset;
+  }
+
+  if (asset.type === 'stylesheet') {
+    asset.source = `${staticBaseUrl}/${folder}/${fileName}`;
+
+    return asset;
+  }
+
+  asset.source = asset.source || {};
+  asset.source[folder] = `${staticBaseUrl}/${folder}/${fileName}`;
+
+  return asset;
+}
+
 async function createAssets({ assets, staticFolder, folders, staticBaseUrl }) {
   if (staticBaseUrl.endsWith('/')) {
     staticBaseUrl = staticBaseUrl.slice(0, -1);
   }
 
-  return folders.reduce(async (assets, folder) => {
-    assets = await assets;
-    const folderPath = path.join(staticFolder, folder);
+  const processedAssets = await folders.reduce(
+    async (assets, folder) => {
+      assets = await assets;
+      const folderPath = path.join(staticFolder, folder);
 
-    const manifestFile = await fsp.readFile(
-      path.join(folderPath, 'manifest.json'),
-      { encoding: 'utf-8' }
-    );
-    const manifest = JSON.parse(manifestFile);
-
-    return Promise.all(
-      assets.map(async (asset) => {
-        if (
-          !asset.name ||
-          !manifest[asset.name] ||
-          typeof asset.source === 'string'
-        ) {
-          return asset;
-        }
-
-        if (asset.type.includes('inline')) {
-          asset.source = await fsp.readFile(
-            path.join(folderPath, manifest[asset.name]),
-            { encoding: 'utf-8' }
-          );
-
-          return asset;
-        }
-
-        if (asset.type === 'stylesheet') {
-          asset.source = `${staticBaseUrl}/${folder}/${manifest[asset.name]}`;
-
-          return asset;
-        }
-
-        asset.source = asset.source || {};
-        asset.source[folder] = `${staticBaseUrl}/${folder}/${
-          manifest[asset.name]
-        }`;
-
-        return asset;
-      })
-    );
-  }, assets);
+      const manifestFile = await fsp.readFile(
+        path.join(folderPath, 'manifest.json'),
+        { encoding: 'utf-8' }
+      );
+      const manifest = JSON.parse(manifestFile);
+
+      return Promise.all(
+        assets.map(async (asset) =>
+          processAssetInFolder({
+            asset: { ...asset },
+            folder,
+            fileName: manifest[asset.name],
+            staticBaseUrl,
+            staticFolder,
+          })
+        )
+      );
+    },
+    [...assets]
+  );
+
+  return processedAssets.filter((asset) => {
+    if (!asset.source) {
+      console.warn(
+        `Asset '${asset.name}' has been excluded because it doesn't have valid source.`
+      );
+      return false;
+    }
+
+    return true;
+  });
 }
 
 module.exports = {