@modern-js/plugin-garfish 2.68.11 → 2.68.12

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 (4) hide show
  1. package/dist/cjs/runtime/utils/apps.js +12 -5
  2. package/dist/esm/runtime/utils/apps.js +10 -5
  3. package/dist/esm-node/runtime/utils/apps.js +12 -5
  4. package/package.json +10 -10
package/dist/cjs/runtime/utils/apps.js CHANGED
@@ -61,7 +61,9 @@ function getAppInstance(options, appInfo, manifest) {
61
61
  var _context_router, _context_router1, _context_router2, _context_router3, _context_router4;
62
62
  const appRef = (0, import_react.useRef)(null);
63
63
  const domId = (0, import_util.generateSubAppContainerKey)(appInfo);
64
- const [SubModuleComponent, setSubModuleComponent] = (0, import_react.useState)();
64
+ const [{ component: SubModuleComponent }, setSubModuleComponent] = (0, import_react.useState)({
65
+ component: null
66
+ });
65
67
  const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
66
68
  var _props_useRouteMatch;
67
69
  const useRouteMatch = (_props_useRouteMatch = props.useRouteMatch) !== null && _props_useRouteMatch !== void 0 ? _props_useRouteMatch : context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : _context_router.useRouteMatch;
@@ -140,11 +142,14 @@ or directly pass the "basename":
140
142
  },
141
143
  customLoader: (provider) => {
142
144
  const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
143
- const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
145
+ const SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
146
+ const componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
144
147
  return {
145
148
  mount: (...props2) => {
146
- if (componetRenderMode) {
147
- setSubModuleComponent(SubModuleComponent2);
149
+ if (componetRenderMode && SubComponent) {
150
+ setSubModuleComponent({
151
+ component: SubComponent
152
+ });
148
153
  return void 0;
149
154
  } else {
150
155
  (0, import_util.logger)("MicroApp customer render", props2);
@@ -217,7 +222,9 @@ or directly pass the "basename":
217
222
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
218
223
  children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
219
224
  id: domId,
220
- children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {})
225
+ children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {
226
+ ...props
227
+ })
221
228
  })
222
229
  });
223
230
  }
