chayns-api 1.2.0-14 → 1.2.0-15

package/dist/cjs/host/ChaynsHost.js

@@ -30,8 +30,7 @@ const ChaynsHost = ({
   customData,
   environment,
   preventStagingReplacement,
-  dialog,
-  shareScope
+  dialog
 }) => {
   const [isVisible, setIsVisible] = (0, _react.useState)(type !== 'client-module' && (type !== 'server-module' || !!(system !== null && system !== void 0 && system.serverUrl)));
   (0, _react.useEffect)(() => {

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

@@ -15,8 +15,7 @@ const System = ({
   fallback,
   ...props
 }) => {
-  console.log("share3", system, system.shareScope);
-  const Component = (0, _react.useMemo)(() => (0, _loadComponent.default)(system.scope, system.module, globalThis.window ? system.url : system.serverUrl, undefined, system.preventSingleton, system.shareScope), [system.scope, system.module, system.url, system.serverUrl, system.preventSingleton]);
+  const Component = (0, _react.useMemo)(() => (0, _loadComponent.default)(system.scope, system.module, globalThis.window ? system.url : system.serverUrl, undefined, system.preventSingleton), [system.scope, system.module, system.url, system.serverUrl, system.preventSingleton]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Suspense, {
     fallback: fallback || ''
   }, /*#__PURE__*/_react.default.createElement(Component, props));
@@ -67,8 +66,7 @@ const ModuleHost = ({
       url: (0, _url.replaceStagingUrl)(preventStagingReplacement, system.url, environment.buildEnvironment),
       serverUrl: (0, _url.replaceStagingUrl)(preventStagingReplacement, system.serverUrl, environment.buildEnvironment),
       module: system.module,
-      preventSingleton: system.preventSingleton,
-      shareScope: system.shareScope
+      preventSingleton: system.preventSingleton
     },
     data: initialData,
     functions: functions,

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

@@ -7,8 +7,7 @@ exports.loadModule = exports.default = void 0;
 var _semver = _interopRequireDefault(require("semver"));
 var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const loadModule = (scope, module, url, preventSingleton = false, shareScope = 'chayns-api2') => {
-  console.log("share2", shareScope);
+const loadModule = (scope, module, url, preventSingleton = false) => {
   const {
     loadRemote,
     registerRemotes
@@ -22,14 +21,8 @@ const loadModule = (scope, module, url, preventSingleton = false, shareScope = '
     if (scope in registeredScopes) {
       console.error(`[chayns-api] call registerRemote with force for scope ${scope}. url: ${url}`);
     }
-    console.log("register remote ", {
-      shareScope,
-      name: scope,
-      entry: url,
-      alias: scope
-    });
     registerRemotes([{
-      shareScope,
+      shareScope: url.endsWith('v2.remoteEntry.js') ? 'chayns-api' : 'default',
       name: scope,
       entry: url,
       alias: scope
@@ -53,8 +46,7 @@ const loadModule = (scope, module, url, preventSingleton = false, shareScope = '
   return moduleMap[scope][module];
 };
 exports.loadModule = loadModule;
-const loadComponent = (scope, module, url, skipCompatMode = false, preventSingleton = false, shareScope) => {
-  console.log("share1", shareScope);
+const loadComponent = (scope, module, url, skipCompatMode = false, preventSingleton = false) => {
   if (skipCompatMode) {
     console.warn('[chayns-api] skipCompatMode-option is deprecated and is set automatically now');
   }
@@ -68,7 +60,7 @@ const loadComponent = (scope, module, url, skipCompatMode = false, preventSingle
     componentMap[scope] = {};
   }
   if (!(module in componentMap[scope])) {
-    const promise = loadModule(scope, module, url, preventSingleton, shareScope).then(async Module => {
+    const promise = loadModule(scope, module, url, preventSingleton).then(async Module => {
       if (typeof Module.default === 'function') {
         return Module;
       }
@@ -81,7 +73,6 @@ const loadComponent = (scope, module, url, skipCompatMode = false, preventSingle
         loadShareSync('react', {
           resolver: shareOptions => {
             resolve(shareOptions);
-            console.log("shareOptions", shareOptions);
             return shareOptions[0];
           }
         });
@@ -92,13 +83,11 @@ const loadComponent = (scope, module, url, skipCompatMode = false, preventSingle
       }) => {
         return _semver.default.gt(version, hostVersion) && _semver.default.satisfies(version, requiredVersion) || scope === from.split('-').join('_');
       });
-      if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development' || Module.default.version !== 2) {
-        console.log("use compat mode for", scope, module);
+      if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development') {
         return {
           default: Module.default.CompatComponent
         };
       }
-      console.log("use direct component for", scope, module);
       return {
         default: Module.default.Component
       };

package/dist/cjs/util/initModuleFederationSharing.js

@@ -7,38 +7,38 @@ exports.initModuleFederationSharing = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const initModuleFederationSharing = () => {
+const initModuleFederationSharing = ({
+  name
+}) => {
   // forces single instance of module federation runtime
-  if (!globalThis.moduleFederationRuntime) {
-    var _process$env$__PACKAG;
-    globalThis.moduleFederationRuntime = require('@module-federation/enhanced/runtime');
-    globalThis.moduleFederationScopes = {
-      registeredScopes: {},
-      moduleMap: {},
-      componentMap: {}
-    };
-    const {
-      init
-    } = globalThis.moduleFederationRuntime;
-
-    // init also should only be called once
-    init({
-      // will be set by chayns-toolkit via DefinePlugin
-      name: (_process$env$__PACKAG = process.env.__PACKAGE_NAME__) !== null && _process$env$__PACKAG !== void 0 ? _process$env$__PACKAG : '',
-      remotes: [],
-      shared: {
-        react: {
-          version: _react.default.version,
-          scope: 'chayns-api2',
-          lib: () => _react.default
-        },
-        'react-dom': {
-          version: _reactDom.default.version,
-          scope: 'chayns-api2',
-          lib: () => _reactDom.default
-        }
-      }
-    });
+  if (globalThis.moduleFederationRuntime) {
+    return;
   }
+  globalThis.moduleFederationRuntime = require('@module-federation/enhanced/runtime');
+  globalThis.moduleFederationScopes = {
+    registeredScopes: {},
+    moduleMap: {},
+    componentMap: {}
+  };
+  const {
+    init
+  } = globalThis.moduleFederationRuntime;
+  init({
+    name: name !== null && name !== void 0 ? name : '',
+    remotes: [],
+    shared: {
+      react: {
+        version: _react.default.version,
+        scope: 'chayns-api',
+        lib: () => _react.default
+      },
+      'react-dom': {
+        version: _react.default.version,
+        // intended, because react dom.version is not identical to package json react version (hash in version)
+        scope: 'chayns-api',
+        lib: () => _reactDom.default
+      }
+    }
+  });
 };
 exports.initModuleFederationSharing = initModuleFederationSharing;

package/dist/esm/host/ChaynsHost.js

@@ -22,8 +22,7 @@ const ChaynsHost = _ref => {
     customData,
     environment,
     preventStagingReplacement,
-    dialog,
-    shareScope
+    dialog
   } = _ref;
   const [isVisible, setIsVisible] = useState(type !== 'client-module' && (type !== 'server-module' || !!(system !== null && system !== void 0 && system.serverUrl)));
   useEffect(() => {

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

@@ -7,8 +7,7 @@ const System = _ref => {
     fallback,
     ...props
   } = _ref;
-  console.log("share3", system, system.shareScope);
-  const Component = useMemo(() => loadComponent(system.scope, system.module, globalThis.window ? system.url : system.serverUrl, undefined, system.preventSingleton, system.shareScope), [system.scope, system.module, system.url, system.serverUrl, system.preventSingleton]);
+  const Component = useMemo(() => loadComponent(system.scope, system.module, globalThis.window ? system.url : system.serverUrl, undefined, system.preventSingleton), [system.scope, system.module, system.url, system.serverUrl, system.preventSingleton]);
   return /*#__PURE__*/React.createElement(React.Suspense, {
     fallback: fallback || ''
   }, /*#__PURE__*/React.createElement(Component, props));
@@ -60,8 +59,7 @@ const ModuleHost = _ref2 => {
       url: replaceStagingUrl(preventStagingReplacement, system.url, environment.buildEnvironment),
       serverUrl: replaceStagingUrl(preventStagingReplacement, system.serverUrl, environment.buildEnvironment),
       module: system.module,
-      preventSingleton: system.preventSingleton,
-      shareScope: system.shareScope
+      preventSingleton: system.preventSingleton
     },
     data: initialData,
     functions: functions,

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

@@ -2,8 +2,6 @@ import semver from 'semver';
 import React from "react";
 export const loadModule = function (scope, module, url) {
   let preventSingleton = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  let shareScope = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'chayns-api2';
-  console.log("share2", shareScope);
   const {
     loadRemote,
     registerRemotes
@@ -17,14 +15,8 @@ export const loadModule = function (scope, module, url) {
     if (scope in registeredScopes) {
       console.error(`[chayns-api] call registerRemote with force for scope ${scope}. url: ${url}`);
     }
-    console.log("register remote ", {
-      shareScope,
-      name: scope,
-      entry: url,
-      alias: scope
-    });
     registerRemotes([{
-      shareScope,
+      shareScope: url.endsWith('v2.remoteEntry.js') ? 'chayns-api' : 'default',
       name: scope,
       entry: url,
       alias: scope
@@ -50,8 +42,6 @@ export const loadModule = function (scope, module, url) {
 const loadComponent = function (scope, module, url) {
   let skipCompatMode = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   let preventSingleton = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  let shareScope = arguments.length > 5 ? arguments[5] : undefined;
-  console.log("share1", shareScope);
   if (skipCompatMode) {
     console.warn('[chayns-api] skipCompatMode-option is deprecated and is set automatically now');
   }
@@ -65,7 +55,7 @@ const loadComponent = function (scope, module, url) {
     componentMap[scope] = {};
   }
   if (!(module in componentMap[scope])) {
-    const promise = loadModule(scope, module, url, preventSingleton, shareScope).then(async Module => {
+    const promise = loadModule(scope, module, url, preventSingleton).then(async Module => {
       if (typeof Module.default === 'function') {
         return Module;
       }
@@ -78,7 +68,6 @@ const loadComponent = function (scope, module, url) {
         loadShareSync('react', {
           resolver: shareOptions => {
             resolve(shareOptions);
-            console.log("shareOptions", shareOptions);
             return shareOptions[0];
           }
         });
@@ -90,13 +79,11 @@ const loadComponent = function (scope, module, url) {
         } = _ref;
         return semver.gt(version, hostVersion) && semver.satisfies(version, requiredVersion) || scope === from.split('-').join('_');
       });
-      if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development' || Module.default.version !== 2) {
-        console.log("use compat mode for", scope, module);
+      if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development') {
         return {
           default: Module.default.CompatComponent
         };
       }
-      console.log("use direct component for", scope, module);
       return {
         default: Module.default.Component
       };

package/dist/esm/util/initModuleFederationSharing.js

@@ -1,36 +1,37 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-export const initModuleFederationSharing = () => {
+export const initModuleFederationSharing = _ref => {
+  let {
+    name
+  } = _ref;
   // forces single instance of module federation runtime
-  if (!globalThis.moduleFederationRuntime) {
-    var _process$env$__PACKAG;
-    globalThis.moduleFederationRuntime = require('@module-federation/enhanced/runtime');
-    globalThis.moduleFederationScopes = {
-      registeredScopes: {},
-      moduleMap: {},
-      componentMap: {}
-    };
-    const {
-      init
-    } = globalThis.moduleFederationRuntime;
-
-    // init also should only be called once
-    init({
-      // will be set by chayns-toolkit via DefinePlugin
-      name: (_process$env$__PACKAG = process.env.__PACKAGE_NAME__) !== null && _process$env$__PACKAG !== void 0 ? _process$env$__PACKAG : '',
-      remotes: [],
-      shared: {
-        react: {
-          version: React.version,
-          scope: 'chayns-api2',
-          lib: () => React
-        },
-        'react-dom': {
-          version: ReactDOM.version,
-          scope: 'chayns-api2',
-          lib: () => ReactDOM
-        }
-      }
-    });
+  if (globalThis.moduleFederationRuntime) {
+    return;
   }
+  globalThis.moduleFederationRuntime = require('@module-federation/enhanced/runtime');
+  globalThis.moduleFederationScopes = {
+    registeredScopes: {},
+    moduleMap: {},
+    componentMap: {}
+  };
+  const {
+    init
+  } = globalThis.moduleFederationRuntime;
+  init({
+    name: name !== null && name !== void 0 ? name : '',
+    remotes: [],
+    shared: {
+      react: {
+        version: React.version,
+        scope: 'chayns-api',
+        lib: () => React
+      },
+      'react-dom': {
+        version: React.version,
+        // intended, because react dom.version is not identical to package json react version (hash in version)
+        scope: 'chayns-api',
+        lib: () => ReactDOM
+      }
+    }
+  });
 };

package/dist/types/host/ChaynsHost.d.ts

@@ -24,7 +24,6 @@ type ChaynsHostType = {
     environment: ChaynsReactValues["environment"];
     preventStagingReplacement?: boolean;
     dialog: ChaynsReactValues["dialog"];
-    shareScope?: string;
 };
 declare const ChaynsHost: FC<ChaynsHostType>;
 export default ChaynsHost;

package/dist/types/host/module/ModuleHost.d.ts

@@ -6,7 +6,6 @@ export type TypeSystem = {
     serverUrl?: string;
     module: string;
     preventSingleton?: boolean;
-    shareScope?: string;
 };
 type ModulePropTypes = {
     system: TypeSystem;

package/dist/types/host/module/utils/loadComponent.d.ts

@@ -1,3 +1,3 @@
-export declare const loadModule: (scope: any, module: any, url: any, preventSingleton?: boolean, shareScope?: string) => any;
-declare const loadComponent: (scope: any, module: any, url: any, skipCompatMode: boolean | undefined, preventSingleton: boolean | undefined, shareScope: any) => any;
+export declare const loadModule: (scope: any, module: any, url: any, preventSingleton?: boolean) => any;
+declare const loadComponent: (scope: any, module: any, url: any, skipCompatMode?: boolean, preventSingleton?: boolean) => any;
 export default loadComponent;

package/dist/types/util/initModuleFederationSharing.d.ts

@@ -1 +1,3 @@
-export declare const initModuleFederationSharing: () => void;
+export declare const initModuleFederationSharing: ({ name }: {
+    name: any;
+}) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chayns-api",
-    "version": "1.2.0-14",
+    "version": "1.2.0-15",
     "description": "new chayns api",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",