@modern-js/plugin-garfish 2.40.0 → 2.42.0

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

@@ -32,7 +32,8 @@ function pathJoin() {
   return res || "/";
 }
 function getAppInstance(options, appInfo, manifest) {
-  var MicroApp = function MicroApp2(props) {
+  var locationHref = "";
+  function MicroApp(props) {
     var _context_router_useRouteMatch, _context_router, _context_router_useMatches, _context_router1, _context_router_useLocation, _context_router2;
     var appRef = useRef(null);
     var domId = generateSubAppContainerKey(appInfo);
@@ -63,6 +64,9 @@ function getAppInstance(options, appInfo, manifest) {
       location
     ]);
     useEffect(function() {
+      var renderApp = function renderApp2() {
+        return _renderApp.apply(this, arguments);
+      };
       var setLoadingState = props.setLoadingState, userProps = _object_without_properties(props, [
         "setLoadingState"
       ]);
@@ -110,9 +114,6 @@ function getAppInstance(options, appInfo, manifest) {
       logger('MicroApp Garfish.loadApp "'.concat(appInfo.name, '"'), {
         loadAppOptions
       });
-      function renderApp() {
-        return _renderApp.apply(this, arguments);
-      }
       function _renderApp() {
         _renderApp = _async_to_generator(function() {
           var appInstance, error;
@@ -215,8 +216,7 @@ function getAppInstance(options, appInfo, manifest) {
         children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {})
       })
     });
-  };
-  var locationHref = "";
+  }
   return Loadable(MicroApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
 function generateApps(options, manifest) {

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

@@ -2,17 +2,14 @@ import type { CliHookCallbacks, useConfigContext } from '@modern-js/core';
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
 export type UseConfig = ReturnType<typeof useConfigContext>;
 export declare const externals: {
-  'react-dom': string;
-  react: string;
+    'react-dom': string;
+    react: string;
 };
 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;
-export declare const garfishPlugin: ({
-  pluginName,
-  runtimePluginName
-}?: {
-  pluginName?: string | undefined;
-  runtimePluginName?: string | undefined;
+export declare const garfishPlugin: ({ pluginName, runtimePluginName, }?: {
+    pluginName?: string | undefined;
+    runtimePluginName?: string | undefined;
 }) => CliPlugin<AppTools>;
-export default garfishPlugin;
+export default garfishPlugin;

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

@@ -3,4 +3,4 @@ export declare const makeProvider: () => string;
 export declare const makeRenderFunction: (code: string) => string;
 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;
+export declare const generateAsyncEntry: (code: string) => string;

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

@@ -1 +1 @@
-export { default as hoistNonReactStatics } from 'hoist-non-react-statics';
+export { default as hoistNonReactStatics } from 'hoist-non-react-statics';

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { default } from './runtime';
-export * from './runtime';
+export * from './runtime';

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

@@ -1,4 +1,4 @@
 export { default } from './plugin';
 export { useModuleApps, useModuleApp } from './useModuleApps';
 export type { Manifest, ModuleInfo, Config } from './useModuleApps';
-export { default as Garfish, default as garfish } from 'garfish';
+export { default as Garfish, default as garfish } from 'garfish';

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

@@ -1,10 +1,10 @@
 /// <reference types="react" />
 import { LoadableConfig, MicroComponentProps } from './useModuleApps';
 export interface MicroProps {
-  setLoadingState: (state: {
-    isLoading?: boolean;
-    error?: unknown;
-  }) => void;
-  [key: string]: any;
+    setLoadingState: (state: {
+        isLoading?: boolean;
+        error?: unknown;
+    }) => void;
+    [key: string]: any;
 }
-export declare function Loadable(WrapComponent: any): (defaultLoadable?: LoadableConfig) => (props: MicroComponentProps) => JSX.Element;
+export declare function Loadable(WrapComponent: any): (defaultLoadable?: LoadableConfig) => (props: MicroComponentProps) => JSX.Element;

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

@@ -1,4 +1,4 @@
 import type { Plugin } from '@modern-js/runtime';
 import { Config } from './useModuleApps';
 declare const _default: (config: Config) => Plugin;
-export default _default;
+export default _default;

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

@@ -2,40 +2,42 @@ import garfish, { interfaces as GarfishInterfaces } from 'garfish';
 import React from 'react';
 export type Options = typeof garfish.options;
 export type ModuleInfo = GarfishInterfaces.AppInfo & {
-  Component?: React.ComponentType | React.ElementType;
-  path?: string;
-  originInfo?: Record<string, unknown>;
+    Component?: React.ComponentType | React.ElementType;
+    path?: string;
+    originInfo?: Record<string, unknown>;
 };
 export type ModulesInfo = Array<ModuleInfo>;
 export type Manifest = {
-  modules?: ModulesInfo;
-  loadable?: LoadableConfig;
-  componentRender?: boolean;
-  getAppList?: (info: any) => Promise<Array<GarfishInterfaces.AppInfo>>;
+    modules?: ModulesInfo;
+    loadable?: LoadableConfig;
+    componentRender?: boolean;
+    getAppList?: (info: any) => Promise<Array<GarfishInterfaces.AppInfo>>;
 };
 export type LoadingComponent = React.ComponentType<{
-  isLoading: boolean;
-  pastDelay: boolean;
-  timedOut: boolean;
-  error: any;
-  retry: () => void;
+    isLoading: boolean;
+    pastDelay: boolean;
+    timedOut: boolean;
+    error: any;
+    retry: () => void;
 }>;
 export interface LoadableConfig {
-  timeout?: number;
-  delay?: number;
-  loading?: LoadingComponent;
+    timeout?: number;
+    delay?: number;
+    loading?: LoadingComponent;
 }
 export type ModernGarfishConfig = {
-  manifest?: Manifest;
+    manifest?: Manifest;
 };
 export type MicroComponentProps = {
-  loadable?: LoadableConfig;
-  [index: string]: any;
+    loadable?: LoadableConfig;
+    [index: string]: any;
 };
 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;
+export type UseModuleApps = {
+    [index in 'apps' | string]: index extends 'apps' ? ModulesInfo : React.FC<MicroComponentProps>;
+} & {
+    readonly MApp: React.FC<MicroComponentProps>;
+    readonly apps: ModulesInfo;
 };
 export declare function useModuleApps(): UseModuleApps;
-export declare function useModuleApp(): React.FC<any>;
+export declare function useModuleApp(): React.FC<any>;

package/dist/types/runtime/utils/Context.d.ts

@@ -1,10 +1,10 @@
 import React from 'react';
 import { ModulesInfo } from '../useModuleApps';
 export interface GarfishContextType {
-  MApp: React.FC<any>;
-  apps: Record<string, React.FC<any>>;
-  appInfoList: ModulesInfo;
+    MApp: React.FC<any>;
+    apps: Record<string, React.FC<any>>;
+    appInfoList: ModulesInfo;
 }
 declare const GarfishContext: React.Context<GarfishContextType>;
 declare const GarfishProvider: React.Provider<GarfishContextType>;
-export { GarfishContext, GarfishProvider };
+export { GarfishContext, GarfishProvider };

package/dist/types/runtime/utils/MApp.d.ts

@@ -2,10 +2,10 @@
 import Garfish from 'garfish';
 import { Manifest, ModulesInfo } from '../useModuleApps';
 declare global {
-  interface Window {
-    modern_manifest?: {
-      modules: ModulesInfo;
-    };
-  }
+    interface Window {
+        modern_manifest?: {
+            modules: ModulesInfo;
+        };
+    }
 }
-export declare function generateMApp(options: typeof Garfish.options, manifest?: Manifest): (props: import("../useModuleApps").MicroComponentProps) => JSX.Element;
+export declare function generateMApp(options: typeof Garfish.options, manifest?: Manifest): (props: import("../useModuleApps").MicroComponentProps) => JSX.Element;

package/dist/types/runtime/utils/apps.d.ts

@@ -2,14 +2,14 @@ import React from 'react';
 import Garfish, { interfaces } from 'garfish';
 import { Manifest, MicroComponentProps, ModulesInfo } from '../useModuleApps';
 export interface Provider extends interfaces.Provider {
-  SubModuleComponent?: React.ComponentType<any>;
-  jupiter_submodule_app_key?: React.ComponentType<any>;
+    SubModuleComponent?: React.ComponentType<any>;
+    jupiter_submodule_app_key?: React.ComponentType<any>;
 }
 export interface AppMap {
-  [key: string]: React.FC<MicroComponentProps>;
+    [key: string]: React.FC<MicroComponentProps>;
 }
 export declare function pathJoin(...args: string[]): string;
 export declare function generateApps(options: typeof Garfish.options, manifest?: Manifest): {
-  apps: AppMap;
-  appInfoList: ModulesInfo;
-};
+    apps: AppMap;
+    appInfoList: ModulesInfo;
+};

package/dist/types/runtime/utils/setExternal.d.ts

@@ -1,2 +1,2 @@
 declare const _default: () => void;
-export default _default;
+export default _default;

package/dist/types/util.d.ts

@@ -5,4 +5,4 @@ import createDebug from 'debug';
 import { ModuleInfo } from './runtime';
 export declare const logger: createDebug.Debugger;
 export declare const SUBMODULE_APP_COMPONENT_KEY = "SubModuleComponent";
-export declare function generateSubAppContainerKey(moduleInfo?: ModuleInfo): string;
+export declare function generateSubAppContainerKey(moduleInfo?: ModuleInfo): string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.40.0",
+  "version": "2.42.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -63,17 +63,17 @@
     }
   },
   "dependencies": {
-    "@types/debug": "^4.1.7",
+    "@types/debug": "4.1.7",
     "@types/react-loadable": "^5.5.6",
-    "debug": "^4.3.2",
+    "debug": "4.3.4",
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.40.0"
+    "@swc/helpers": "0.5.3",
+    "@modern-js/utils": "2.42.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.40.0",
+    "@modern-js/runtime": "^2.42.0",
     "react": ">=17",
     "react-dom": ">=17"
   },
@@ -91,13 +91,13 @@
     "react-dom": "^18",
     "react-router-dom": "6.17.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.40.0",
-    "@modern-js/core": "2.40.0",
-    "@modern-js/plugin-router-v5": "2.40.0",
-    "@modern-js/runtime": "2.40.0",
-    "@modern-js/types": "2.40.0",
-    "@scripts/build": "2.40.0",
-    "@scripts/jest-config": "2.40.0"
+    "@modern-js/core": "2.42.0",
+    "@modern-js/plugin-router-v5": "2.42.0",
+    "@modern-js/runtime": "2.42.0",
+    "@modern-js/app-tools": "2.42.0",
+    "@modern-js/types": "2.42.0",
+    "@scripts/build": "2.42.0",
+    "@scripts/jest-config": "2.42.0"
   },
   "sideEffects": false,
   "publishConfig": {