chayns-api 1.1.0-0 → 1.1.0-1

package/dist/cjs/components/ChaynsProvider.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.moduleWrapper = exports.default = void 0;
+exports.default = void 0;
 var _htmlescape = _interopRequireDefault(require("htmlescape"));
 var _react = _interopRequireWildcard(require("react"));
 var _IChaynsReact = require("../types/IChaynsReact");
@@ -14,14 +14,12 @@ var _ModuleFederationWrapper = require("../wrapper/ModuleFederationWrapper");
 var _SsrWrapper = require("../wrapper/SsrWrapper");
 var _ChaynsContext = require("./ChaynsContext");
 var _AppDialogWrapper = _interopRequireDefault(require("./AppDialogWrapper"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _moduleWrapper = require("./moduleWrapper");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-const moduleWrapper = {
-  current: undefined
-};
-exports.moduleWrapper = moduleWrapper;
+
 const isServer = typeof window === 'undefined';
 const InitialDataProvider = /*#__PURE__*/_react.default.memo(({
   data,
@@ -65,13 +63,13 @@ const ChaynsProvider = ({
       var _deviceInfo$app$name, _deviceInfo$app;
       const deviceInfo = (0, _deviceHelper.default)(navigator.userAgent, '');
       // load framewrapper in Chaynsweb in app (window.self === window.top)
-      if ([_IChaynsReact.AppName.Chayns, _IChaynsReact.AppName.ChaynsLauncher].includes((_deviceInfo$app$name = (_deviceInfo$app = deviceInfo.app) === null || _deviceInfo$app === void 0 ? void 0 : _deviceInfo$app.name) !== null && _deviceInfo$app$name !== void 0 ? _deviceInfo$app$name : _IChaynsReact.AppName.Unknown) && window.self === window.top) {
+      if ([_IChaynsReact.AppName.Chayns, _IChaynsReact.AppName.ChaynsLauncher, _IChaynsReact.AppName.Sidekick, _IChaynsReact.AppName.TobitChat].includes((_deviceInfo$app$name = (_deviceInfo$app = deviceInfo.app) === null || _deviceInfo$app === void 0 ? void 0 : _deviceInfo$app.name) !== null && _deviceInfo$app$name !== void 0 ? _deviceInfo$app$name : _IChaynsReact.AppName.Unknown) && window.self === window.top) {
         customWrapper.current = new _AppWrapper.AppWrapper();
       } else {
         customWrapper.current = new _FrameWrapper.FrameWrapper();
       }
     }
-    moduleWrapper.current = customWrapper.current;
+    _moduleWrapper.moduleWrapper.current = customWrapper.current;
   }
   const [state, setState] = (0, _react.useState)((_customWrapper$curren = (_customWrapper$curren2 = customWrapper.current) === null || _customWrapper$curren2 === void 0 ? void 0 : _customWrapper$curren2.values) !== null && _customWrapper$curren !== void 0 ? _customWrapper$curren : undefined);
   (0, _react.useEffect)(() => {
@@ -89,7 +87,7 @@ const ChaynsProvider = ({
           return undefined;
         });
       });
-      if (customWrapper.current.values) {
+      if (customWrapper.current.values && !isModule) {
         setState({
           ...customWrapper.current.values
         });
@@ -100,7 +98,7 @@ const ChaynsProvider = ({
     if (isModule) {
       setState(data);
       if (data) {
-        moduleWrapper.current.values = data;
+        customWrapper.current.values = data;
       }
     }
   }, [data, isModule]);
@@ -115,5 +113,4 @@ const ChaynsProvider = ({
     renderedByServer: renderedByServer
   }));
 };
-var _default = ChaynsProvider;
-exports.default = _default;
+var _default = exports.default = ChaynsProvider;

package/dist/cjs/components/ErrorBoundary.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+class ErrorBoundary extends _react.default.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      hasError: false
+    };
+  }
+  static getDerivedStateFromError() {
+    return {
+      hasError: true
+    };
+  }
+  componentDidCatch(error, errorInfo) {
+    console.error(error, errorInfo);
+  }
+  render() {
+    if (this.state.hasError) {
+      return null;
+    }
+    return this.props.children;
+  }
+}
+exports.default = ErrorBoundary;

package/dist/cjs/components/moduleWrapper.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.moduleWrapper = void 0;
+const moduleWrapper = exports.moduleWrapper = {
+  current: undefined
+};

package/dist/cjs/components/withCompatMode.js

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.withCompatMode = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
+var _ErrorBoundary = _interopRequireDefault(require("./ErrorBoundary"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } /* eslint-disable react/jsx-props-no-spreading */
 let ReactDOMClient;
 try {
   ReactDOMClient = require('react-dom/client');
@@ -27,9 +28,9 @@ const withCompatMode = Component => {
       const {
         innerRef
       } = this.props;
-      const component = /*#__PURE__*/_react.default.createElement(Component, _extends({}, this.props, {
+      const component = /*#__PURE__*/_react.default.createElement(_ErrorBoundary.default, null, /*#__PURE__*/_react.default.createElement(Component, _extends({}, this.props, {
         ref: innerRef
-      }));
+      })));
       if (typeof ((_ReactDOMClient = ReactDOMClient) === null || _ReactDOMClient === void 0 ? void 0 : _ReactDOMClient.createRoot) === 'function') {
         this.root = ReactDOMClient.createRoot(this.ref.current);
         this.root.render(component);
@@ -41,9 +42,9 @@ const withCompatMode = Component => {
       const {
         innerRef
       } = this.props;
-      const component = /*#__PURE__*/_react.default.createElement(Component, _extends({}, this.props, {
+      const component = /*#__PURE__*/_react.default.createElement(_ErrorBoundary.default, null, /*#__PURE__*/_react.default.createElement(Component, _extends({}, this.props, {
         ref: innerRef
-      }));
+      })));
       if (this.root) {
         this.root.render(component);
       } else {

package/dist/cjs/components/withHydrationBoundary.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _constants = require("../constants");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const withHydrationBoundary = (Component, initializer, useHydrationId) => {
+  return ({
+    id: idProp,
+    children
+  }) => {
+    let value;
+    if (!globalThis.window) {
+      value = (0, _react.useContext)(_constants.HydrationContext);
+    }
+    const id = useHydrationId ? useHydrationId() : idProp;
+    if (!id) {
+      throw new Error('hydration boundary was not given a id which is required');
+    }
+    const [store] = (0, _react.useState)(() => {
+      let initialValue = undefined;
+      if (globalThis.window) {
+        const htmlId = `__INITIAL_DATA_${id}__`;
+        const $elem = document.getElementById(htmlId);
+        if ($elem) {
+          initialValue = JSON.parse($elem.innerHTML);
+        }
+      }
+      const s = initializer(initialValue);
+      if (!globalThis.window) {
+        if (id in value) {
+          console.warn(`Dehydration function for id "${id}" has been defined multiple times. This can have two reasons. The children cause suspension and therefor the hydration boundary has to mount from scratch again. You can avoid this by adding a Suspense around the children. The id is not unique. This has to be fixed or might cause hydration issues.`);
+        }
+        value[id] = {
+          getState: s.getState,
+          abort: s.abort
+        };
+      }
+      return s;
+    });
+    (0, _react.useEffect)(() => {
+      const htmlId = `__INITIAL_DATA_${id}__`;
+      const $elem = document.getElementById(htmlId);
+      if ($elem) {
+        $elem.remove();
+      }
+    }, []);
+    return /*#__PURE__*/_react.default.createElement(Component, {
+      value: store
+    }, children);
+  };
+};
+var _default = exports.default = withHydrationBoundary;

package/dist/cjs/constants/hydrationContext.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.HydrationContext = void 0;
+var _react = require("react");
+let HydrationContext = exports.HydrationContext = void 0;
+
+// force single context on server-side (fake sharing)
+if (!globalThis.window && globalThis._hydrationContext) {
+  exports.HydrationContext = HydrationContext = globalThis._hydrationContext;
+} else {
+  exports.HydrationContext = HydrationContext = /*#__PURE__*/(0, _react.createContext)({});
+  globalThis._hydrationContext = HydrationContext;
+}

package/dist/cjs/constants/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _hydrationContext = require("./hydrationContext");
+Object.keys(_hydrationContext).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _hydrationContext[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _hydrationContext[key];
+    }
+  });
+});

package/dist/cjs/handler/DialogHandler.js

@@ -7,10 +7,13 @@ exports.default = void 0;
 class DialogHandler {
   isOpen = false;
   result = undefined;
-  constructor(config, open, close) {
+  listeners = [];
+  constructor(config, open, close, dispatchEvent, addDataListener) {
     this._open = open;
     this._close = close;
     this._config = config;
+    this._dispatchEvent = dispatchEvent;
+    this._addDataListener = addDataListener;
   }
   async open() {
     if (this.isOpen) {
@@ -23,6 +26,13 @@ class DialogHandler {
       };
       this.isOpen = true;
       this.dialogId = await this._open(this._config, callback);
+
+      // console.log('dialogId', this.dialogId);
+
+      this._addDataListener(this.dialogId, data => {
+        // console.log('[DialogHandler]dataListener', this.dialogId, data);
+        this.listeners.forEach(cb => cb(data));
+      });
     });
     return this.result = res;
   }
@@ -33,6 +43,21 @@ class DialogHandler {
     this.isOpen = false;
     this._close(this.dialogId, data);
   }
+  dispatchEvent(data) {
+    if (!this.isOpen) {
+      return;
+    }
+    this._dispatchEvent(this.dialogId, data);
+  }
+  addDataListener(listener) {
+    this.listeners.push(listener);
+  }
+  removeDataListener(listener) {
+    const index = this.listeners.findIndex(l => l === listener);
+    if (index > -1) {
+      this.listeners.splice(index, 1);
+    }
+  }
   getResult() {
     return this.result;
   }

package/dist/cjs/hooks/useAccessToken.js

@@ -9,6 +9,7 @@ var _useContextSelector = require("use-context-selector");
 var _ChaynsContext = require("../components/ChaynsContext");
 /**
  * @category Hooks
+ * @deprecated Use {@link getAccessToken} instead
  */
 const useAccessToken = accessToken => {
   const [token, setToken] = (0, _react.useState)(null);

package/dist/cjs/hooks/useDialogState.js

@@ -10,13 +10,17 @@ var _ChaynsContext = require("../components/ChaynsContext");
  * @category Hooks
  */
 const useDialogState = () => {
-  const closeDialog = (0, _useContextSelector.useContextSelector)(_ChaynsContext.ChaynsFunctionsContext, v => v === null || v === void 0 ? void 0 : v.closeDialog);
+  const setResult = (0, _useContextSelector.useContextSelector)(_ChaynsContext.ChaynsFunctionsContext, v => v === null || v === void 0 ? void 0 : v.setDialogResult);
+  const sendData = (0, _useContextSelector.useContextSelector)(_ChaynsContext.ChaynsFunctionsContext, v => v === null || v === void 0 ? void 0 : v.dispatchEventToDialogHost);
+  const addDataListener = (0, _useContextSelector.useContextSelector)(_ChaynsContext.ChaynsFunctionsContext, v => v === null || v === void 0 ? void 0 : v.addDialogHostEventListener);
   const isClosingRequested = (0, _useContextSelector.useContextSelector)(_ChaynsContext.ChaynsContext, v => {
     var _v$dialog;
-    return v === null || v === void 0 ? void 0 : (_v$dialog = v.dialog) === null || _v$dialog === void 0 ? void 0 : _v$dialog.isClosingRequested;
+    return v === null || v === void 0 || (_v$dialog = v.dialog) === null || _v$dialog === void 0 ? void 0 : _v$dialog.isClosingRequested;
   });
   return {
-    closeDialog,
+    setResult,
+    sendData,
+    addDataListener,
     isClosingRequested
   };
 };
@@ -28,7 +32,7 @@ exports.useDialogState = useDialogState;
 const useDialogData = () => {
   const inputData = (0, _useContextSelector.useContextSelector)(_ChaynsContext.ChaynsContext, v => {
     var _v$dialog2;
-    return v === null || v === void 0 ? void 0 : (_v$dialog2 = v.dialog) === null || _v$dialog2 === void 0 ? void 0 : _v$dialog2.dialogInput;
+    return v === null || v === void 0 || (_v$dialog2 = v.dialog) === null || _v$dialog2 === void 0 ? void 0 : _v$dialog2.dialogInput;
   });
   return inputData;
 };

package/dist/cjs/hooks/usePages.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.usePages = exports.usePage = exports.getPage = void 0;
 var _useContextSelector = require("use-context-selector");
 var _ChaynsContext = require("../components/ChaynsContext");
-var _ChaynsProvider = require("../components/ChaynsProvider");
+var _moduleWrapper = require("../components/moduleWrapper");
 /**
  * @category Hooks
  */
@@ -48,7 +48,7 @@ const getPage = ({
   const {
     pages,
     currentPage
-  } = _ChaynsProvider.moduleWrapper.current.values;
+  } = _moduleWrapper.moduleWrapper.current.values;
   if (id) {
     var _pages$find2;
     return (_pages$find2 = pages.find(x => x.id === id && (!siteId || x.siteId === siteId))) !== null && _pages$find2 !== void 0 ? _pages$find2 : null;

package/dist/cjs/host/ChaynsHost.js

@@ -110,5 +110,4 @@ const ChaynsHost = ({
       return null;
   }
 };
-var _default = ChaynsHost;
-exports.default = _default;
+var _default = exports.default = ChaynsHost;

package/dist/cjs/host/iframe/HostIframe.js

@@ -10,8 +10,8 @@ var _postIframeForm = _interopRequireDefault(require("../../util/postIframeForm"
 var _useUpdateData = _interopRequireDefault(require("./utils/useUpdateData"));
 var _url = require("../../util/url");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 const HostIframe = ({
   iFrameProps,
@@ -39,10 +39,9 @@ const HostIframe = ({
   if (!eventTarget.current) {
     eventTarget.current = global.document ? document.createElement('div') : undefined; // global.EventTarget ? new EventTarget() : undefined
   }
-
   const setHeight = value => {
     if (ref.current) {
-      ref.current.height = `${value}px`;
+      ref.current.style.height = `${value}px`;
     }
   };
 
@@ -134,5 +133,4 @@ const HostIframe = ({
     src: postForm ? undefined : (0, _url.replaceStagingUrl)(preventStagingReplacement, src, environment.buildEnvironment)
   }));
 };
-var _default = HostIframe;
-exports.default = _default;
+var _default = exports.default = HostIframe;

package/dist/cjs/host/iframe/utils/useUpdateData.js

@@ -17,5 +17,4 @@ const useUpdateData = (target, type, value) => {
     }
   }, [target, type, value]);
 };
-var _default = useUpdateData;
-exports.default = _default;
+var _default = exports.default = useUpdateData;

package/dist/cjs/host/module/ModuleHost.js

@@ -5,36 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _useDynamicScript = _interopRequireDefault(require("./utils/useDynamicScript"));
 var _loadComponent = _interopRequireDefault(require("./utils/loadComponent"));
 var _url = require("../../util/url");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const System = ({
   system,
   fallback,
   ...props
 }) => {
-  const {
-    ready,
-    failed
-  } = (0, _useDynamicScript.default)({
-    url: system === null || system === void 0 ? void 0 : system.url,
-    scope: system === null || system === void 0 ? void 0 : system.scope
-  });
-  const Component = (0, _react.useMemo)(() => {
-    // maybe return waitcursor instead
-    if (!system || !ready || failed) {
-      return null;
-    }
-    return /*#__PURE__*/_react.default.lazy((0, _loadComponent.default)(system.scope, system.module, system.url));
-
-    /* eslint-disable react-hooks/exhaustive-deps */
-  }, [system === null || system === void 0 ? void 0 : system.scope, ready, system === null || system === void 0 ? void 0 : system.url]);
-  return Component ? /*#__PURE__*/_react.default.createElement(_react.default.Suspense, {
+  const Component = (0, _react.useMemo)(() => (0, _loadComponent.default)(system.scope, system.module, system.url, undefined, system.preventSingleton), [system.scope, system.module, system.url, system.preventSingleton]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Suspense, {
     fallback: fallback || ''
-  }, /*#__PURE__*/_react.default.createElement(Component, props)) : fallback;
+  }, /*#__PURE__*/_react.default.createElement(Component, props));
 };
 const ModuleHost = ({
   system,
@@ -80,7 +64,8 @@ const ModuleHost = ({
     system: {
       scope: system.scope,
       url: (0, _url.replaceStagingUrl)(preventStagingReplacement, system.url, environment.buildEnvironment),
-      module: system.module
+      module: system.module,
+      preventSingleton: system.preventSingleton
     },
     data: initialData,
     functions: functions,
@@ -88,5 +73,4 @@ const ModuleHost = ({
     isModule: true
   }));
 };
-var _default = ModuleHost;
-exports.default = _default;
+var _default = exports.default = ModuleHost;

package/dist/cjs/host/module/utils/loadComponent.js

@@ -6,56 +6,53 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = loadComponent;
 var _semver = _interopRequireDefault(require("semver"));
 var _react = _interopRequireDefault(require("react"));
-var _useDynamicScript = require("./useDynamicScript");
+var _runtime = require("@module-federation/runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* eslint-disable */
-// @ts-nocheck
-
-let instances = {};
-function loadComponent(scope, module, url, skipCompatMode = false) {
-  return async () => {
-    // Initializes the shared scope. Fills it with known provided modules from this build and all remotes
-    // eslint-disable-next-line no-undef
-    await __webpack_init_sharing__('default');
-    const {
-      container
-    } = window[scope + "_list"].find(x => x.url === url); // or get the container somewhere else
-    // Initialize the container, it may provide shared modules
-    // eslint-disable-next-line no-undef
-    await container.init(__webpack_share_scopes__.default);
-    const factory = await container.get(module);
-    _useDynamicScript.semaphore[scope].release();
-    let ModuleMap = instances[`${scope}__${module}`];
-    let Module;
-    if (!ModuleMap) {
-      ModuleMap = {};
-      instances[`${scope}__${module}`] = ModuleMap;
-    }
-    if (Object.keys(ModuleMap).length > 0) {
-      const newModule = factory();
-      Module = ModuleMap[`${newModule.default.buildEnv}__${newModule.default.appVersion}`];
-      if (!Module) {
-        Module = newModule;
-        ModuleMap[`${newModule.default.buildEnv}__${newModule.default.appVersion}`] = newModule;
-      }
-    } else {
-      Module = factory();
-      ModuleMap[`${Module.default.buildEnv}__${Module.default.appVersion}`] = Module;
-    }
-    if (skipCompatMode) return Module;
-    const hostVersion = _semver.default.minVersion(_react.default.version);
-    const {
-      requiredVersion,
-      environment
-    } = Module.default;
-    const matchReactVersion = requiredVersion && _semver.default.satisfies(hostVersion, requiredVersion);
-    if (!matchReactVersion || environment !== 'production') {
-      return {
-        default: Module.default.CompatComponent
-      };
-    }
-    return {
-      default: Module.default.Component
-    };
-  };
+const registeredScopes = {};
+const dynamicMap = {};
+function loadComponent(scope, module, url, skipCompatMode = false, preventSingleton = false) {
+  if (skipCompatMode) {
+    console.warn('[chayns-api] skipCompatMode-option is deprecated and is set automatically now');
+  }
+  if (registeredScopes[scope] !== url || preventSingleton) {
+    (0, _runtime.registerRemotes)([{
+      name: scope,
+      entry: url,
+      alias: scope
+    }], {
+      force: scope in registeredScopes
+    });
+    registeredScopes[scope] = url;
+    dynamicMap[scope] = {};
+  }
+  if (!(module in dynamicMap[scope])) {
+    const path = `${scope}/${module.replace(/^\.\//, '')}`;
+    dynamicMap[scope][module] = /*#__PURE__*/_react.default.lazy(() => {
+      return (0, _runtime.loadRemote)(path).then(Module => {
+        // semantically equals skipCompatMode
+        if (typeof Module.default === 'function') {
+          return Module;
+        }
+        const hostVersion = _semver.default.minVersion(_react.default.version);
+        const {
+          requiredVersion,
+          environment
+        } = Module.default;
+        // @ts-expect-error
+        const webpackShareScopes = __webpack_share_scopes__.default;
+        const matchReactVersion = requiredVersion && _semver.default.satisfies(hostVersion, requiredVersion) && !Object.keys(webpackShareScopes.react).some(version => {
+          return _semver.default.gt(version, hostVersion) && _semver.default.satisfies(version, requiredVersion) || scope === webpackShareScopes.react[version].from.split('-').join('_');
+        });
+        if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development') {
+          return {
+            default: Module.default.CompatComponent
+          };
+        }
+        return {
+          default: Module.default.Component
+        };
+      });
+    });
+  }
+  return dynamicMap[scope][module];
 }