@modern-js/plugin-garfish 1.21.4 → 1.21.6

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/plugin-garfish
 
+## 1.21.6
+
+### Patch Changes
+
+- 57f7399: feat: support async export provider for module federation
+  支持模块联邦场景异步导出 provider
+- Updated dependencies [bb7788d]
+- Updated dependencies [e951ac1]
+  - @modern-js/runtime@1.21.6
+  - @modern-js/utils@1.21.6
+
+## 1.21.5
+
+### Patch Changes
+
+- 6d8475f: fix: loadApp when dom is mount
+  修复 dom 未渲染时挂载子应用行为
+- Updated dependencies [a150632]
+- Updated dependencies [29576fc]
+  - @modern-js/runtime@1.21.5
+  - @modern-js/utils@1.21.5
+
 ## 1.21.4
 
 ### Patch Changes

package/dist/js/modern/cli/index.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import path from 'path';
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { logger } from "../util";
-import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig } from "./utils";
+import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig, generateAsyncEntry } from "./utils";
 export const externals = {
   'react-dom': 'react-dom',
   react: 'react'
@@ -274,16 +274,40 @@ export default (({
         };
       },
 
+      modifyAsyncEntry({
+        entrypoint,
+        code
+      }) {
+        var _config$deploy2, _config$source;
+
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useResolvedConfigContext();
+        let finalCode = code;
+
+        if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend && config !== null && config !== void 0 && (_config$source = config.source) !== null && _config$source !== void 0 && _config$source.enableAsyncEntry) {
+          finalCode = generateAsyncEntry(code);
+          return {
+            entrypoint,
+            code: `${finalCode}`
+          };
+        }
+
+        return {
+          entrypoint,
+          code: finalCode
+        };
+      },
+
       modifyEntryExport({
         entrypoint,
         exportStatement
       }) {
-        var _config$deploy2;
+        var _config$deploy3;
 
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const config = useResolvedConfigContext();
 
-        if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
+        if (config !== null && config !== void 0 && (_config$deploy3 = config.deploy) !== null && _config$deploy3 !== void 0 && _config$deploy3.microFrontend) {
           const exportStatementCode = makeProvider();
           logger('exportStatement', exportStatementCode);
           return {

package/dist/js/modern/cli/utils.js

@@ -114,4 +114,14 @@ export function setRuntimeConfig(config, key, value) {
   }
 
   return undefined;
-}
+}
+export const generateAsyncEntry = code => {
+  const transformCode = code.replace(`import('./bootstrap.js');`, `if (!window.__GARFISH__) { import('./bootstrap.js'); }`);
+  return `
+      export const provider = async (...args) => {
+        const exports = await import('./bootstrap');
+        return exports.provider.apply(null, args);
+      };
+      ${transformCode}
+    `;
+};

package/dist/js/modern/runtime/utils/apps.js

@@ -38,8 +38,7 @@ function getAppInstance(options, appInfo, manifest) {
       _defineProperty(this, "unregisterHistoryListener", () => {});
     }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    async UNSAFE_componentWillMount() {
+    async componentDidMount() {
       const _this$props = this.props,
             {
         match,
@@ -105,7 +104,8 @@ function getAppInstance(options, appInfo, manifest) {
 
         if (!appInstance) {
           throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
-        }
+        } // eslint-disable-next-line react/no-did-mount-set-state
+
 
         this.setState({
           appInstance

package/dist/js/node/cli/index.js

@@ -291,16 +291,40 @@ var _default = ({
         };
       },
 
+      modifyAsyncEntry({
+        entrypoint,
+        code
+      }) {
+        var _config$deploy2, _config$source;
+
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        const config = useResolvedConfigContext();
+        let finalCode = code;
+
+        if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend && config !== null && config !== void 0 && (_config$source = config.source) !== null && _config$source !== void 0 && _config$source.enableAsyncEntry) {
+          finalCode = (0, _utils2.generateAsyncEntry)(code);
+          return {
+            entrypoint,
+            code: `${finalCode}`
+          };
+        }
+
+        return {
+          entrypoint,
+          code: finalCode
+        };
+      },
+
       modifyEntryExport({
         entrypoint,
         exportStatement
       }) {
-        var _config$deploy2;
+        var _config$deploy3;
 
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const config = useResolvedConfigContext();
 
-        if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
+        if (config !== null && config !== void 0 && (_config$deploy3 = config.deploy) !== null && _config$deploy3 !== void 0 && _config$deploy3.microFrontend) {
           const exportStatementCode = (0, _utils2.makeProvider)();
           (0, _util.logger)('exportStatement', exportStatementCode);
           return {

package/dist/js/node/cli/utils.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.generateAsyncEntry = void 0;
 exports.getRuntimeConfig = getRuntimeConfig;
 exports.makeRenderFunction = exports.makeProvider = void 0;
 exports.setRuntimeConfig = setRuntimeConfig;
@@ -130,4 +131,17 @@ function setRuntimeConfig(config, key, value) {
   }
 
   return undefined;
-}
+}
+
+const generateAsyncEntry = code => {
+  const transformCode = code.replace(`import('./bootstrap.js');`, `if (!window.__GARFISH__) { import('./bootstrap.js'); }`);
+  return `
+      export const provider = async (...args) => {
+        const exports = await import('./bootstrap');
+        return exports.provider.apply(null, args);
+      };
+      ${transformCode}
+    `;
+};
+
+exports.generateAsyncEntry = generateAsyncEntry;

package/dist/js/node/runtime/utils/apps.js

@@ -49,8 +49,7 @@ function getAppInstance(options, appInfo, manifest) {
       _defineProperty(this, "unregisterHistoryListener", () => {});
     }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    async UNSAFE_componentWillMount() {
+    async componentDidMount() {
       const _this$props = this.props,
             {
         match,
@@ -116,7 +115,8 @@ function getAppInstance(options, appInfo, manifest) {
 
         if (!appInstance) {
           throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
-        }
+        } // eslint-disable-next-line react/no-did-mount-set-state
+
 
         this.setState({
           appInstance

package/dist/js/treeshaking/cli/index.js

@@ -5,7 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import path from 'path';
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { logger } from "../util";
-import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig } from "./utils";
+import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig, generateAsyncEntry } from "./utils";
 export var externals = {
   'react-dom': 'react-dom',
   react: 'react'
@@ -279,15 +279,37 @@ export default (function () {
             code: nCode
           };
         },
-        modifyEntryExport: function modifyEntryExport(_ref7) {
-          var _config$deploy2;
+        modifyAsyncEntry: function modifyAsyncEntry(_ref7) {
+          var _config$deploy2, _config$source;
 
           var entrypoint = _ref7.entrypoint,
-              exportStatement = _ref7.exportStatement;
+              code = _ref7.code;
           // eslint-disable-next-line react-hooks/rules-of-hooks
           var config = useResolvedConfigContext();
+          var finalCode = code;
 
-          if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
+          if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend && config !== null && config !== void 0 && (_config$source = config.source) !== null && _config$source !== void 0 && _config$source.enableAsyncEntry) {
+            finalCode = generateAsyncEntry(code);
+            return {
+              entrypoint: entrypoint,
+              code: "".concat(finalCode)
+            };
+          }
+
+          return {
+            entrypoint: entrypoint,
+            code: finalCode
+          };
+        },
+        modifyEntryExport: function modifyEntryExport(_ref8) {
+          var _config$deploy3;
+
+          var entrypoint = _ref8.entrypoint,
+              exportStatement = _ref8.exportStatement;
+          // eslint-disable-next-line react-hooks/rules-of-hooks
+          var config = useResolvedConfigContext();
+
+          if (config !== null && config !== void 0 && (_config$deploy3 = config.deploy) !== null && _config$deploy3 !== void 0 && _config$deploy3.microFrontend) {
             var exportStatementCode = makeProvider();
             logger('exportStatement', exportStatementCode);
             return {

package/dist/js/treeshaking/cli/utils.js

@@ -32,4 +32,8 @@ export function setRuntimeConfig(config, key, value) {
   }
 
   return undefined;
-}
+}
+export var generateAsyncEntry = function generateAsyncEntry(code) {
+  var transformCode = code.replace("import('./bootstrap.js');", "if (!window.__GARFISH__) { import('./bootstrap.js'); }");
+  return "\n      export const provider = async (...args) => {\n        const exports = await import('./bootstrap');\n        return exports.provider.apply(null, args);\n      };\n      ".concat(transformCode, "\n    ");
+};

package/dist/js/treeshaking/runtime/utils/apps.js

@@ -53,10 +53,9 @@ function getAppInstance(options, appInfo, manifest) {
     }
 
     _createClass(MicroApp, [{
-      key: "UNSAFE_componentWillMount",
-      value: // eslint-disable-next-line @typescript-eslint/naming-convention
-      function () {
-        var _UNSAFE_componentWillMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      key: "componentDidMount",
+      value: function () {
+        var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           var _this2 = this;
 
           var _this$props, match, history, setLoadingState, userProps, domId, loadAppOptions, appInstance;
@@ -133,6 +132,7 @@ function getAppInstance(options, appInfo, manifest) {
                   throw new Error("MicroApp Garfish.loadApp \"".concat(appInfo.name, "\" result is null"));
 
                 case 11:
+                  // eslint-disable-next-line react/no-did-mount-set-state
                   this.setState({
                     appInstance: appInstance
                   });
@@ -192,11 +192,11 @@ function getAppInstance(options, appInfo, manifest) {
           }, _callee, this, [[5, 25]]);
         }));
 
-        function UNSAFE_componentWillMount() {
-          return _UNSAFE_componentWillMount.apply(this, arguments);
+        function componentDidMount() {
+          return _componentDidMount.apply(this, arguments);
         }
 
-        return UNSAFE_componentWillMount;
+        return componentDidMount;
       }()
     }, {
       key: "componentWillUnmount",

package/dist/types/cli/utils.d.ts

@@ -2,4 +2,5 @@ import type { NormalizedConfig } from '@modern-js/core';
 export declare const makeProvider: () => string;
 export declare const makeRenderFunction: (code: string) => string;
 export declare function getRuntimeConfig(config: Partial<NormalizedConfig>): any;
-export declare function setRuntimeConfig(config: Partial<NormalizedConfig>, key: string, value: any): undefined;
+export declare function setRuntimeConfig(config: Partial<NormalizedConfig>, key: string, value: any): undefined;
+export declare const generateAsyncEntry: (code: string) => string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.4",
+  "version": "1.21.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -50,16 +50,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "1.21.4",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
-    "react-loadable": "^5.5.0"
+    "react-loadable": "^5.5.0",
+    "@modern-js/utils": "1.21.6"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^1.21.4"
+    "@modern-js/runtime": "^1.21.6"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -67,11 +67,6 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.21.4",
-    "@modern-js/runtime": "1.21.4",
-    "@modern-js/types": "1.21.4",
-    "@scripts/build": "1.21.4",
-    "@scripts/jest-config": "1.21.4",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",
@@ -86,7 +81,12 @@
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.2.1",
     "typescript": "^4",
-    "webpack-chain": "^6.5.1"
+    "webpack-chain": "^6.5.1",
+    "@modern-js/core": "1.21.6",
+    "@modern-js/runtime": "1.21.6",
+    "@modern-js/types": "1.21.6",
+    "@scripts/build": "1.21.6",
+    "@scripts/jest-config": "1.21.6"
   },
   "sideEffects": false,
   "modernConfig": {},