@modern-js/plugin-garfish 2.54.6 → 2.55.0

package/dist/esm-node/runtime/render.js

@@ -0,0 +1,56 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from "@modern-js/runtime/browser";
+import { createRoot } from "@modern-js/runtime/react";
+function isRenderGarfish(params) {
+  const renderByGarfish = typeof __GARFISH_EXPORTS__ !== "undefined" || typeof window !== "undefined" && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.some((app) => {
+    var _app_appInfo;
+    return ((_app_appInfo = app.appInfo) === null || _app_appInfo === void 0 ? void 0 : _app_appInfo.name) === (params === null || params === void 0 ? void 0 : params.appName);
+  });
+  return renderByGarfish;
+}
+function canContinueRender({ dom, appName }) {
+  const renderByGarfish = isRenderGarfish({
+    appName
+  });
+  const renderByProvider = dom || appName;
+  if (renderByGarfish) {
+    if (renderByProvider) {
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return true;
+  }
+}
+async function garfishRender(mountId, customBootstrap, _params) {
+  const { basename, props, dom, appName } = (
+    // eslint-disable-next-line prefer-rest-params
+    typeof arguments[2] === "object" && arguments[2] || {}
+  );
+  if (canContinueRender({
+    dom,
+    appName
+  })) {
+    const ModernRoot = createRoot(null, {
+      router: {
+        basename
+      }
+    });
+    if (customBootstrap) {
+      return customBootstrap(ModernRoot, () => render(/* @__PURE__ */ _jsx(ModernRoot, {
+        basename,
+        ...props
+      }), dom || mountId));
+    }
+    return render(/* @__PURE__ */ _jsx(ModernRoot, {
+      basename,
+      ...props
+    }), dom || mountId);
+  }
+  return null;
+}
+export {
+  garfishRender,
+  isRenderGarfish
+};

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

@@ -0,0 +1,7 @@
+import type { AppTools, IAppContext, NormalizedConfig } from '@modern-js/app-tools';
+import { Entrypoint } from '@modern-js/types';
+import type { MaybeAsync } from '@modern-js/core';
+export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+export declare const generateCode: (entrypoints: Entrypoint[], appContext: IAppContext, config: NormalizedConfig<AppTools>, appendEntryCode: (input: {
+    entrypoint: Entrypoint;
+}) => MaybeAsync<string[]>) => Promise<void>;

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

@@ -1,5 +1,6 @@
-import type { CliHookCallbacks, useConfigContext } from '@modern-js/core';
+import { AsyncWorkflow, type CliHookCallbacks, type useConfigContext } from '@modern-js/core';
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import { Entrypoint } from '@modern-js/types';
 export type UseConfig = ReturnType<typeof useConfigContext>;
 export declare const externals: {
     'react-dom': string;
@@ -8,8 +9,14 @@ export declare const externals: {
 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;
-}) => CliPlugin<AppTools>;
+declare const appendEntryCode: AsyncWorkflow<{
+    entrypoint: Entrypoint;
+}, string>;
+export declare const garfishPlugin: () => CliPlugin<AppTools & {
+    hooks: {
+        appendEntryCode: AsyncWorkflow<{
+            entrypoint: Entrypoint;
+        }, string>;
+    };
+}>;
 export default garfishPlugin;

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

@@ -0,0 +1,11 @@
+export declare const index: ({ srcDirectory, internalSrcAlias, metaName, entry, entryName, customEntry, customBootstrap, mountId, appendCode, }: {
+    srcDirectory: string;
+    internalSrcAlias: string;
+    metaName: string;
+    entry: string;
+    entryName: string;
+    customEntry?: boolean | undefined;
+    customBootstrap?: string | false | undefined;
+    mountId?: string | undefined;
+    appendCode?: string[] | undefined;
+}) => string;

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

@@ -1,6 +1,4 @@
 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<AppNormalizedConfig>): any;
 export declare function setRuntimeConfig(config: Partial<AppNormalizedConfig>, key: string, value: any): undefined;
-export declare const generateAsyncEntry: (code: string) => string;
+export declare const generateAsyncEntryCode: (appendCode?: string[]) => string;

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

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

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 declare const garfishPlugin: (config: Config) => Plugin;
+export default garfishPlugin;

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

@@ -0,0 +1,17 @@
+/// <reference types="react" />
+export declare function createProvider(id?: string, customBootstrap?: (App: React.ComponentType, render: () => void) => HTMLElement | null): ({ basename, dom }: {
+    basename: string;
+    dom: HTMLElement;
+}) => {
+    render({ basename, dom, props, appName, }: {
+        basename: string;
+        dom: HTMLElement;
+        props: any;
+        appName?: string | undefined;
+    }): Promise<void>;
+    destroy({ dom }: {
+        dom: HTMLElement;
+    }): void;
+    SubModuleComponent: (props: any) => import("react").ReactPortal;
+    jupiter_submodule_app_key: (props: any) => import("react").ReactPortal;
+};

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+export declare function isRenderGarfish(params?: {
+    appName?: string;
+}): boolean;
+export declare function garfishRender(mountId?: string, customBootstrap?: (App: React.ComponentType, render: () => void) => HTMLElement | null, _params?: any): Promise<HTMLElement | import("react-dom/client").Root | null>;

