@modern-js/plugin-garfish 2.15.0 → 2.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. package/CHANGELOG.md +23 -0
  2. package/dist/cjs/cli/index.js +224 -236
  3. package/dist/cjs/cli/utils.js +24 -48
  4. package/dist/cjs/deps/index.js +12 -35
  5. package/dist/cjs/index.js +26 -36
  6. package/dist/cjs/runtime/index.js +24 -44
  7. package/dist/cjs/runtime/loadable.js +46 -58
  8. package/dist/cjs/runtime/plugin.js +86 -82
  9. package/dist/cjs/runtime/useModuleApps.js +70 -56
  10. package/dist/cjs/runtime/utils/Context.js +18 -36
  11. package/dist/cjs/runtime/utils/MApp.js +88 -87
  12. package/dist/cjs/runtime/utils/apps.js +114 -94
  13. package/dist/cjs/runtime/utils/setExternal.js +23 -41
  14. package/dist/cjs/util.js +21 -40
  15. package/dist/esm/cli/index.js +409 -402
  16. package/dist/esm/cli/utils.js +25 -26
  17. package/dist/esm/deps/index.js +1 -2
  18. package/dist/esm/index.js +1 -2
  19. package/dist/esm/runtime/index.js +3 -4
  20. package/dist/esm/runtime/loadable.js +226 -210
  21. package/dist/esm/runtime/plugin.js +456 -426
  22. package/dist/esm/runtime/useModuleApps.js +49 -50
  23. package/dist/esm/runtime/utils/Context.js +1 -1
  24. package/dist/esm/runtime/utils/MApp.js +337 -316
  25. package/dist/esm/runtime/utils/apps.js +468 -442
  26. package/dist/esm/runtime/utils/setExternal.js +9 -9
  27. package/dist/esm/util.js +4 -5
  28. package/dist/esm-node/cli/index.js +209 -219
  29. package/dist/esm-node/cli/utils.js +15 -30
  30. package/dist/esm-node/deps/index.js +1 -4
  31. package/dist/esm-node/index.js +1 -4
  32. package/dist/esm-node/runtime/index.js +3 -10
  33. package/dist/esm-node/runtime/loadable.js +34 -31
  34. package/dist/esm-node/runtime/plugin.js +50 -33
  35. package/dist/esm-node/runtime/useModuleApps.js +12 -19
  36. package/dist/esm-node/runtime/utils/Context.js +2 -5
  37. package/dist/esm-node/runtime/utils/MApp.js +61 -40
  38. package/dist/esm-node/runtime/utils/apps.js +38 -44
  39. package/dist/esm-node/runtime/utils/setExternal.js +5 -5
  40. package/dist/esm-node/util.js +4 -9
  41. package/package.json +15 -11
