@modern-js/plugin-garfish 2.0.0-beta.7 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/plugin-garfish
 
+## 2.0.0
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- 6bc7763: fix(plugin-garfish): 修复 assetPrefix 用户配置被 plugin-garfish 覆盖问题,自定义入口未正确传递节点参数
+  fix(plugin-garfish): Fix the problem that the assetPrefix user configuration is overwritten by plugin-garfish, and the custom entry does not pass the node parameters correctly
+- 81b54f9: fix: garfish wrapped app missing props
+  fix: garfish 包装过的 APP 缺少 props
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [ffb2ed4]
+- Updated dependencies [bbe4c4ab64]
+  - @modern-js/runtime@2.0.0
+  - @modern-js/utils@2.0.0
+
 ## 2.0.0-beta.7
 
 ### Major Changes

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

@@ -134,11 +134,11 @@ var cli_default = ({
               env = process.env.NODE_ENV || "development",
               CHAIN_ID
             }) => {
-              var _a2, _b2, _c2, _d;
+              var _a2, _b2, _c2, _d, _e;
               const resolveOptions = useResolvedConfigContext();
               if ((_a2 = resolveOptions == null ? void 0 : resolveOptions.deploy) == null ? void 0 : _a2.microFrontend) {
                 chain.output.libraryTarget("umd");
-                if (((_b2 = resolveOptions == null ? void 0 : resolveOptions.server) == null ? void 0 : _b2.port) && env === "development") {
+                if (!((_b2 = useConfig.dev) == null ? void 0 : _b2.assetPrefix) && ((_c2 = resolveOptions == null ? void 0 : resolveOptions.server) == null ? void 0 : _c2.port) && env === "development") {
                   chain.output.publicPath(
                     `//localhost:${resolveOptions.server.port}/`
                   );
@@ -147,7 +147,7 @@ var cli_default = ({
                   chain.plugin(CHAIN_ID.PLUGIN.BANNER).use(webpack.BannerPlugin, [{ banner: "Micro front-end" }]);
                 }
                 const { enableHtmlEntry, externalBasicLibrary } = getDefaultMicroFrontedConfig(
-                  (_c2 = resolveOptions.deploy) == null ? void 0 : _c2.microFrontend
+                  (_d = resolveOptions.deploy) == null ? void 0 : _d.microFrontend
                 );
                 if (externalBasicLibrary) {
                   chain.externals(externals);
@@ -166,7 +166,7 @@ var cli_default = ({
                 output: resolveWebpackConfig.output,
                 externals: resolveWebpackConfig.externals,
                 env,
-                alias: (_d = resolveWebpackConfig.resolve) == null ? void 0 : _d.alias,
+                alias: (_e = resolveWebpackConfig.resolve) == null ? void 0 : _e.alias,
                 plugins: resolveWebpackConfig.plugins
               });
             }

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

@@ -67,11 +67,11 @@ function generateRouterPlugin (basename,routerConfig) {
   return router(routerConfig);
 }
 
-function generateAppWrapperAndRootDom ({ App, props, dom }) {
+function generateAppWrapperAndRootDom ({ App, props: garfishProps, dom }) {
   let AppWrapper = App;
-  if (props) {
-    AppWrapper = function () {
-      return React.createElement(App, props);
+  if (garfishProps) {
+    AppWrapper = function (props) {
+      return React.createElement(App, { ...garfishProps, ...props });
     };
     AppWrapper = hoistNonReactStatics(AppWrapper, App);
   }
@@ -88,6 +88,9 @@ const makeRenderFunction = (code) => {
   return inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace("(App)", `(AppWrapper)`).replace(/MOUNT_ID/g, "mountNode").replace(
     `bootstrap(AppWrapper, mountNode, root`,
     "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
+  ).replace(
+    `customBootstrap(AppWrapper)`,
+    "customBootstrap(AppWrapper, mountNode)"
   );
 };
 function getRuntimeConfig(config) {

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

@@ -150,11 +150,11 @@ var cli_default = ({
               env = process.env.NODE_ENV || "development",
               CHAIN_ID
             }) => {
-              var _a2, _b2, _c2, _d;
+              var _a2, _b2, _c2, _d, _e;
               const resolveOptions = useResolvedConfigContext();
               if ((_a2 = resolveOptions == null ? void 0 : resolveOptions.deploy) == null ? void 0 : _a2.microFrontend) {
                 chain.output.libraryTarget("umd");
-                if (((_b2 = resolveOptions == null ? void 0 : resolveOptions.server) == null ? void 0 : _b2.port) && env === "development") {
+                if (!((_b2 = useConfig.dev) == null ? void 0 : _b2.assetPrefix) && ((_c2 = resolveOptions == null ? void 0 : resolveOptions.server) == null ? void 0 : _c2.port) && env === "development") {
                   chain.output.publicPath(
                     `//localhost:${resolveOptions.server.port}/`
                   );
@@ -163,7 +163,7 @@ var cli_default = ({
                   chain.plugin(CHAIN_ID.PLUGIN.BANNER).use(webpack.BannerPlugin, [{ banner: "Micro front-end" }]);
                 }
                 const { enableHtmlEntry, externalBasicLibrary } = getDefaultMicroFrontedConfig(
-                  (_c2 = resolveOptions.deploy) == null ? void 0 : _c2.microFrontend
+                  (_d = resolveOptions.deploy) == null ? void 0 : _d.microFrontend
                 );
                 if (externalBasicLibrary) {
                   chain.externals(externals);
@@ -182,7 +182,7 @@ var cli_default = ({
                 output: resolveWebpackConfig.output,
                 externals: resolveWebpackConfig.externals,
                 env,
-                alias: (_d = resolveWebpackConfig.resolve) == null ? void 0 : _d.alias,
+                alias: (_e = resolveWebpackConfig.resolve) == null ? void 0 : _e.alias,
                 plugins: resolveWebpackConfig.plugins
               });
             }

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

@@ -93,11 +93,11 @@ function generateRouterPlugin (basename,routerConfig) {
   return router(routerConfig);
 }
 
-function generateAppWrapperAndRootDom ({ App, props, dom }) {
+function generateAppWrapperAndRootDom ({ App, props: garfishProps, dom }) {
   let AppWrapper = App;
-  if (props) {
-    AppWrapper = function () {
-      return React.createElement(App, props);
+  if (garfishProps) {
+    AppWrapper = function (props) {
+      return React.createElement(App, { ...garfishProps, ...props });
     };
     AppWrapper = hoistNonReactStatics(AppWrapper, App);
   }
@@ -114,6 +114,9 @@ const makeRenderFunction = (code) => {
   return inGarfishToRender + code.replace(`router(`, `generateRouterPlugin(basename,`).replace("(App)", `(AppWrapper)`).replace(/MOUNT_ID/g, "mountNode").replace(
     `bootstrap(AppWrapper, mountNode, root`,
     "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null"
+  ).replace(
+    `customBootstrap(AppWrapper)`,
+    "customBootstrap(AppWrapper, mountNode)"
   );
 };
 function getRuntimeConfig(config) {

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

@@ -247,9 +247,9 @@ var cli_default = function() {
                                 var ref, ref1;
                                 var resolveOptions = useResolvedConfigContext();
                                 if (resolveOptions === null || resolveOptions === void 0 ? void 0 : (ref = resolveOptions.deploy) === null || ref === void 0 ? void 0 : ref.microFrontend) {
-                                    var ref2, ref3;
+                                    var ref2, ref3, ref4;
                                     chain.output.libraryTarget("umd");
-                                    if ((resolveOptions === null || resolveOptions === void 0 ? void 0 : (ref2 = resolveOptions.server) === null || ref2 === void 0 ? void 0 : ref2.port) && env === "development") {
+                                    if (!((ref2 = useConfig.dev) === null || ref2 === void 0 ? void 0 : ref2.assetPrefix) && (resolveOptions === null || resolveOptions === void 0 ? void 0 : (ref3 = resolveOptions.server) === null || ref3 === void 0 ? void 0 : ref3.port) && env === "development") {
                                         chain.output.publicPath("//localhost:".concat(resolveOptions.server.port, "/"));
                                     }
                                     if (webpack.BannerPlugin) {
@@ -259,7 +259,7 @@ var cli_default = function() {
                                             }
                                         ]);
                                     }
-                                    var ref4 = getDefaultMicroFrontedConfig((ref3 = resolveOptions.deploy) === null || ref3 === void 0 ? void 0 : ref3.microFrontend), enableHtmlEntry = ref4.enableHtmlEntry, externalBasicLibrary = ref4.externalBasicLibrary;
+                                    var ref5 = getDefaultMicroFrontedConfig((ref4 = resolveOptions.deploy) === null || ref4 === void 0 ? void 0 : ref4.microFrontend), enableHtmlEntry = ref5.enableHtmlEntry, externalBasicLibrary = ref5.externalBasicLibrary;
                                     if (externalBasicLibrary) {
                                         chain.externals(externals);
                                     }

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

@@ -1,9 +1,9 @@
 var makeProvider = function() {
-    return "\nexport const provider = function ({basename, dom}) {\n  return {\n    render({basename, dom, props, appName}) {\n      render({ props, basename, dom, appName });\n    },\n    destroy({ dom }) {\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n      if (node) {\n        if (IS_REACT18) {\n          root.unmount();\n        } else {\n          unmountComponentAtNode(node);\n        }\n      }\n    },\n    SubModuleComponent: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    },\n    jupiter_submodule_app_key: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    }\n  }\n};\n\nif (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n  __GARFISH_EXPORTS__.provider = provider;\n}\n\nfunction canContinueRender ({ dom, appName }) {\n  var renderByGarfish =\n    typeof __GARFISH_EXPORTS__ !== 'undefined'\n    || typeof window !== 'undefined' && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.some((app)=>app.appInfo.name === appName);\n  let renderByProvider = dom || appName;\n  if (renderByGarfish) {\n    // Runs in the Garfish environment and is rendered by the provider\n    if (renderByProvider) {\n      return true;\n    } else {\n      // Runs in the Garfish environment and is not rendered by the provider\n      return false;\n    }\n  } else {\n    // Running in a non-Garfish environment\n    return true;\n  }\n}\n\nfunction generateRouterPlugin (basename,routerConfig) {\n  if (basename) {\n    routerConfig.basename = basename;\n    if (routerConfig.supportHtml5History !== false) {\n      if (!routerConfig.historyOptions) {\n        routerConfig.historyOptions = {\n          basename: basename\n        };\n      } else {\n        routerConfig.historyOptions.basename = basename;\n      }\n    }\n  }\n  return router(routerConfig);\n}\n\nfunction generateAppWrapperAndRootDom ({ App, props, dom }) {\n  let AppWrapper = App;\n  if (props) {\n    AppWrapper = function () {\n      return React.createElement(App, props);\n    };\n    AppWrapper = hoistNonReactStatics(AppWrapper, App);\n  }\n  const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);\n  return { AppWrapper, mountNode }\n}\n";
+    return "\nexport const provider = function ({basename, dom}) {\n  return {\n    render({basename, dom, props, appName}) {\n      render({ props, basename, dom, appName });\n    },\n    destroy({ dom }) {\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n      if (node) {\n        if (IS_REACT18) {\n          root.unmount();\n        } else {\n          unmountComponentAtNode(node);\n        }\n      }\n    },\n    SubModuleComponent: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    },\n    jupiter_submodule_app_key: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    }\n  }\n};\n\nif (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n  __GARFISH_EXPORTS__.provider = provider;\n}\n\nfunction canContinueRender ({ dom, appName }) {\n  var renderByGarfish =\n    typeof __GARFISH_EXPORTS__ !== 'undefined'\n    || typeof window !== 'undefined' && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.some((app)=>app.appInfo.name === appName);\n  let renderByProvider = dom || appName;\n  if (renderByGarfish) {\n    // Runs in the Garfish environment and is rendered by the provider\n    if (renderByProvider) {\n      return true;\n    } else {\n      // Runs in the Garfish environment and is not rendered by the provider\n      return false;\n    }\n  } else {\n    // Running in a non-Garfish environment\n    return true;\n  }\n}\n\nfunction generateRouterPlugin (basename,routerConfig) {\n  if (basename) {\n    routerConfig.basename = basename;\n    if (routerConfig.supportHtml5History !== false) {\n      if (!routerConfig.historyOptions) {\n        routerConfig.historyOptions = {\n          basename: basename\n        };\n      } else {\n        routerConfig.historyOptions.basename = basename;\n      }\n    }\n  }\n  return router(routerConfig);\n}\n\nfunction generateAppWrapperAndRootDom ({ App, props: garfishProps, dom }) {\n  let AppWrapper = App;\n  if (garfishProps) {\n    AppWrapper = function (props) {\n      return React.createElement(App, { ...garfishProps, ...props });\n    };\n    AppWrapper = hoistNonReactStatics(AppWrapper, App);\n  }\n  const mountNode = dom ? (dom.querySelector('#' + MOUNT_ID) || dom) : document.getElementById(MOUNT_ID);\n  return { AppWrapper, mountNode }\n}\n";
 };
 var makeRenderFunction = function(code) {
     var inGarfishToRender = "\n  const { basename, props, dom, appName } = typeof arguments[0] === 'object' && arguments[0] || {};\n  if (!canContinueRender({ dom, appName })) return null;\n  let { AppWrapper, mountNode } = generateAppWrapperAndRootDom({App, props, dom});\n  ";
-    return inGarfishToRender + code.replace("router(", "generateRouterPlugin(basename,").replace("(App)", "(AppWrapper)").replace(/MOUNT_ID/g, "mountNode").replace("bootstrap(AppWrapper, mountNode, root", "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null");
+    return inGarfishToRender + code.replace("router(", "generateRouterPlugin(basename,").replace("(App)", "(AppWrapper)").replace(/MOUNT_ID/g, "mountNode").replace("bootstrap(AppWrapper, mountNode, root", "bootstrap(AppWrapper, mountNode, root = IS_REACT18 ? ReactDOM.createRoot(mountNode) : null").replace("customBootstrap(AppWrapper)", "customBootstrap(AppWrapper, mountNode)");
 };
 function getRuntimeConfig(config) {
     var ref;

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

@@ -1,12 +1,12 @@
 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 type UseConfig = ReturnType<typeof useConfigContext>;
 export declare const externals: {
   'react-dom': string;
   react: string;
 };
-export declare type LifeCycle = CliHookCallbacks;
-declare type NonInValidAble<T> = T extends null | undefined | false ? never : T;
+export type LifeCycle = CliHookCallbacks;
+type NonInValidAble<T> = T extends null | undefined | false ? never : T;
 export declare function getDefaultMicroFrontedConfig(microFrontend: NonInValidAble<NonNullable<UseConfig['deploy']>['microFrontend']>): any;
 
 declare const _default: ({

package/dist/types/runtime/useModuleApps.d.ts

@@ -1,19 +1,19 @@
 import garfish, { interfaces as GarfishInterfaces } from 'garfish';
 import React from 'react';
-export declare type Options = typeof garfish.options;
-export declare type ModuleInfo = GarfishInterfaces.AppInfo & {
+export type Options = typeof garfish.options;
+export type ModuleInfo = GarfishInterfaces.AppInfo & {
   Component?: React.ComponentType | React.ElementType;
   path?: string;
   originInfo?: Record<string, unknown>;
 };
-export declare type ModulesInfo = Array<ModuleInfo>;
-export declare type Manifest = {
+export type ModulesInfo = Array<ModuleInfo>;
+export type Manifest = {
   modules?: ModulesInfo;
   loadable?: LoadableConfig;
   componentRender?: boolean;
   getAppList?: (info: any) => Promise<Array<GarfishInterfaces.AppInfo>>;
 };
-export declare type LoadingComponent = React.ComponentType<{
+export type LoadingComponent = React.ComponentType<{
   isLoading: boolean;
   pastDelay: boolean;
   timedOut: boolean;
@@ -25,15 +25,15 @@ export interface LoadableConfig {
   delay?: number;
   loading?: LoadingComponent;
 }
-export declare type ModernGarfishConfig = {
+export type ModernGarfishConfig = {
   manifest?: Manifest;
 };
-export declare type MicroComponentProps = {
+export type MicroComponentProps = {
   loadable?: LoadableConfig;
   [index: string]: any;
 };
-export declare type Config = Partial<Options> & ModernGarfishConfig;
-export declare type UseModuleApps = { [index in 'apps' | string]: index extends 'apps' ? ModulesInfo : React.FC<MicroComponentProps> } & {
+export type Config = Partial<Options> & ModernGarfishConfig;
+export type UseModuleApps = { [index in 'apps' | string]: index extends 'apps' ? ModulesInfo : React.FC<MicroComponentProps> } & {
   readonly MApp: React.FC<MicroComponentProps>;
   readonly apps: ModulesInfo;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -60,10 +60,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "2.0.0-beta.7"
+    "@modern-js/utils": "2.0.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.0.0-beta.7"
+    "@modern-js/runtime": "^2.0.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -85,13 +85,13 @@
     "react-router-dom": "^6.6.0",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/app-tools": "2.0.0-beta.7",
-    "@modern-js/core": "2.0.0-beta.7",
-    "@modern-js/runtime": "2.0.0-beta.7",
-    "@modern-js/plugin-router-v5": "2.0.0-beta.7",
-    "@modern-js/types": "2.0.0-beta.7",
-    "@scripts/build": "2.0.0-beta.7",
-    "@scripts/jest-config": "2.0.0-beta.7"
+    "@modern-js/app-tools": "2.0.0",
+    "@modern-js/core": "2.0.0",
+    "@modern-js/runtime": "2.0.0",
+    "@modern-js/plugin-router-v5": "2.0.0",
+    "@modern-js/types": "2.0.0",
+    "@scripts/build": "2.0.0",
+    "@scripts/jest-config": "2.0.0"
   },
   "sideEffects": false,
   "modernConfig": {},