@modern-js/plugin-garfish 2.0.0-beta.1 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @modern-js/plugin-garfish
 
+## 2.0.0-beta.2
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 21d2ddb: feat: support async export provider for module federation
+  支持模块联邦场景异步导出 provider
+- 2344eb2: fix: loadApp when dom is mount
+  修复 dom 未渲染时挂载子应用行为
+- Updated dependencies [2344eb2]
+- Updated dependencies [a11fcf8]
+- Updated dependencies [b18fa8f3ed]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [3e57f2b]
+- Updated dependencies [fbf5eed]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [e4357f1]
+- Updated dependencies [4369648ae2]
+- Updated dependencies [92f0ead]
+- Updated dependencies [92c0994]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed587]
+- Updated dependencies [60d5378632]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [18aaf42]
+- Updated dependencies [fcace5b5b9]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/runtime@2.0.0-beta.2
+  - @modern-js/utils@2.0.0-beta.2
+
 ## 2.0.0-beta.1
 
 ### Major Changes

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

@@ -4,7 +4,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'
@@ -66,7 +66,7 @@ export default (({
         return nConfig;
       },
       config() {
-        var _useConfig$output$dis, _useConfig$output, _useConfig$deploy;
+        var _useConfig$output, _useConfig$deploy;
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const useConfig = useConfigContext();
         logger('useConfig', useConfig);
@@ -75,7 +75,7 @@ export default (({
         const config = useAppContext();
         pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'plugins');
         runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'index');
-        let disableCssExtract = (_useConfig$output$dis = (_useConfig$output = useConfig.output) === null || _useConfig$output === void 0 ? void 0 : _useConfig$output.disableCssExtract) !== null && _useConfig$output$dis !== void 0 ? _useConfig$output$dis : false;
+        let disableCssExtract = ((_useConfig$output = useConfig.output) === null || _useConfig$output === void 0 ? void 0 : _useConfig$output.disableCssExtract) || false;
 
         // When the micro-frontend application js entry, there is no need to extract css, close cssExtract
         if ((_useConfig$deploy = useConfig.deploy) !== null && _useConfig$deploy !== void 0 && _useConfig$deploy.microFrontend) {
@@ -84,6 +84,7 @@ export default (({
             enableHtmlEntry
           } = getDefaultMicroFrontedConfig((_useConfig$deploy2 = useConfig.deploy) === null || _useConfig$deploy2 === void 0 ? void 0 : _useConfig$deploy2.microFrontend);
           if (!enableHtmlEntry) {
+            // FIXME: the handle the `disableCssExtract` config
             disableCssExtract = true;
           }
         }
@@ -244,14 +245,34 @@ export default (({
           code: nCode
         };
       },
+      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

@@ -110,4 +110,14 @@ export function setRuntimeConfig(config, key, value) {
     return undefined;
   }
   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/node/cli/index.js

@@ -75,7 +75,7 @@ var _default = ({
         return nConfig;
       },
       config() {
-        var _useConfig$output$dis, _useConfig$output, _useConfig$deploy;
+        var _useConfig$output, _useConfig$deploy;
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const useConfig = useConfigContext();
         (0, _util.logger)('useConfig', useConfig);
@@ -84,7 +84,7 @@ var _default = ({
         const config = useAppContext();
         pluginsExportsUtils = (0, _utils.createRuntimeExportsUtils)(config.internalDirectory, 'plugins');
         runtimeExportsUtils = (0, _utils.createRuntimeExportsUtils)(config.internalDirectory, 'index');
-        let disableCssExtract = (_useConfig$output$dis = (_useConfig$output = useConfig.output) === null || _useConfig$output === void 0 ? void 0 : _useConfig$output.disableCssExtract) !== null && _useConfig$output$dis !== void 0 ? _useConfig$output$dis : false;
+        let disableCssExtract = ((_useConfig$output = useConfig.output) === null || _useConfig$output === void 0 ? void 0 : _useConfig$output.disableCssExtract) || false;
 
         // When the micro-frontend application js entry, there is no need to extract css, close cssExtract
         if ((_useConfig$deploy = useConfig.deploy) !== null && _useConfig$deploy !== void 0 && _useConfig$deploy.microFrontend) {
@@ -93,6 +93,7 @@ var _default = ({
             enableHtmlEntry
           } = getDefaultMicroFrontedConfig((_useConfig$deploy2 = useConfig.deploy) === null || _useConfig$deploy2 === void 0 ? void 0 : _useConfig$deploy2.microFrontend);
           if (!enableHtmlEntry) {
+            // FIXME: the handle the `disableCssExtract` config
             disableCssExtract = true;
           }
         }
@@ -253,14 +254,34 @@ var _default = ({
           code: nCode
         };
       },
+      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;
@@ -120,4 +121,15 @@ function setRuntimeConfig(config, key, value) {
     return undefined;
   }
   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/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'
@@ -81,7 +81,7 @@ export default (function () {
           return resolvedConfig;
         }(),
         config: function config() {
-          var _useConfig$output$dis, _useConfig$output, _useConfig$deploy;
+          var _useConfig$output, _useConfig$deploy;
           // eslint-disable-next-line react-hooks/rules-of-hooks
           var useConfig = useConfigContext();
           logger('useConfig', useConfig);
@@ -90,7 +90,7 @@ export default (function () {
           var config = useAppContext();
           pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'plugins');
           runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'index');
-          var disableCssExtract = (_useConfig$output$dis = (_useConfig$output = useConfig.output) === null || _useConfig$output === void 0 ? void 0 : _useConfig$output.disableCssExtract) !== null && _useConfig$output$dis !== void 0 ? _useConfig$output$dis : false;
+          var disableCssExtract = ((_useConfig$output = useConfig.output) === null || _useConfig$output === void 0 ? void 0 : _useConfig$output.disableCssExtract) || false;
 
           // When the micro-frontend application js entry, there is no need to extract css, close cssExtract
           if ((_useConfig$deploy = useConfig.deploy) !== null && _useConfig$deploy !== void 0 && _useConfig$deploy.microFrontend) {
@@ -98,6 +98,7 @@ export default (function () {
             var _getDefaultMicroFront = getDefaultMicroFrontedConfig((_useConfig$deploy2 = useConfig.deploy) === null || _useConfig$deploy2 === void 0 ? void 0 : _useConfig$deploy2.microFrontend),
               enableHtmlEntry = _getDefaultMicroFront.enableHtmlEntry;
             if (!enableHtmlEntry) {
+              // FIXME: the handle the `disableCssExtract` config
               disableCssExtract = true;
             }
           }
@@ -252,13 +253,32 @@ 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();
-          if (config !== null && config !== void 0 && (_config$deploy2 = config.deploy) !== null && _config$deploy2 !== void 0 && _config$deploy2.microFrontend) {
+          var 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: 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

@@ -28,4 +28,8 @@ export function setRuntimeConfig(config, key, value) {
     return undefined;
   }
   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/types/cli/index.d.ts

@@ -1,4 +1,5 @@
-import type { CliHookCallbacks, CliPlugin, useConfigContext } from '@modern-js/core';
+import type { CliHookCallbacks, useConfigContext } from '@modern-js/core';
+import type { CliPlugin, AppTools } from '@modern-js/app-tools';
 export declare type UseConfig = ReturnType<typeof useConfigContext>;
 export declare const externals: {
   'react-dom': string;
@@ -6,11 +7,7 @@ export declare const externals: {
 };
 export declare type LifeCycle = CliHookCallbacks;
 declare type NonInValidAble<T> = T extends null | undefined | false ? never : T;
-export declare function getDefaultMicroFrontedConfig(microFrontend: NonInValidAble<NonNullable<UseConfig['deploy']>['microFrontend']>): {
-  enableHtmlEntry: boolean;
-  externalBasicLibrary: boolean;
-  moduleApp?: string | undefined;
-};
+export declare function getDefaultMicroFrontedConfig(microFrontend: NonInValidAble<NonNullable<UseConfig['deploy']>['microFrontend']>): any;
 declare const _default: ({
   pluginName,
   runtimePluginName,
@@ -19,5 +16,5 @@ declare const _default: ({
   pluginName?: string | undefined;
   runtimePluginName?: string | undefined;
   mfPackagePath?: string | undefined;
-}) => CliPlugin;
+}) => CliPlugin<AppTools>;
 export default _default;

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

@@ -1,5 +1,6 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { AppNormalizedConfig } from '@modern-js/app-tools';
 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 getRuntimeConfig(config: Partial<AppNormalizedConfig>): any;
+export declare function setRuntimeConfig(config: Partial<AppNormalizedConfig>, key: string, value: any): undefined;
+export declare const generateAsyncEntry: (code: string) => string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -56,10 +56,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "2.0.0-beta.1"
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.0.0-beta.1"
+    "@modern-js/runtime": "^2.0.0-beta.2"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -71,9 +71,9 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.4.3",
-    "@types/testing-library__jest-dom": "^5.14.3",
     "@types/jest": "^27",
     "@types/node": "^14",
+    "@types/testing-library__jest-dom": "^5.14.3",
     "jest": "^27",
     "jest-fetch-mock": "^3.0.3",
     "react": "^18",
@@ -81,12 +81,13 @@
     "react-router-dom": "^6.2.1",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.0.0-beta.1",
-    "@modern-js/runtime": "2.0.0-beta.1",
-    "@modern-js/plugin-router-legacy": "2.0.0-beta.1",
-    "@modern-js/types": "2.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@modern-js/core": "2.0.0-beta.2",
+    "@modern-js/plugin-router-legacy": "2.0.0-beta.2",
+    "@modern-js/runtime": "2.0.0-beta.2",
+    "@modern-js/types": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@modern-js/app-tools": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "modernConfig": {},
@@ -95,8 +96,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "build:watch": "rm -rf ./dist && modern build --watch",
     "test": "jest --passWithNoTests"
   }