package/package.json

@@ -15,13 +15,13 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.6",
+  "version": "2.55.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
     "*": {
       ".": [
-        "./dist/types/runtime/index.d.ts"
+        "./dist/types/cli/index.d.ts"
       ],
       "cli": [
         "./dist/types/cli/index.d.ts"
@@ -29,9 +29,6 @@
       "runtime": [
         "./dist/types/runtime/index.d.ts"
       ],
-      "deps": [
-        "./dist/types/deps/index.d.ts"
-      ],
       "types": [
         "./type.d.ts"
       ]
@@ -42,7 +39,7 @@
   "exports": {
     "./types": "./type.d.ts",
     ".": {
-      "types": "./dist/types/runtime/index.d.ts",
+      "types": "./dist/types/cli/index.d.ts",
       "jsnext:source": "./src/cli/index.ts",
       "default": "./dist/cjs/cli/index.js"
     },
@@ -51,14 +48,9 @@
       "jsnext:source": "./src/cli/index.ts",
       "default": "./dist/cjs/cli/index.js"
     },
-    "./deps": {
-      "types": "./dist/types/deps/index.d.ts",
-      "jsnext:source": "./src/deps/index.ts",
-      "default": "./dist/esm/deps/index.js"
-    },
     "./runtime": {
       "types": "./dist/types/runtime/index.d.ts",
-      "jsnext:source": "./src/index.ts",
+      "jsnext:source": "./src/runtime/index.ts",
       "default": "./dist/esm/runtime/index.js"
     }
   },
@@ -67,18 +59,16 @@
     "@types/react-loadable": "^5.5.6",
     "debug": "4.3.4",
     "garfish": "^1.8.1",
-    "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
     "@swc/helpers": "0.5.3",
-    "@modern-js/utils": "2.54.6"
+    "@modern-js/utils": "2.55.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.54.6",
+    "@modern-js/runtime": "^2.55.0",
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.7.10",
     "@testing-library/dom": "^8.14.0",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^13.4.0",
@@ -93,13 +83,13 @@
     "react-dom": "^18",
     "react-router-dom": "6.22.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.54.6",
-    "@modern-js/core": "2.54.6",
-    "@modern-js/plugin-router-v5": "2.54.6",
-    "@modern-js/types": "2.54.6",
-    "@scripts/build": "2.54.6",
-    "@scripts/jest-config": "2.54.6",
-    "@modern-js/runtime": "2.54.6"
+    "@modern-js/plugin-router-v5": "2.55.0",
+    "@modern-js/core": "2.55.0",
+    "@modern-js/runtime": "2.55.0",
+    "@scripts/build": "2.55.0",
+    "@modern-js/types": "2.55.0",
+    "@scripts/jest-config": "2.55.0",
+    "@modern-js/app-tools": "2.55.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/type.d.ts

@@ -1,5 +1,5 @@
 import '@modern-js/plugin-router-v5';
-import { Config } from './dist/types';
+import { Config } from './dist/types/runtime';
 declare module '@modern-js/runtime/garfish' {
   export const useModuleApp: typeof import('./dist/types/runtime').useModuleApp;
   export const useModuleApps: typeof import('./dist/types/runtime').useModuleApps;
@@ -9,6 +9,13 @@ declare module '@modern-js/runtime' {
   interface AppConfig {
     masterApp?: Config;
   }
+
+  interface RuntimeConfig {
+    garfish?: Config;
+    garfishByEntries?: {
+      [name: string]: Config
+    };
+  }
 }
 declare module '@modern-js/app-tools' {
   interface RuntimeUserConfig {

package/dist/cjs/deps/index.js

@@ -1,38 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var deps_exports = {};
-__export(deps_exports, {
-  hoistNonReactStatics: () => import_hoist_non_react_statics.default
-});
-module.exports = __toCommonJS(deps_exports);
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  hoistNonReactStatics
-});

package/dist/cjs/index.js

@@ -1,40 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
-  default: () => import_runtime.default
-});
-module.exports = __toCommonJS(src_exports);
-var import_runtime = __toESM(require("./runtime"));
-__reExport(src_exports, require("./runtime"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./runtime")
-});

package/dist/esm/deps/index.js

@@ -1,4 +0,0 @@
-import { default as default2 } from "hoist-non-react-statics";
-export {
-  default2 as hoistNonReactStatics
-};

package/dist/esm/index.js

@@ -1,5 +0,0 @@
-import { default as default2 } from "./runtime";
-export * from "./runtime";
-export {
-  default2 as default
-};

package/dist/esm-node/deps/index.js

@@ -1,4 +0,0 @@
-import { default as default2 } from "hoist-non-react-statics";
-export {
-  default2 as hoistNonReactStatics
-};

package/dist/esm-node/index.js

@@ -1,5 +0,0 @@
-import { default as default2 } from "./runtime";
-export * from "./runtime";
-export {
-  default2 as default
-};

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

@@ -1,2 +0,0 @@
-/// <reference types="@modern-js/types/hoist-non-react-statics" />
-export { default as hoistNonReactStatics } from 'hoist-non-react-statics';

package/dist/types/index.d.ts

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