chayns-api 1.1.0-22 → 1.1.0-24

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

@@ -8,13 +8,14 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _semver = _interopRequireDefault(require("semver"));
 var _react = _interopRequireDefault(require("react"));
 var _runtime = require("@module-federation/runtime");
+var _process$env$__PACKAG;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const registeredScopes = {};
 const moduleMap = {};
 const componentMap = {};
 (0, _runtime.init)({
-  // @ts-expect-error will be set by chayns-toolkit via DefinePlugin
-  name: process.env.__PACKAGE_NAME__,
+  // 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: {
@@ -76,18 +77,29 @@ const loadComponent = (scope, module, url, skipCompatMode = false, preventSingle
         environment
       } = Module.default;
       const shareScopes = await new Promise(resolve => {
+        // @ts-expect-error
+        if (typeof __webpack_share_scopes__ !== 'undefined') {
+          // @ts-expect-error
+          const shareScopes = __webpack_share_scopes__.default;
+          console.log('__webpack_share_scopes__', shareScopes);
+          const shareList = Object.entries(shareScopes.react).map(([k, v]) => ({
+            version: k,
+            from: v.from
+          }));
+          resolve(shareList);
+        }
         (0, _runtime.loadShareSync)('react', {
           resolver: shareOptions => {
             resolve(shareOptions);
+            console.log('mf runtime share scopes', shareOptions);
             return shareOptions[0];
           }
         });
       });
-      const matchReactVersion = requiredVersion && _semver.default.satisfies(hostVersion, requiredVersion) && !shareScopes.some(t => {
-        const {
-          version,
-          from
-        } = t;
+      const matchReactVersion = requiredVersion && _semver.default.satisfies(hostVersion, requiredVersion) && !shareScopes.some(({
+        version,
+        from
+      }) => {
         return _semver.default.gt(version, hostVersion) && _semver.default.satisfies(version, requiredVersion) || scope === from.split('-').join('_');
       });
       if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development') {

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

@@ -1,3 +1,4 @@
+var _process$env$__PACKAG;
 import ReactDOM from 'react-dom';
 import semver from 'semver';
 import React from 'react';
@@ -6,8 +7,8 @@ const registeredScopes = {};
 const moduleMap = {};
 const componentMap = {};
 init({
-  // @ts-expect-error will be set by chayns-toolkit via DefinePlugin
-  name: process.env.__PACKAGE_NAME__,
+  // 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: {
@@ -71,18 +72,33 @@ const loadComponent = function (scope, module, url) {
         environment
       } = Module.default;
       const shareScopes = await new Promise(resolve => {
+        // @ts-expect-error
+        if (typeof __webpack_share_scopes__ !== 'undefined') {
+          // @ts-expect-error
+          const shareScopes = __webpack_share_scopes__.default;
+          console.log('__webpack_share_scopes__', shareScopes);
+          const shareList = Object.entries(shareScopes.react).map(_ref => {
+            let [k, v] = _ref;
+            return {
+              version: k,
+              from: v.from
+            };
+          });
+          resolve(shareList);
+        }
         loadShareSync('react', {
           resolver: shareOptions => {
             resolve(shareOptions);
+            console.log('mf runtime share scopes', shareOptions);
             return shareOptions[0];
           }
         });
       });
-      const matchReactVersion = requiredVersion && semver.satisfies(hostVersion, requiredVersion) && !shareScopes.some(t => {
-        const {
+      const matchReactVersion = requiredVersion && semver.satisfies(hostVersion, requiredVersion) && !shareScopes.some(_ref2 => {
+        let {
           version,
           from
-        } = t;
+        } = _ref2;
         return semver.gt(version, hostVersion) && semver.satisfies(version, requiredVersion) || scope === from.split('-').join('_');
       });
       if (!matchReactVersion || environment !== 'production' || process.env.NODE_ENV === 'development') {

package/dist/types/hooks/useCustomData.d.ts

@@ -1,4 +1,4 @@
 /**
  * @category Hooks
  */
-export declare const useCustomData: () => any;
+export declare const useCustomData: <T extends unknown>() => T;

package/package.json

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