@merkur/integration 0.33.0 → 0.35.0

package/lib/index.cjs

@@ -2,6 +2,7 @@
 
 let _isES9Supported;
 let _isES11Supported;
+let _isES13Supported;
 
 function isES9Supported() {
   if (_isES9Supported === undefined) {
@@ -28,6 +29,16 @@ function isES11Supported() {
   return _isES11Supported;
 }
 
+function isES13Supported() {
+  if (_isES13Supported === undefined) {
+    _isES13Supported =
+      exported.test('return [1,1].findLast(e => e === 1)') &&
+      exported.test('return Object.hasOwn({a:1}, "a")');
+  }
+
+  return _isES13Supported;
+}
+
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -42,6 +53,7 @@ function test(snippet) {
 const exported = {
   isES9Supported,
   isES11Supported,
+  isES13Supported,
   test,
 };
 
@@ -150,7 +162,9 @@ async function loadScriptAssets(assets, root = document.head) {
     }
 
     if (source === Object(source)) {
-      if (source.es11 && exported.isES11Supported()) {
+      if (source.es13 && exported.isES13Supported()) {
+        _asset.source = source.es13;
+      } else if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
       } else if (source.es9 && exported.isES9Supported()) {
         _asset.source = source.es9;

package/lib/index.es9.cjs

@@ -2,6 +2,7 @@
 
 let _isES9Supported;
 let _isES11Supported;
+let _isES13Supported;
 function isES9Supported() {
   if (_isES9Supported === undefined) {
     _isES9Supported = exported.test('return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()') && !!Object.values;
@@ -14,6 +15,12 @@ function isES11Supported() {
   }
   return _isES11Supported;
 }
+function isES13Supported() {
+  if (_isES13Supported === undefined) {
+    _isES13Supported = exported.test('return [1,1].findLast(e => e === 1)') && exported.test('return Object.hasOwn({a:1}, "a")');
+  }
+  return _isES13Supported;
+}
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -26,6 +33,7 @@ function test(snippet) {
 const exported = {
   isES9Supported,
   isES11Supported,
+  isES13Supported,
   test
 };
 function _loadScript(asset, root) {
@@ -110,7 +118,9 @@ async function loadScriptAssets(assets, root = document.head) {
       return scripts;
     }
     if (source === Object(source)) {
-      if (source.es11 && exported.isES11Supported()) {
+      if (source.es13 && exported.isES13Supported()) {
+        _asset.source = source.es13;
+      } else if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
       } else if (source.es9 && exported.isES9Supported()) {
         _asset.source = source.es9;

package/lib/index.es9.mjs

@@ -1,5 +1,6 @@
 let _isES9Supported;
 let _isES11Supported;
+let _isES13Supported;
 function isES9Supported() {
   if (_isES9Supported === undefined) {
     _isES9Supported = exported.test('return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()') && !!Object.values;
@@ -12,6 +13,12 @@ function isES11Supported() {
   }
   return _isES11Supported;
 }
+function isES13Supported() {
+  if (_isES13Supported === undefined) {
+    _isES13Supported = exported.test('return [1,1].findLast(e => e === 1)') && exported.test('return Object.hasOwn({a:1}, "a")');
+  }
+  return _isES13Supported;
+}
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -24,6 +31,7 @@ function test(snippet) {
 const exported = {
   isES9Supported,
   isES11Supported,
+  isES13Supported,
   test
 };
 function _loadScript(asset, root) {
@@ -108,7 +116,9 @@ async function loadScriptAssets(assets, root = document.head) {
       return scripts;
     }
     if (source === Object(source)) {
-      if (source.es11 && exported.isES11Supported()) {
+      if (source.es13 && exported.isES13Supported()) {
+        _asset.source = source.es13;
+      } else if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
       } else if (source.es9 && exported.isES9Supported()) {
         _asset.source = source.es9;

package/lib/index.js

@@ -2,6 +2,7 @@
 
 let _isES9Supported;
 let _isES11Supported;
+let _isES13Supported;
 
 function isES9Supported() {
   if (_isES9Supported === undefined) {
@@ -28,6 +29,16 @@ function isES11Supported() {
   return _isES11Supported;
 }
 
+function isES13Supported() {
+  if (_isES13Supported === undefined) {
+    _isES13Supported =
+      exported.test('return [1,1].findLast(e => e === 1)') &&
+      exported.test('return Object.hasOwn({a:1}, "a")');
+  }
+
+  return _isES13Supported;
+}
+
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -42,6 +53,7 @@ function test(snippet) {
 const exported = {
   isES9Supported,
   isES11Supported,
+  isES13Supported,
   test,
 };
 
@@ -150,7 +162,9 @@ async function loadScriptAssets(assets, root = document.head) {
     }
 
     if (source === Object(source)) {
-      if (source.es11 && exported.isES11Supported()) {
+      if (source.es13 && exported.isES13Supported()) {
+        _asset.source = source.es13;
+      } else if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
       } else if (source.es9 && exported.isES9Supported()) {
         _asset.source = source.es9;

package/lib/index.mjs

@@ -1,5 +1,6 @@
 let _isES9Supported;
 let _isES11Supported;
+let _isES13Supported;
 
 function isES9Supported() {
   if (_isES9Supported === undefined) {
@@ -26,6 +27,16 @@ function isES11Supported() {
   return _isES11Supported;
 }
 
+function isES13Supported() {
+  if (_isES13Supported === undefined) {
+    _isES13Supported =
+      exported.test('return [1,1].findLast(e => e === 1)') &&
+      exported.test('return Object.hasOwn({a:1}, "a")');
+  }
+
+  return _isES13Supported;
+}
+
 function test(snippet) {
   try {
     const fn = new Function(snippet);
@@ -40,6 +51,7 @@ function test(snippet) {
 const exported = {
   isES9Supported,
   isES11Supported,
+  isES13Supported,
   test,
 };
 
@@ -148,7 +160,9 @@ async function loadScriptAssets(assets, root = document.head) {
     }
 
     if (source === Object(source)) {
-      if (source.es11 && exported.isES11Supported()) {
+      if (source.es13 && exported.isES13Supported()) {
+        _asset.source = source.es13;
+      } else if (source.es11 && exported.isES11Supported()) {
         _asset.source = source.es11;
       } else if (source.es9 && exported.isES9Supported()) {
         _asset.source = source.es9;

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){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)}var r,n;Object.defineProperty(e,"__esModule",{value:!0}),e.loadAssets=function(e,t){return Promise.all([s(e,t),i(e,t)])},e.loadScriptAssets=s,e.loadStyleAssets=i,e.testScript=void 0;var o={isES9Supported:function(){return void 0===r&&(r=o.test("return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()")&&!!Object.values),r},isES11Supported:function(){return void 0===n&&(n=o.test("return (() => { const o = { t: { q: true } }; return o?.t?.q && (o?.a?.q ?? true); })()")&&o.test('return typeof Promise.allSettled === "function"')&&o.test('return typeof globalThis !== "undefined"')&&o.test('return typeof 9007199254740991n === "bigint"')),n},test:function(e){try{return!!new Function(e)()}catch(e){return!1}}};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 function(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()}}))}(e,t)})))}function s(e){return u.apply(this,arguments)}function u(){var e;return e=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,i=Object.assign({},t);if("script"!==i.type&&"inlineScript"!==i.type)return e;if(n===Object(n)&&(n.es11&&o.isES11Supported()?i.source=n.es11:n.es9&&o.isES9Supported()?i.source=n.es9:i.source=null,!i.source)){var s="Asset '".concat(i.name,"' is missing ES variant and could not be loaded.");if(!i.optional){var u=new Error(s);throw u.asset=i,u}return console.warn(s),e}return Array.from(r).reduce((function(e,t){return t.text===i.source||e}),!1)||i.test&&o.test(i.test)||e.push(i),e}),[]);return Promise.all(n.map((function(e){return function(e,t){return new Promise((function(r,n){var i=t.querySelector("script[src='".concat(e.source,"']"));if(i)return e.test&&!o.test(e.test)||r(),i.addEventListener("load",r),void i.addEventListener("error",e.optional?r:n);var s=document.createElement("script");if("script"===e.type){s.defer=!0,s.onload=r,s.onerror=function(t){s.remove(),e.optional?r(t):n(t)},s.src=e.source;var u=e.attr;if(u&&Object.keys(u).length)for(var c in u){var a=u[c];"boolean"==typeof a?a?s.setAttribute(c,""):s.removeAttribute(c):s.setAttribute(c,a)}}else s.text=e.source,r();t.appendChild(s)}))}(e,t)})))},u=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)}))},u.apply(this,arguments)}e.testScript=o}));
+!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)}var r,n,o;Object.defineProperty(e,"__esModule",{value:!0}),e.loadAssets=function(e,t){return Promise.all([u(e,t),s(e,t)])},e.loadScriptAssets=u,e.loadStyleAssets=s,e.testScript=void 0;var i=e.testScript={isES9Supported:function(){return void 0===r&&(r=i.test("return (() => { const o = { t: 1 }; return { ...o }; })() && (async () => ({}))()")&&!!Object.values),r},isES11Supported:function(){return void 0===n&&(n=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"')),n},isES13Supported:function(){return void 0===o&&(o=i.test("return [1,1].findLast(e => e === 1)")&&i.test('return Object.hasOwn({a:1}, "a")')),o},test:function(e){try{return!!new Function(e)()}catch(e){return!1}}};function s(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 function(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()}}))}(e,t)})))}function u(e){return c.apply(this,arguments)}function c(){var e;return e=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.es13&&i.isES13Supported()?o.source=n.es13:n.es11&&i.isES11Supported()?o.source=n.es11:n.es9&&i.isES9Supported()?o.source=n.es9:o.source=null,!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 function(e,t){return new Promise((function(r,n){var o=t.querySelector("script[src='".concat(e.source,"']"));if(o)return e.test&&!i.test(e.test)||r(),o.addEventListener("load",r),void o.addEventListener("error",e.optional?r:n);var s=document.createElement("script");if("script"===e.type){s.defer=!0,s.onload=r,s.onerror=function(t){s.remove(),e.optional?r(t):n(t)},s.src=e.source;var u=e.attr;if(u&&Object.keys(u).length)for(var c in u){var a=u[c];"boolean"==typeof a?a?s.setAttribute(c,""):s.removeAttribute(c):s.setAttribute(c,a)}}else s.text=e.source,r();t.appendChild(s)}))}(e,t)})))},c=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)}))},c.apply(this,arguments)}}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@merkur/integration",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "description": "Merkur module for easy integration with other apps.",
   "main": "lib/index",
   "module": "lib/index",
@@ -49,10 +49,10 @@
   },
   "homepage": "https://merkur.js.org/",
   "devDependencies": {
-    "@merkur/core": "^0.33.0"
+    "@merkur/core": "^0.35.0"
   },
   "peerDependencies": {
     "@merkur/core": "*"
   },
-  "gitHead": "3e88b57abfad267ac3f3b20b2ae6bf50f93f5375"
+  "gitHead": "383f29bdf67a7f4252876867687371a8d26f53f2"
 }

package/server/__tests__/indexSpec.js

@@ -1,5 +1,5 @@
-const { createAssets } = require('../index');
-const fs = require('fs');
+const { createAssets } = require('../index.js');
+const fs = require('node:fs');
 
 const staticFolder = 'build/static';
 const staticBaseUrl = 'https://seznam.cz/static';
@@ -14,11 +14,20 @@ const manifests = {
     '{"widget.css": "widget.6f79bbbdbeda640aeda0.css", "widget.js": "widget.53fbc48b6fb616ecfd1b.js"}',
 };
 
-jest.mock('fs', () => ({
-  promises: {
-    readFile: jest.fn((path) => manifests[path]),
-  },
-}));
+jest.mock('node:fs', () => {
+  const originalModule = jest.requireActual('fs');
+
+  return {
+    __esModule: true,
+    ...originalModule,
+    promises: {
+      ...originalModule.promises,
+      readFile: jest.fn((path) => {
+        return manifests[path];
+      }),
+    },
+  };
+});
 
 global.console.warn = jest.fn();
 
@@ -67,7 +76,7 @@ describe('createAssets method', () => {
     );
   });
 
-  it('should not modifi original assets', async () => {
+  it('should not modify original assets', async () => {
     await createAssets({
       assets,
       staticFolder,

package/server/index.js

@@ -1,5 +1,5 @@
-const path = require('path');
-const fs = require('fs');
+const path = require('node:path');
+const fs = require('node:fs');
 
 const fsp = fs.promises;
 
@@ -58,23 +58,27 @@ async function createAssets({ assets, staticFolder, folders, staticBaseUrl }) {
       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) =>
-          processAssetInFolder({
-            asset: { ...asset },
-            folder,
-            fileName: manifest[asset.name],
-            staticBaseUrl,
-            staticFolder,
-          }),
-        ),
-      );
+      try {
+        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,
+            }),
+          ),
+        );
+      } catch (error) {
+        return assets;
+      }
     },
     [...assets],
   );
@@ -91,7 +95,86 @@ async function createAssets({ assets, staticFolder, folders, staticBaseUrl }) {
   });
 }
 