@@ -1,70 +1,84 @@
1
- var __create = Object.create;
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
- var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ function _export(target, all) {
8
6
  for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
- var useModuleApps_exports = {};
29
- __export(useModuleApps_exports, {
30
- useModuleApp: () => useModuleApp,
31
- useModuleApps: () => useModuleApps
7
+ Object.defineProperty(target, name, {
8
+ enumerable: true,
9
+ get: all[name]
10
+ });
11
+ }
12
+ _export(exports, {
13
+ useModuleApps: () => useModuleApps,
14
+ useModuleApp: () => useModuleApp
32
15
  });
33
- module.exports = __toCommonJS(useModuleApps_exports);
34
- var import_react = __toESM(require("react"));
35
- var import_util = require("../util");
36
- var import_Context = require("./utils/Context");
16
+ const _react = /* @__PURE__ */ _interop_require_wildcard(require("react"));
17
+ const _util = require("../util");
18
+ const _Context = require("./utils/Context");
19
+ function _getRequireWildcardCache(nodeInterop) {
20
+ if (typeof WeakMap !== "function")
21
+ return null;
22
+ var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
23
+ var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
24
+ return (_getRequireWildcardCache = function(nodeInterop2) {
25
+ return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
26
+ })(nodeInterop);
27
+ }
28
+ function _interop_require_wildcard(obj, nodeInterop) {
29
+ if (!nodeInterop && obj && obj.__esModule) {
30
+ return obj;
31
+ }
32
+ if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
33
+ return {
34
+ default: obj
35
+ };
36
+ }
37
+ var cache = _getRequireWildcardCache(nodeInterop);
38
+ if (cache && cache.has(obj)) {
39
+ return cache.get(obj);
40
+ }
41
+ var newObj = {};
42
+ var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
43
+ for (var key in obj) {
44
+ if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
45
+ var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
46
+ if (desc && (desc.get || desc.set)) {
47
+ Object.defineProperty(newObj, key, desc);
48
+ } else {
49
+ newObj[key] = obj[key];
50
+ }
51
+ }
52
+ }
53
+ newObj.default = obj;
54
+ if (cache) {
55
+ cache.set(obj, newObj);
56
+ }
57
+ return newObj;
58
+ }
37
59
  function useModuleApps() {
38
- const { apps, MApp, appInfoList } = (0, import_react.useContext)(import_Context.GarfishContext);
39
- (0, import_util.logger)("call useModuleApps", {
60
+ const { apps, MApp, appInfoList } = (0, _react.useContext)(_Context.GarfishContext);
61
+ (0, _util.logger)("call useModuleApps", {
40
62
  MApp,
41
63
  apps: appInfoList,
42
64
  ...apps
43
65
  });
44
- const Info = new Proxy(
45
- {
46
- MApp,
47
- apps: appInfoList,
48
- ...apps
49
- },
50
- {
51
- get(target, p, receiver) {
52
- if (typeof p === "string" && p in target) {
53
- return Reflect.get(target, p, receiver);
54
- }
55
- return () => import_react.default.createElement("div");
66
+ const Info = new Proxy({
67
+ MApp,
68
+ apps: appInfoList,
69
+ ...apps
70
+ }, {
71
+ get(target, p, receiver) {
72
+ if (typeof p === "string" && p in target) {
73
+ return Reflect.get(target, p, receiver);
56
74
  }
75
+ return () => _react.default.createElement("div");
57
76
  }
58
- );
77
+ });
59
78
  return Info;
60
79
  }
61
80
  function useModuleApp() {
62
- const { MApp } = (0, import_react.useContext)(import_Context.GarfishContext);
63
- (0, import_util.logger)("call useModuleApps", MApp);
81
+ const { MApp } = (0, _react.useContext)(_Context.GarfishContext);
82
+ (0, _util.logger)("call useModuleApps", MApp);
64
83
  return MApp;
65
84
  }
66
- // Annotate the CommonJS export names for ESM import in node:
67
- 0 && (module.exports = {
68
- useModuleApp,
69
- useModuleApps
70
- });
@@ -1,41 +1,23 @@
1
- var __create = Object.create;
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
- var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ function _export(target, all) {
8
6
  for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
- var Context_exports = {};
29
- __export(Context_exports, {
7
+ Object.defineProperty(target, name, {
8
+ enumerable: true,
9
+ get: all[name]
10
+ });
11
+ }
12
+ _export(exports, {
30
13
  GarfishContext: () => GarfishContext,
31
14
  GarfishProvider: () => GarfishProvider
32
15
  });
33
- module.exports = __toCommonJS(Context_exports);
34
- var import_react = __toESM(require("react"));
35
- const GarfishContext = import_react.default.createContext(null);
16
+ const _react = /* @__PURE__ */ _interop_require_default(require("react"));
17
+ function _interop_require_default(obj) {
18
+ return obj && obj.__esModule ? obj : {
19
+ default: obj
20
+ };
21
+ }
22
+ const GarfishContext = /* @__PURE__ */ _react.default.createContext(null);
36
23
  const GarfishProvider = GarfishContext.Provider;
37
- // Annotate the CommonJS export names for ESM import in node:
38
- 0 && (module.exports = {
39
- GarfishContext,
40
- GarfishProvider
41
- });
@@ -1,152 +1,145 @@
1
- var __create = Object.create;
2
- var __defProp = Object.defineProperty;
3
- var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
- var __getOwnPropNames = Object.getOwnPropertyNames;
5
- var __getProtoOf = Object.getPrototypeOf;
6
- var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
8
- for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- // If the importer is in node compatibility mode or this is not an ESM
21
- // file that has been converted to a CommonJS file using a Babel-
22
- // compatible transform (i.e. "__esModule" has not been set), then set
23
- // "default" to the CommonJS "module.exports" for node compatibility.
24
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
25
- mod
26
- ));
27
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
28
- var MApp_exports = {};
29
- __export(MApp_exports, {
30
- generateMApp: () => generateMApp
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ Object.defineProperty(exports, "generateMApp", {
6
+ enumerable: true,
7
+ get: () => generateMApp
31
8
  });
32
- module.exports = __toCommonJS(MApp_exports);
33
- var import_jsx_runtime = require("react/jsx-runtime");
34
- var import_react = __toESM(require("react"));
35
- var import_garfish = __toESM(require("garfish"));
36
- var import_util = require("../../util");
37
- var import_loadable = require("../loadable");
9
+ const _jsxruntime = require("react/jsx-runtime");
10
+ const _react = /* @__PURE__ */ _interop_require_default(require("react"));
11
+ const _garfish = /* @__PURE__ */ _interop_require_default(require("garfish"));
12
+ const _util = require("../../util");
13
+ const _loadable = require("../loadable");
14
+ function _define_property(obj, key, value) {
15
+ if (key in obj) {
16
+ Object.defineProperty(obj, key, {
17
+ value,
18
+ enumerable: true,
19
+ configurable: true,
20
+ writable: true
21
+ });
22
+ } else {
23
+ obj[key] = value;
24
+ }
25
+ return obj;
26
+ }
27
+ function _interop_require_default(obj) {
28
+ return obj && obj.__esModule ? obj : {
29
+ default: obj
30
+ };
31
+ }
38
32
  function generateMApp(options, manifest) {
39
- class MApp extends import_react.default.Component {
40
- constructor() {
41
- super(...arguments);
42
- this.state = {
43
- domId: (0, import_util.generateSubAppContainerKey)()
44
- };
45
- }
33
+ class MApp extends _react.default.Component {
46
34
  componentDidMount() {
47
35
  const { domId } = this.state;
48
36
  const { setLoadingState } = this.props;
49
- const {
50
- beforeLoad,
51
- beforeMount,
52
- errorLoadApp,
53
- errorMountApp,
54
- errorUnmountApp
55
- } = options;
56
- import_garfish.default.router.setRouterConfig({ listening: true });
37
+ const { beforeLoad, beforeMount, errorLoadApp, errorMountApp, errorUnmountApp } = options;
38
+ _garfish.default.router.setRouterConfig({
39
+ listening: true
40
+ });
57
41
  const garfishOptions = {
58
42
  domGetter: `#${domId}`,
59
43
  beforeLoad(appInfo, ...args) {
60
- (0, import_util.logger)("MApp beforeLoad", [appInfo]);
44
+ (0, _util.logger)("MApp beforeLoad", [
45
+ appInfo
46
+ ]);
61
47
  if (appInfo.activeWhen) {
62
48
  setLoadingState({
63
49
  isLoading: true,
64
50
  error: null
65
51
  });
66
52
  }
67
- return beforeLoad == null ? void 0 : beforeLoad(appInfo, ...args);
53
+ return beforeLoad === null || beforeLoad === void 0 ? void 0 : beforeLoad(appInfo, ...args);
68
54
  },
69
55
  beforeMount(appInfo, ...args) {
70
- (0, import_util.logger)("MApp beforeMount", args);
56
+ (0, _util.logger)("MApp beforeMount", args);
71
57
  if (appInfo.activeWhen) {
72
58
  setLoadingState({
73
59
  isLoading: false
74
60
  });
75
61
  }
76
- return beforeMount == null ? void 0 : beforeMount(appInfo, ...args);
62
+ return beforeMount === null || beforeMount === void 0 ? void 0 : beforeMount(appInfo, ...args);
77
63
  },
78
64
  errorLoadApp(error, appInfo, ...args) {
79
- (0, import_util.logger)("MApp errorLoadApp", error, args);
65
+ (0, _util.logger)("MApp errorLoadApp", error, args);
80
66
  if (appInfo.activeWhen) {
81
67
  setLoadingState({
82
68
  error
83
69
  });
84
70
  }
85
- return errorLoadApp == null ? void 0 : errorLoadApp(error, appInfo, ...args);
71
+ return errorLoadApp === null || errorLoadApp === void 0 ? void 0 : errorLoadApp(error, appInfo, ...args);
86
72
  },
87
73
  errorMountApp(error, appInfo, ...args) {
88
- (0, import_util.logger)("MApp errorMountApp", error, args);
74
+ (0, _util.logger)("MApp errorMountApp", error, args);
89
75
  if (appInfo.activeWhen) {
90
76
  setLoadingState({
91
77
  error
92
78
  });
93
79
  }
94
- return errorMountApp == null ? void 0 : errorMountApp(error, appInfo, ...args);
80
+ return errorMountApp === null || errorMountApp === void 0 ? void 0 : errorMountApp(error, appInfo, ...args);
95
81
  },
96
82
  errorUnmountApp(error, appInfo, ...args) {
97
- (0, import_util.logger)("MApp errorUnmountApp", error, args);
83
+ (0, _util.logger)("MApp errorUnmountApp", error, args);
98
84
  if (appInfo.activeWhen) {
99
85
  setLoadingState({
100
86
  error
101
87
  });
102
88
  }
103
- return errorUnmountApp == null ? void 0 : errorUnmountApp(error, appInfo, ...args);
89
+ return errorUnmountApp === null || errorUnmountApp === void 0 ? void 0 : errorUnmountApp(error, appInfo, ...args);
104
90
  },
105
91
  customLoader: (provider) => {
106
- const {
107
- render,
108
- destroy,
109
- SubModuleComponent,
110
- jupiter_submodule_app_key
111
- } = provider;
112
- const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
92
+ const { render, destroy, SubModuleComponent, jupiter_submodule_app_key } = provider;
93
+ const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
113
94
  return {
114
95
  mount: (appInfo) => {
115
96
  const transferProps = this.filterTransferProps();
116
- appInfo.props = { ...appInfo.props, ...transferProps };
97
+ appInfo.props = {
98
+ ...appInfo.props,
99
+ ...transferProps
100
+ };
117
101
  if (componetRenderMode) {
118
102
  this.setState({
119
- SubModuleComponent: SubModuleComponent != null ? SubModuleComponent : jupiter_submodule_app_key
103
+ SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
120
104
  });
121
105
  return void 0;
122
106
  } else {
123
- (0, import_util.logger)("MicroApp customer render", appInfo);
124
- return render == null ? void 0 : render.apply(provider, [appInfo]);
107
+ (0, _util.logger)("MicroApp customer render", appInfo);
108
+ return render === null || render === void 0 ? void 0 : render.apply(provider, [
109
+ appInfo
110
+ ]);
125
111
  }
126
112
  },
127
113
  unmount: (appInfo) => {
128
114
  const transferProps = this.filterTransferProps();
129
- appInfo.props = { ...appInfo.props, ...transferProps };
115
+ appInfo.props = {
116
+ ...appInfo.props,
117
+ ...transferProps
118
+ };
130
119
  if (componetRenderMode) {
131
120
  return void 0;
132
121
  }
133
- (0, import_util.logger)("MicroApp customer destroy", appInfo);
134
- return destroy == null ? void 0 : destroy.apply(provider, [appInfo]);
122
+ (0, _util.logger)("MicroApp customer destroy", appInfo);
123
+ return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, [
124
+ appInfo
125
+ ]);
135
126
  }
136
127
  };
137
128
  }
138
129
  };
139
- (0, import_util.logger)("MApp componentDidMount", {
140
- garfishRunning: import_garfish.default.running,
130
+ (0, _util.logger)("MApp componentDidMount", {
131
+ garfishRunning: _garfish.default.running,
141
132
  garfishOptions
142
133
  });
143
- if (!import_garfish.default.running) {
144
- import_garfish.default.run(garfishOptions);
134
+ if (!_garfish.default.running) {
135
+ _garfish.default.run(garfishOptions);
145
136
  }
146
137
  }
147
138
  componentWillUnmount() {
148
- import_garfish.default.router.setRouterConfig({ listening: false });
149
- (0, import_util.logger)("MApp componentWillUnmount");
139
+ _garfish.default.router.setRouterConfig({
140
+ listening: false
141
+ });
142
+ (0, _util.logger)("MApp componentWillUnmount");
150
143
  }
151
144
  filterTransferProps() {
152
145
  const { style, setLoadingState, ...others } = this.props;
@@ -155,12 +148,20 @@ function generateMApp(options, manifest) {
155
148
  render() {
156
149
  const { style } = this.props;
157
150
  const { SubModuleComponent } = this.state;
158
- return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { ...style }, id: (0, import_util.generateSubAppContainerKey)(), children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {}) });
151
+ return /* @__PURE__ */ (0, _jsxruntime.jsx)("div", {
152
+ style: {
153
+ ...style
154
+ },
155
+ id: (0, _util.generateSubAppContainerKey)(),
156
+ children: SubModuleComponent && /* @__PURE__ */ (0, _jsxruntime.jsx)(SubModuleComponent, {})
157
+ });
158
+ }
159
+ constructor(...args) {
160
+ super(...args);
161
+ _define_property(this, "state", {
162
+ domId: (0, _util.generateSubAppContainerKey)()
163
+ });
159
164
  }
160
165
  }
161
- return (0, import_loadable.Loadable)(MApp)(manifest == null ? void 0 : manifest.loadable);
166
+ return (0, _loadable.Loadable)(MApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
162
167
  }
163
- // Annotate the CommonJS export names for ESM import in node:
164
- 0 && (module.exports = {
165
- generateMApp
166
- });