package/dist/esm/runtime/utils/apps.js CHANGED
@@ -37,7 +37,9 @@ function getAppInstance(options, appInfo, manifest) {
37
37
  var _context_router, _context_router1, _context_router2, _context_router3, _context_router4;
38
38
  var appRef = useRef(null);
39
39
  var domId = generateSubAppContainerKey(appInfo);
40
- var _useState = _sliced_to_array(useState(), 2), SubModuleComponent = _useState[0], setSubModuleComponent = _useState[1];
40
+ var _useState = _sliced_to_array(useState({
41
+ component: null
42
+ }), 2), _useState_ = _useState[0], SubModuleComponent = _useState_.component, setSubModuleComponent = _useState[1];
41
43
  var context = useContext(RuntimeReactContext);
42
44
  var _props_useRouteMatch;
43
45
  var useRouteMatch = (_props_useRouteMatch = props.useRouteMatch) !== null && _props_useRouteMatch !== void 0 ? _props_useRouteMatch : context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : _context_router.useRouteMatch;
@@ -115,14 +117,17 @@ or directly pass the "basename":
115
117
  props: _object_spread({}, appInfo.props, userProps),
116
118
  customLoader: function(provider) {
117
119
  var render = provider.render, destroy = provider.destroy, SubModuleComponent2 = provider.SubModuleComponent, jupiter_submodule_app_key = provider.jupiter_submodule_app_key;
118
- var componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
120
+ var SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
121
+ var componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
119
122
  return {
120
123
  mount: function() {
121
124
  for (var _len = arguments.length, _$props = new Array(_len), _key = 0; _key < _len; _key++) {
122
125
  _$props[_key] = arguments[_key];
123
126
  }
124
- if (componetRenderMode) {
125
- setSubModuleComponent(SubModuleComponent2);
127
+ if (componetRenderMode && SubComponent) {
128
+ setSubModuleComponent({
129
+ component: SubComponent
130
+ });
126
131
  return void 0;
127
132
  } else {
128
133
  logger("MicroApp customer render", _$props);
@@ -248,7 +253,7 @@ or directly pass the "basename":
248
253
  return /* @__PURE__ */ _jsx(_Fragment, {
249
254
  children: /* @__PURE__ */ _jsx("div", {
250
255
  id: domId,
251
- children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {})
256
+ children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, _object_spread({}, props))
252
257
  })
253
258
  });
254
259
  }
package/dist/esm-node/runtime/utils/apps.js CHANGED
@@ -27,7 +27,9 @@ function getAppInstance(options, appInfo, manifest) {
27
27
  var _context_router, _context_router1, _context_router2, _context_router3, _context_router4;
28
28
  const appRef = useRef(null);
29
29
  const domId = generateSubAppContainerKey(appInfo);
30
- const [SubModuleComponent, setSubModuleComponent] = useState();
30
+ const [{ component: SubModuleComponent }, setSubModuleComponent] = useState({
31
+ component: null
32
+ });
31
33
  const context = useContext(RuntimeReactContext);
32
34
  var _props_useRouteMatch;
33
35
  const useRouteMatch = (_props_useRouteMatch = props.useRouteMatch) !== null && _props_useRouteMatch !== void 0 ? _props_useRouteMatch : context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : _context_router.useRouteMatch;
@@ -106,11 +108,14 @@ or directly pass the "basename":
106
108
  },
107
109
  customLoader: (provider) => {
108
110
  const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
109
- const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
111
+ const SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
112
+ const componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
110
113
  return {
111
114
  mount: (...props2) => {
112
- if (componetRenderMode) {
113
- setSubModuleComponent(SubModuleComponent2);
115
+ if (componetRenderMode && SubComponent) {
116
+ setSubModuleComponent({
117
+ component: SubComponent
118
+ });
114
119
  return void 0;
115
120
  } else {
116
121
  logger("MicroApp customer render", props2);
@@ -183,7 +188,9 @@ or directly pass the "basename":
183
188
  return /* @__PURE__ */ _jsx(_Fragment, {
184
189
  children: /* @__PURE__ */ _jsx("div", {
185
190
  id: domId,
186
- children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {})
191
+ children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {
192
+ ...props
193
+ })
187
194
  })
188
195
  });
189
196
  }
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.68.11",
18
+ "version": "2.68.12",
19
19
  "jsnext:source": "./src/cli/index.ts",
20
20
  "types": "./dist/types/cli/index.d.ts",
21
21
  "typesVersions": {
@@ -69,12 +69,12 @@
69
69
  "debug": "4.3.7",
70
70
  "garfish": "^1.8.1",
71
71
  "react-loadable": "^5.5.0",
72
- "@modern-js/plugin-v2": "2.68.11",
73
- "@modern-js/runtime-utils": "2.68.11",
74
- "@modern-js/utils": "2.68.11"
72
+ "@modern-js/plugin-v2": "2.68.12",
73
+ "@modern-js/runtime-utils": "2.68.12",
74
+ "@modern-js/utils": "2.68.12"
75
75
  },
76
76
  "peerDependencies": {
77
- "@modern-js/runtime": "^2.68.11",
77
+ "@modern-js/runtime": "^2.68.12",
78
78
  "react": ">=17",
79
79
  "react-dom": ">=17"
80
80
  },
@@ -93,11 +93,11 @@
93
93
  "react-dom": "^18.3.1",
94
94
  "react-router-dom": "6.27.0",
95
95
  "typescript": "^5",
96
- "@modern-js/app-tools": "2.68.11",
97
- "@modern-js/core": "2.68.11",
98
- "@modern-js/plugin-router-v5": "2.68.11",
99
- "@modern-js/runtime": "2.68.11",
100
- "@modern-js/types": "2.68.11",
96
+ "@modern-js/app-tools": "2.68.12",
97
+ "@modern-js/core": "2.68.12",
98
+ "@modern-js/runtime": "2.68.12",
99
+ "@modern-js/plugin-router-v5": "2.68.12",
100
+ "@modern-js/types": "2.68.12",
101
101
  "@scripts/build": "2.66.0",
102
102
  "@scripts/jest-config": "2.66.0"
103
103
  },