+const moduleCache = new Map();
+function getFileStats(modulePath) {
+  return fs.statSync(modulePath, { throwIfNoEntry: false });
+}
+
+function deleteCache(modulePath, force = false) {
+  const stats = getFileStats(modulePath) ?? { mtimeMs: -1 };
+
+  if (!moduleCache.has(modulePath)) {
+    moduleCache.set(modulePath, stats);
+  }
+
+  if (!modulePath) {
+    return;
+  }
+
+  if (force || stats.mtimeMs > moduleCache.get(modulePath).mtimeMs) {
+    moduleCache.set(modulePath, stats);
+
+    searchCache(modulePath, function (mod) {
+      delete require.cache[mod.id];
+    });
+  }
+}
+
+function searchCache(moduleName, callback) {
+  if (moduleName && require.cache[moduleName] !== undefined) {
+    const module = require.cache[moduleName];
+
+    traverse(module, callback);
+
+    Object.keys(module.constructor._pathCache).forEach(function (cacheKey) {
+      if (cacheKey.indexOf(moduleName) > -1) {
+        delete module.constructor._pathCache[cacheKey];
+      }
+    });
+  }
+}
+
+function traverse(module, callback) {
+  (module?.children || []).forEach(function (child) {
+    if (child && require.cache[child.id] !== undefined) {
+      traverse(require.cache[child.id], callback);
+    }
+  });
+
+  callback(module);
+}
+
+const memoPathResolve = memo(path.resolve);
+function requireUncached(module, options = {}) {
+  const modulePath = memoPathResolve(module);
+
+  if (process.env.NODE_WATCH === 'true') {
+    if (options.optional && modulePath && !getFileStats(modulePath)) {
+      return;
+    }
+
+    deleteCache(modulePath);
+
+    // Force delete cache on all dependencies
+    if (Array.isArray(options.dependencies)) {
+      options.dependencies.forEach((dep) =>
+        deleteCache(path.resolve(dep), true),
+      );
+    }
+  }
+
+  return require(modulePath);
+}
+
+function asyncMiddleware(fn) {
+  return (req, res, next) => {
+    Promise.resolve(fn(req, res, next)).catch(next);
+  };
+}
+
 module.exports = {
+  requireUncached,
+  asyncMiddleware,
   createAssets,
   memo,
 };