@module-federation/modern-js 0.0.0-next-20250616091910 → 0.0.0-next-20250616123529
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.
- package/dist/cjs/cli/configPlugin.js +1 -1
- package/dist/cjs/cli/configPlugin.spec.js +2 -2
- package/dist/cjs/cli/server/data-fetch-server-plugin.js +2 -142
- package/dist/cjs/runtime/index.js +48 -3
- package/dist/cjs/ssr-runtime/devPlugin.js +1 -1
- package/dist/cjs/ssr-runtime/injectDataFetchFunctionPlugin.js +2 -2
- package/dist/esm/cli/configPlugin.js +1 -1
- package/dist/esm/cli/configPlugin.spec.js +2 -2
- package/dist/esm/cli/server/data-fetch-server-plugin.js +2 -218
- package/dist/esm/runtime/index.js +42 -1
- package/dist/esm/ssr-runtime/devPlugin.js +1 -1
- package/dist/esm/ssr-runtime/injectDataFetchFunctionPlugin.js +1 -1
- package/dist/esm-node/cli/configPlugin.js +1 -1
- package/dist/esm-node/cli/configPlugin.spec.js +2 -2
- package/dist/esm-node/cli/server/data-fetch-server-plugin.js +2 -142
- package/dist/esm-node/runtime/index.js +36 -1
- package/dist/esm-node/ssr-runtime/devPlugin.js +1 -1
- package/dist/esm-node/ssr-runtime/injectDataFetchFunctionPlugin.js +1 -1
- package/dist/types/runtime/index.d.ts +13 -2
- package/package.json +9 -9
|
@@ -148,7 +148,7 @@ const patchMFConfig = (mfConfig, isServer, remoteIpStrategy, enableSSR) => {
|
|
|
148
148
|
];
|
|
149
149
|
patchDTSConfig(mfConfig, isServer);
|
|
150
150
|
injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
|
|
151
|
-
injectRuntimePlugins(require.resolve("@module-federation/
|
|
151
|
+
injectRuntimePlugins(require.resolve("@module-federation/react/data-fetch-runtime-plugin"), runtimePlugins);
|
|
152
152
|
if (enableSSR && (0, import_utils3.isDev)()) {
|
|
153
153
|
injectRuntimePlugins(require.resolve("@module-federation/modern-js/resolve-entry-ipv4"), runtimePlugins);
|
|
154
154
|
}
|
|
@@ -61,7 +61,7 @@ const mfConfig = {
|
|
|
61
61
|
remoteType: "script",
|
|
62
62
|
runtimePlugins: [
|
|
63
63
|
require.resolve("@module-federation/modern-js/shared-strategy"),
|
|
64
|
-
require.resolve("@module-federation/
|
|
64
|
+
require.resolve("@module-federation/react/data-fetch-runtime-plugin"),
|
|
65
65
|
require.resolve("@module-federation/node/runtimePlugin"),
|
|
66
66
|
require.resolve("@module-federation/modern-js/inject-node-fetch")
|
|
67
67
|
],
|
|
@@ -90,7 +90,7 @@ const mfConfig = {
|
|
|
90
90
|
remoteType: "script",
|
|
91
91
|
runtimePlugins: [
|
|
92
92
|
require.resolve("@module-federation/modern-js/shared-strategy"),
|
|
93
|
-
require.resolve("@module-federation/
|
|
93
|
+
require.resolve("@module-federation/react/data-fetch-runtime-plugin")
|
|
94
94
|
],
|
|
95
95
|
shared: {
|
|
96
96
|
react: {
|
|
@@ -31,147 +31,7 @@ __export(data_fetch_server_plugin_exports, {
|
|
|
31
31
|
default: () => data_fetch_server_plugin_default
|
|
32
32
|
});
|
|
33
33
|
module.exports = __toCommonJS(data_fetch_server_plugin_exports);
|
|
34
|
-
var
|
|
35
|
-
var import_data_fetch_utils = require("@module-federation/bridge-react/data-fetch-utils");
|
|
36
|
-
var import_sdk = require("@module-federation/sdk");
|
|
37
|
-
var import_logger = __toESM(require("../../logger"));
|
|
38
|
-
function wrapSetTimeout(targetPromise, delay = 2e4, id) {
|
|
39
|
-
if (targetPromise && typeof targetPromise.then === "function") {
|
|
40
|
-
return new Promise((resolve, reject) => {
|
|
41
|
-
const timeoutId = setTimeout(() => {
|
|
42
|
-
import_logger.default.warn(`Data fetch for ID ${id} timed out after 20 seconds.`);
|
|
43
|
-
reject(new Error(`Data fetch for ID ${id} timed out after 20 seconds`));
|
|
44
|
-
}, delay);
|
|
45
|
-
targetPromise.then((value) => {
|
|
46
|
-
clearTimeout(timeoutId);
|
|
47
|
-
resolve(value);
|
|
48
|
-
}).catch((err) => {
|
|
49
|
-
clearTimeout(timeoutId);
|
|
50
|
-
reject(err);
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
function addProtocol(url) {
|
|
56
|
-
if (url.startsWith("//")) {
|
|
57
|
-
return "https:" + url;
|
|
58
|
-
}
|
|
59
|
-
return url;
|
|
60
|
-
}
|
|
61
|
-
const getDecodeQuery = (url, name) => {
|
|
62
|
-
const res = url.searchParams.get(name);
|
|
63
|
-
if (!res) {
|
|
64
|
-
return null;
|
|
65
|
-
}
|
|
66
|
-
return decodeURIComponent(res);
|
|
67
|
-
};
|
|
68
|
-
const middleware = async (ctx, next) => {
|
|
69
|
-
var _globalThis___FEDERATION__;
|
|
70
|
-
let url;
|
|
71
|
-
let dataFetchId;
|
|
72
|
-
let params;
|
|
73
|
-
let remoteInfo;
|
|
74
|
-
try {
|
|
75
|
-
url = new URL(ctx.req.url);
|
|
76
|
-
dataFetchId = getDecodeQuery(url, import_data_fetch_constant.DATA_FETCH_QUERY);
|
|
77
|
-
params = JSON.parse(getDecodeQuery(url, "params") || "{}");
|
|
78
|
-
const remoteInfoQuery = getDecodeQuery(url, "remoteInfo");
|
|
79
|
-
remoteInfo = remoteInfoQuery ? JSON.parse(remoteInfoQuery) : null;
|
|
80
|
-
} catch (e) {
|
|
81
|
-
import_logger.default.error("fetch data from server, error: ", e);
|
|
82
|
-
return next();
|
|
83
|
-
}
|
|
84
|
-
if (!dataFetchId) {
|
|
85
|
-
return next();
|
|
86
|
-
}
|
|
87
|
-
import_logger.default.log("fetch data from server, dataFetchId: ", dataFetchId);
|
|
88
|
-
import_logger.default.debug("fetch data from server, moduleInfo: ", (_globalThis___FEDERATION__ = globalThis.__FEDERATION__) === null || _globalThis___FEDERATION__ === void 0 ? void 0 : _globalThis___FEDERATION__.moduleInfo);
|
|
89
|
-
try {
|
|
90
|
-
var _dataFetchMap_dataFetchId, _dataFetchMap_dataFetchId1;
|
|
91
|
-
const dataFetchMap = (0, import_data_fetch_utils.getDataFetchMap)();
|
|
92
|
-
if (!dataFetchMap) {
|
|
93
|
-
(0, import_data_fetch_utils.initDataFetchMap)();
|
|
94
|
-
}
|
|
95
|
-
const fetchDataPromise = (_dataFetchMap_dataFetchId = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId === void 0 ? void 0 : _dataFetchMap_dataFetchId[1];
|
|
96
|
-
import_logger.default.debug("fetch data from server, fetchDataPromise: ", fetchDataPromise);
|
|
97
|
-
if (fetchDataPromise && ((_dataFetchMap_dataFetchId1 = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId1 === void 0 ? void 0 : _dataFetchMap_dataFetchId1[2]) !== import_data_fetch_constant.MF_DATA_FETCH_STATUS.ERROR) {
|
|
98
|
-
const targetPromise = fetchDataPromise[0];
|
|
99
|
-
const wrappedPromise = wrapSetTimeout(targetPromise, 2e4, dataFetchId);
|
|
100
|
-
if (wrappedPromise) {
|
|
101
|
-
const res = await wrappedPromise;
|
|
102
|
-
import_logger.default.log("fetch data from server, fetchDataPromise res: ", res);
|
|
103
|
-
return ctx.json(res);
|
|
104
|
-
}
|
|
105
|
-
import_logger.default.error(`Expected a Promise from fetchDataPromise[0] for dataFetchId ${dataFetchId}, but received:`, targetPromise, "Will try call new dataFetch again...");
|
|
106
|
-
}
|
|
107
|
-
if (remoteInfo) {
|
|
108
|
-
try {
|
|
109
|
-
const hostInstance2 = globalThis.__FEDERATION__.__INSTANCES__[0];
|
|
110
|
-
const remoteEntry = `${addProtocol(remoteInfo.ssrPublicPath) + remoteInfo.ssrRemoteEntry}`;
|
|
111
|
-
if (!hostInstance2) {
|
|
112
|
-
throw new Error("host instance not found!");
|
|
113
|
-
}
|
|
114
|
-
const remote = hostInstance2.options.remotes.find((remote2) => remote2.name === remoteInfo.name);
|
|
115
|
-
import_logger.default.debug("find remote: ", JSON.stringify(remote));
|
|
116
|
-
if (!remote) {
|
|
117
|
-
hostInstance2.registerRemotes([
|
|
118
|
-
{
|
|
119
|
-
name: remoteInfo.name,
|
|
120
|
-
entry: remoteEntry,
|
|
121
|
-
entryGlobalName: remoteInfo.globalName
|
|
122
|
-
}
|
|
123
|
-
]);
|
|
124
|
-
} else if (!("entry" in remote) || !remote.entry.includes(import_sdk.MANIFEST_EXT)) {
|
|
125
|
-
const { hostGlobalSnapshot, remoteSnapshot } = hostInstance2.snapshotHandler.getGlobalRemoteInfo(remoteInfo);
|
|
126
|
-
import_logger.default.debug("find hostGlobalSnapshot: ", JSON.stringify(hostGlobalSnapshot));
|
|
127
|
-
import_logger.default.debug("find remoteSnapshot: ", JSON.stringify(remoteSnapshot));
|
|
128
|
-
if (!hostGlobalSnapshot || !remoteSnapshot) {
|
|
129
|
-
if ("version" in remote) {
|
|
130
|
-
delete remote.version;
|
|
131
|
-
}
|
|
132
|
-
remote.entry = remoteEntry;
|
|
133
|
-
remote.entryGlobalName = remoteInfo.globalName;
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
} catch (e) {
|
|
137
|
-
ctx.status(500);
|
|
138
|
-
return ctx.text(`failed to fetch ${remoteInfo.name} data, error:
|
|
139
|
-
${e}`);
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
const dataFetchItem = dataFetchMap[dataFetchId];
|
|
143
|
-
import_logger.default.debug("fetch data from server, dataFetchItem: ", dataFetchItem);
|
|
144
|
-
if (dataFetchItem) {
|
|
145
|
-
const callFetchDataPromise = (0, import_data_fetch_utils.fetchData)(dataFetchId, {
|
|
146
|
-
...params,
|
|
147
|
-
isDowngrade: !remoteInfo
|
|
148
|
-
});
|
|
149
|
-
const wrappedPromise = wrapSetTimeout(callFetchDataPromise, 2e4, dataFetchId);
|
|
150
|
-
if (wrappedPromise) {
|
|
151
|
-
const res = await wrappedPromise;
|
|
152
|
-
import_logger.default.log("fetch data from server, dataFetchItem res: ", res);
|
|
153
|
-
return ctx.json(res);
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
const remoteId = dataFetchId.split(import_sdk.SEPARATOR)[0];
|
|
157
|
-
const hostInstance = globalThis.__FEDERATION__.__INSTANCES__[0];
|
|
158
|
-
if (!hostInstance) {
|
|
159
|
-
throw new Error("host instance not found!");
|
|
160
|
-
}
|
|
161
|
-
const dataFetchFn = await (0, import_data_fetch_utils.loadDataFetchModule)(hostInstance, remoteId);
|
|
162
|
-
const data = await dataFetchFn({
|
|
163
|
-
...params,
|
|
164
|
-
isDowngrade: !remoteInfo
|
|
165
|
-
});
|
|
166
|
-
import_logger.default.log("fetch data from server, loadDataFetchModule res: ", data);
|
|
167
|
-
return ctx.json(data);
|
|
168
|
-
} catch (e) {
|
|
169
|
-
import_logger.default.error("server plugin data fetch error: ", e);
|
|
170
|
-
ctx.status(500);
|
|
171
|
-
return ctx.text(`failed to fetch ${remoteInfo.name} data, error:
|
|
172
|
-
${e}`);
|
|
173
|
-
}
|
|
174
|
-
};
|
|
34
|
+
var import_data_fetch_server_middleware = __toESM(require("@module-federation/react/data-fetch-server-middleware"));
|
|
175
35
|
const dataFetchServePlugin = () => ({
|
|
176
36
|
name: "mf-data-fetch-server-plugin",
|
|
177
37
|
setup: (api) => {
|
|
@@ -180,7 +40,7 @@ const dataFetchServePlugin = () => ({
|
|
|
180
40
|
middlewares.push({
|
|
181
41
|
name: "module-federation-serve-manifest",
|
|
182
42
|
// @ts-ignore type error
|
|
183
|
-
handler:
|
|
43
|
+
handler: import_data_fetch_server_middleware.default
|
|
184
44
|
});
|
|
185
45
|
});
|
|
186
46
|
}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
2
3
|
var __defProp = Object.defineProperty;
|
|
3
4
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
5
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
5
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
8
|
var __export = (target, all) => {
|
|
7
9
|
for (var name in all)
|
|
@@ -16,15 +18,58 @@ var __copyProps = (to, from, except, desc) => {
|
|
|
16
18
|
return to;
|
|
17
19
|
};
|
|
18
20
|
var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
|
|
21
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
22
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
23
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
24
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
25
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
26
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
27
|
+
mod
|
|
28
|
+
));
|
|
19
29
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
20
30
|
var runtime_exports = {};
|
|
21
31
|
__export(runtime_exports, {
|
|
22
|
-
ERROR_TYPE: () =>
|
|
23
|
-
kit: () =>
|
|
32
|
+
ERROR_TYPE: () => import_pure.ERROR_TYPE,
|
|
33
|
+
kit: () => kit
|
|
24
34
|
});
|
|
25
35
|
module.exports = __toCommonJS(runtime_exports);
|
|
36
|
+
var mfRuntime = __toESM(require("@module-federation/enhanced/runtime"));
|
|
37
|
+
var import_pure = require("@module-federation/react/pure");
|
|
26
38
|
__reExport(runtime_exports, require("@module-federation/enhanced/runtime"), module.exports);
|
|
27
|
-
|
|
39
|
+
const kit = {
|
|
40
|
+
get createRemoteSSRComponent() {
|
|
41
|
+
const { createRemoteSSRComponent } = import_pure.kit;
|
|
42
|
+
return (options) => createRemoteSSRComponent({
|
|
43
|
+
...options,
|
|
44
|
+
runtime: mfRuntime
|
|
45
|
+
});
|
|
46
|
+
},
|
|
47
|
+
get createRemoteComponent() {
|
|
48
|
+
const { createRemoteComponent } = import_pure.kit;
|
|
49
|
+
return (options) => createRemoteComponent({
|
|
50
|
+
...options,
|
|
51
|
+
runtime: mfRuntime
|
|
52
|
+
});
|
|
53
|
+
},
|
|
54
|
+
get collectSSRAssets() {
|
|
55
|
+
const { collectSSRAssets } = import_pure.kit;
|
|
56
|
+
return (options) => collectSSRAssets({
|
|
57
|
+
...options,
|
|
58
|
+
runtime: mfRuntime
|
|
59
|
+
});
|
|
60
|
+
},
|
|
61
|
+
get wrapNoSSR() {
|
|
62
|
+
return (createComponentFn) => {
|
|
63
|
+
return (options) => createComponentFn({
|
|
64
|
+
...options,
|
|
65
|
+
noSSR: true
|
|
66
|
+
});
|
|
67
|
+
};
|
|
68
|
+
},
|
|
69
|
+
get injectDataFetch() {
|
|
70
|
+
return require("@module-federation/react/pure").kit.injectDataFetch;
|
|
71
|
+
}
|
|
72
|
+
};
|
|
28
73
|
// Annotate the CommonJS export names for ESM import in node:
|
|
29
74
|
0 && (module.exports = {
|
|
30
75
|
ERROR_TYPE,
|
|
@@ -33,7 +33,7 @@ __export(devPlugin_exports, {
|
|
|
33
33
|
module.exports = __toCommonJS(devPlugin_exports);
|
|
34
34
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
35
35
|
var import_SSRLiveReload = require("./SSRLiveReload");
|
|
36
|
-
var import_data_fetch_utils = require("@module-federation/
|
|
36
|
+
var import_data_fetch_utils = require("@module-federation/react/data-fetch-utils");
|
|
37
37
|
const mfSSRDevPlugin = () => ({
|
|
38
38
|
name: "@module-federation/modern-js",
|
|
39
39
|
setup: (api) => {
|
|
@@ -21,8 +21,8 @@ __export(injectDataFetchFunctionPlugin_exports, {
|
|
|
21
21
|
injectDataFetchFunctionPlugin: () => injectDataFetchFunctionPlugin
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(injectDataFetchFunctionPlugin_exports);
|
|
24
|
-
var
|
|
25
|
-
const { callDataFetch, injectDataFetch, setSSREnv } =
|
|
24
|
+
var import_pure = require("@module-federation/react/pure");
|
|
25
|
+
const { callDataFetch, injectDataFetch, setSSREnv } = import_pure.kit;
|
|
26
26
|
const injectDataFetchFunctionPlugin = ({ fetchServerQuery }) => ({
|
|
27
27
|
name: "@module-federation/inject-data-fetch-function-plugin",
|
|
28
28
|
setup: (api) => {
|
|
@@ -138,7 +138,7 @@ var patchMFConfig = function(mfConfig, isServer, remoteIpStrategy, enableSSR) {
|
|
|
138
138
|
var runtimePlugins = _to_consumable_array(mfConfig.runtimePlugins || []);
|
|
139
139
|
patchDTSConfig(mfConfig, isServer);
|
|
140
140
|
injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
|
|
141
|
-
injectRuntimePlugins(require.resolve("@module-federation/
|
|
141
|
+
injectRuntimePlugins(require.resolve("@module-federation/react/data-fetch-runtime-plugin"), runtimePlugins);
|
|
142
142
|
if (enableSSR && isDev()) {
|
|
143
143
|
injectRuntimePlugins(require.resolve("@module-federation/modern-js/resolve-entry-ipv4"), runtimePlugins);
|
|
144
144
|
}
|
|
@@ -43,7 +43,7 @@ describe("patchMFConfig", /* @__PURE__ */ _async_to_generator(function() {
|
|
|
43
43
|
remoteType: "script",
|
|
44
44
|
runtimePlugins: [
|
|
45
45
|
require.resolve("@module-federation/modern-js/shared-strategy"),
|
|
46
|
-
require.resolve("@module-federation/
|
|
46
|
+
require.resolve("@module-federation/react/data-fetch-runtime-plugin"),
|
|
47
47
|
require.resolve("@module-federation/node/runtimePlugin"),
|
|
48
48
|
require.resolve("@module-federation/modern-js/inject-node-fetch")
|
|
49
49
|
],
|
|
@@ -78,7 +78,7 @@ describe("patchMFConfig", /* @__PURE__ */ _async_to_generator(function() {
|
|
|
78
78
|
remoteType: "script",
|
|
79
79
|
runtimePlugins: [
|
|
80
80
|
require.resolve("@module-federation/modern-js/shared-strategy"),
|
|
81
|
-
require.resolve("@module-federation/
|
|
81
|
+
require.resolve("@module-federation/react/data-fetch-runtime-plugin")
|
|
82
82
|
],
|
|
83
83
|
shared: {
|
|
84
84
|
react: {
|
|
@@ -1,220 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
3
|
-
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
4
|
-
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
5
|
-
import { DATA_FETCH_QUERY, MF_DATA_FETCH_STATUS } from "@module-federation/bridge-react/data-fetch-constant";
|
|
6
|
-
import { getDataFetchMap, fetchData, initDataFetchMap, loadDataFetchModule } from "@module-federation/bridge-react/data-fetch-utils";
|
|
7
|
-
import { SEPARATOR, MANIFEST_EXT } from "@module-federation/sdk";
|
|
8
|
-
import logger from "../../logger";
|
|
9
|
-
function wrapSetTimeout(targetPromise) {
|
|
10
|
-
var delay = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 2e4, id = arguments.length > 2 ? arguments[2] : void 0;
|
|
11
|
-
if (targetPromise && typeof targetPromise.then === "function") {
|
|
12
|
-
return new Promise(function(resolve, reject) {
|
|
13
|
-
var timeoutId = setTimeout(function() {
|
|
14
|
-
logger.warn("Data fetch for ID ".concat(id, " timed out after 20 seconds."));
|
|
15
|
-
reject(new Error("Data fetch for ID ".concat(id, " timed out after 20 seconds")));
|
|
16
|
-
}, delay);
|
|
17
|
-
targetPromise.then(function(value) {
|
|
18
|
-
clearTimeout(timeoutId);
|
|
19
|
-
resolve(value);
|
|
20
|
-
}).catch(function(err) {
|
|
21
|
-
clearTimeout(timeoutId);
|
|
22
|
-
reject(err);
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
function addProtocol(url) {
|
|
28
|
-
if (url.startsWith("//")) {
|
|
29
|
-
return "https:" + url;
|
|
30
|
-
}
|
|
31
|
-
return url;
|
|
32
|
-
}
|
|
33
|
-
var getDecodeQuery = function(url, name) {
|
|
34
|
-
var res = url.searchParams.get(name);
|
|
35
|
-
if (!res) {
|
|
36
|
-
return null;
|
|
37
|
-
}
|
|
38
|
-
return decodeURIComponent(res);
|
|
39
|
-
};
|
|
40
|
-
var middleware = function() {
|
|
41
|
-
var _ref = _async_to_generator(function(ctx, next) {
|
|
42
|
-
var _globalThis___FEDERATION__, url, dataFetchId, params, remoteInfo, remoteInfoQuery, _dataFetchMap_dataFetchId, _dataFetchMap_dataFetchId1, dataFetchMap, fetchDataPromise, targetPromise, wrappedPromise, res, hostInstance, remoteEntry, remote, _hostInstance_snapshotHandler_getGlobalRemoteInfo, hostGlobalSnapshot, remoteSnapshot, dataFetchItem, callFetchDataPromise, wrappedPromise1, res1, remoteId, hostInstance1, dataFetchFn, data, e;
|
|
43
|
-
return _ts_generator(this, function(_state) {
|
|
44
|
-
switch (_state.label) {
|
|
45
|
-
case 0:
|
|
46
|
-
try {
|
|
47
|
-
url = new URL(ctx.req.url);
|
|
48
|
-
dataFetchId = getDecodeQuery(url, DATA_FETCH_QUERY);
|
|
49
|
-
params = JSON.parse(getDecodeQuery(url, "params") || "{}");
|
|
50
|
-
remoteInfoQuery = getDecodeQuery(url, "remoteInfo");
|
|
51
|
-
remoteInfo = remoteInfoQuery ? JSON.parse(remoteInfoQuery) : null;
|
|
52
|
-
} catch (e2) {
|
|
53
|
-
logger.error("fetch data from server, error: ", e2);
|
|
54
|
-
return [
|
|
55
|
-
2,
|
|
56
|
-
next()
|
|
57
|
-
];
|
|
58
|
-
}
|
|
59
|
-
if (!dataFetchId) {
|
|
60
|
-
return [
|
|
61
|
-
2,
|
|
62
|
-
next()
|
|
63
|
-
];
|
|
64
|
-
}
|
|
65
|
-
logger.log("fetch data from server, dataFetchId: ", dataFetchId);
|
|
66
|
-
logger.debug("fetch data from server, moduleInfo: ", (_globalThis___FEDERATION__ = globalThis.__FEDERATION__) === null || _globalThis___FEDERATION__ === void 0 ? void 0 : _globalThis___FEDERATION__.moduleInfo);
|
|
67
|
-
_state.label = 1;
|
|
68
|
-
case 1:
|
|
69
|
-
_state.trys.push([
|
|
70
|
-
1,
|
|
71
|
-
9,
|
|
72
|
-
,
|
|
73
|
-
10
|
|
74
|
-
]);
|
|
75
|
-
dataFetchMap = getDataFetchMap();
|
|
76
|
-
if (!dataFetchMap) {
|
|
77
|
-
initDataFetchMap();
|
|
78
|
-
}
|
|
79
|
-
fetchDataPromise = (_dataFetchMap_dataFetchId = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId === void 0 ? void 0 : _dataFetchMap_dataFetchId[1];
|
|
80
|
-
logger.debug("fetch data from server, fetchDataPromise: ", fetchDataPromise);
|
|
81
|
-
if (!(fetchDataPromise && ((_dataFetchMap_dataFetchId1 = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId1 === void 0 ? void 0 : _dataFetchMap_dataFetchId1[2]) !== MF_DATA_FETCH_STATUS.ERROR))
|
|
82
|
-
return [
|
|
83
|
-
3,
|
|
84
|
-
4
|
|
85
|
-
];
|
|
86
|
-
targetPromise = fetchDataPromise[0];
|
|
87
|
-
wrappedPromise = wrapSetTimeout(targetPromise, 2e4, dataFetchId);
|
|
88
|
-
if (!wrappedPromise)
|
|
89
|
-
return [
|
|
90
|
-
3,
|
|
91
|
-
3
|
|
92
|
-
];
|
|
93
|
-
return [
|
|
94
|
-
4,
|
|
95
|
-
wrappedPromise
|
|
96
|
-
];
|
|
97
|
-
case 2:
|
|
98
|
-
res = _state.sent();
|
|
99
|
-
logger.log("fetch data from server, fetchDataPromise res: ", res);
|
|
100
|
-
return [
|
|
101
|
-
2,
|
|
102
|
-
ctx.json(res)
|
|
103
|
-
];
|
|
104
|
-
case 3:
|
|
105
|
-
logger.error("Expected a Promise from fetchDataPromise[0] for dataFetchId ".concat(dataFetchId, ", but received:"), targetPromise, "Will try call new dataFetch again...");
|
|
106
|
-
_state.label = 4;
|
|
107
|
-
case 4:
|
|
108
|
-
if (remoteInfo) {
|
|
109
|
-
try {
|
|
110
|
-
hostInstance = globalThis.__FEDERATION__.__INSTANCES__[0];
|
|
111
|
-
remoteEntry = "".concat(addProtocol(remoteInfo.ssrPublicPath) + remoteInfo.ssrRemoteEntry);
|
|
112
|
-
if (!hostInstance) {
|
|
113
|
-
throw new Error("host instance not found!");
|
|
114
|
-
}
|
|
115
|
-
remote = hostInstance.options.remotes.find(function(remote2) {
|
|
116
|
-
return remote2.name === remoteInfo.name;
|
|
117
|
-
});
|
|
118
|
-
logger.debug("find remote: ", JSON.stringify(remote));
|
|
119
|
-
if (!remote) {
|
|
120
|
-
hostInstance.registerRemotes([
|
|
121
|
-
{
|
|
122
|
-
name: remoteInfo.name,
|
|
123
|
-
entry: remoteEntry,
|
|
124
|
-
entryGlobalName: remoteInfo.globalName
|
|
125
|
-
}
|
|
126
|
-
]);
|
|
127
|
-
} else if (!("entry" in remote) || !remote.entry.includes(MANIFEST_EXT)) {
|
|
128
|
-
_hostInstance_snapshotHandler_getGlobalRemoteInfo = hostInstance.snapshotHandler.getGlobalRemoteInfo(remoteInfo), hostGlobalSnapshot = _hostInstance_snapshotHandler_getGlobalRemoteInfo.hostGlobalSnapshot, remoteSnapshot = _hostInstance_snapshotHandler_getGlobalRemoteInfo.remoteSnapshot;
|
|
129
|
-
logger.debug("find hostGlobalSnapshot: ", JSON.stringify(hostGlobalSnapshot));
|
|
130
|
-
logger.debug("find remoteSnapshot: ", JSON.stringify(remoteSnapshot));
|
|
131
|
-
if (!hostGlobalSnapshot || !remoteSnapshot) {
|
|
132
|
-
if ("version" in remote) {
|
|
133
|
-
delete remote.version;
|
|
134
|
-
}
|
|
135
|
-
remote.entry = remoteEntry;
|
|
136
|
-
remote.entryGlobalName = remoteInfo.globalName;
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
} catch (e2) {
|
|
140
|
-
ctx.status(500);
|
|
141
|
-
return [
|
|
142
|
-
2,
|
|
143
|
-
ctx.text("failed to fetch ".concat(remoteInfo.name, " data, error:\n ").concat(e2))
|
|
144
|
-
];
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
dataFetchItem = dataFetchMap[dataFetchId];
|
|
148
|
-
logger.debug("fetch data from server, dataFetchItem: ", dataFetchItem);
|
|
149
|
-
if (!dataFetchItem)
|
|
150
|
-
return [
|
|
151
|
-
3,
|
|
152
|
-
6
|
|
153
|
-
];
|
|
154
|
-
callFetchDataPromise = fetchData(dataFetchId, _object_spread_props(_object_spread({}, params), {
|
|
155
|
-
isDowngrade: !remoteInfo
|
|
156
|
-
}));
|
|
157
|
-
wrappedPromise1 = wrapSetTimeout(callFetchDataPromise, 2e4, dataFetchId);
|
|
158
|
-
if (!wrappedPromise1)
|
|
159
|
-
return [
|
|
160
|
-
3,
|
|
161
|
-
6
|
|
162
|
-
];
|
|
163
|
-
return [
|
|
164
|
-
4,
|
|
165
|
-
wrappedPromise1
|
|
166
|
-
];
|
|
167
|
-
case 5:
|
|
168
|
-
res1 = _state.sent();
|
|
169
|
-
logger.log("fetch data from server, dataFetchItem res: ", res1);
|
|
170
|
-
return [
|
|
171
|
-
2,
|
|
172
|
-
ctx.json(res1)
|
|
173
|
-
];
|
|
174
|
-
case 6:
|
|
175
|
-
remoteId = dataFetchId.split(SEPARATOR)[0];
|
|
176
|
-
hostInstance1 = globalThis.__FEDERATION__.__INSTANCES__[0];
|
|
177
|
-
if (!hostInstance1) {
|
|
178
|
-
throw new Error("host instance not found!");
|
|
179
|
-
}
|
|
180
|
-
return [
|
|
181
|
-
4,
|
|
182
|
-
loadDataFetchModule(hostInstance1, remoteId)
|
|
183
|
-
];
|
|
184
|
-
case 7:
|
|
185
|
-
dataFetchFn = _state.sent();
|
|
186
|
-
return [
|
|
187
|
-
4,
|
|
188
|
-
dataFetchFn(_object_spread_props(_object_spread({}, params), {
|
|
189
|
-
isDowngrade: !remoteInfo
|
|
190
|
-
}))
|
|
191
|
-
];
|
|
192
|
-
case 8:
|
|
193
|
-
data = _state.sent();
|
|
194
|
-
logger.log("fetch data from server, loadDataFetchModule res: ", data);
|
|
195
|
-
return [
|
|
196
|
-
2,
|
|
197
|
-
ctx.json(data)
|
|
198
|
-
];
|
|
199
|
-
case 9:
|
|
200
|
-
e = _state.sent();
|
|
201
|
-
logger.error("server plugin data fetch error: ", e);
|
|
202
|
-
ctx.status(500);
|
|
203
|
-
return [
|
|
204
|
-
2,
|
|
205
|
-
ctx.text("failed to fetch ".concat(remoteInfo.name, " data, error:\n ").concat(e))
|
|
206
|
-
];
|
|
207
|
-
case 10:
|
|
208
|
-
return [
|
|
209
|
-
2
|
|
210
|
-
];
|
|
211
|
-
}
|
|
212
|
-
});
|
|
213
|
-
});
|
|
214
|
-
return function middleware2(ctx, next) {
|
|
215
|
-
return _ref.apply(this, arguments);
|
|
216
|
-
};
|
|
217
|
-
}();
|
|
1
|
+
import dataFetchMiddleWare from "@module-federation/react/data-fetch-server-middleware";
|
|
218
2
|
var dataFetchServePlugin = function() {
|
|
219
3
|
return {
|
|
220
4
|
name: "mf-data-fetch-server-plugin",
|
|
@@ -224,7 +8,7 @@ var dataFetchServePlugin = function() {
|
|
|
224
8
|
middlewares.push({
|
|
225
9
|
name: "module-federation-serve-manifest",
|
|
226
10
|
// @ts-ignore type error
|
|
227
|
-
handler:
|
|
11
|
+
handler: dataFetchMiddleWare
|
|
228
12
|
});
|
|
229
13
|
});
|
|
230
14
|
}
|
|
@@ -1,5 +1,46 @@
|
|
|
1
|
+
import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
2
|
+
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
3
|
+
import * as mfRuntime from "@module-federation/enhanced/runtime";
|
|
4
|
+
import { kit as rawKit, ERROR_TYPE } from "@module-federation/react/pure";
|
|
1
5
|
export * from "@module-federation/enhanced/runtime";
|
|
2
|
-
|
|
6
|
+
var kit = {
|
|
7
|
+
get createRemoteSSRComponent() {
|
|
8
|
+
var createRemoteSSRComponent = rawKit.createRemoteSSRComponent;
|
|
9
|
+
return function(options) {
|
|
10
|
+
return createRemoteSSRComponent(_object_spread_props(_object_spread({}, options), {
|
|
11
|
+
runtime: mfRuntime
|
|
12
|
+
}));
|
|
13
|
+
};
|
|
14
|
+
},
|
|
15
|
+
get createRemoteComponent() {
|
|
16
|
+
var createRemoteComponent = rawKit.createRemoteComponent;
|
|
17
|
+
return function(options) {
|
|
18
|
+
return createRemoteComponent(_object_spread_props(_object_spread({}, options), {
|
|
19
|
+
runtime: mfRuntime
|
|
20
|
+
}));
|
|
21
|
+
};
|
|
22
|
+
},
|
|
23
|
+
get collectSSRAssets() {
|
|
24
|
+
var collectSSRAssets = rawKit.collectSSRAssets;
|
|
25
|
+
return function(options) {
|
|
26
|
+
return collectSSRAssets(_object_spread_props(_object_spread({}, options), {
|
|
27
|
+
runtime: mfRuntime
|
|
28
|
+
}));
|
|
29
|
+
};
|
|
30
|
+
},
|
|
31
|
+
get wrapNoSSR() {
|
|
32
|
+
return function(createComponentFn) {
|
|
33
|
+
return function(options) {
|
|
34
|
+
return createComponentFn(_object_spread_props(_object_spread({}, options), {
|
|
35
|
+
noSSR: true
|
|
36
|
+
}));
|
|
37
|
+
};
|
|
38
|
+
};
|
|
39
|
+
},
|
|
40
|
+
get injectDataFetch() {
|
|
41
|
+
return require("@module-federation/react/pure").kit.injectDataFetch;
|
|
42
|
+
}
|
|
43
|
+
};
|
|
3
44
|
export {
|
|
4
45
|
ERROR_TYPE,
|
|
5
46
|
kit
|
|
@@ -3,7 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
|
3
3
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
4
4
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
5
5
|
import { SSRLiveReload } from "./SSRLiveReload";
|
|
6
|
-
import { flushDataFetch } from "@module-federation/
|
|
6
|
+
import { flushDataFetch } from "@module-federation/react/data-fetch-utils";
|
|
7
7
|
var mfSSRDevPlugin = function() {
|
|
8
8
|
return {
|
|
9
9
|
name: "@module-federation/modern-js",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
|
|
2
2
|
import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
|
|
3
|
-
import { kit } from "@module-federation/
|
|
3
|
+
import { kit } from "@module-federation/react/pure";
|
|
4
4
|
var callDataFetch = kit.callDataFetch, injectDataFetch = kit.injectDataFetch, setSSREnv = kit.setSSREnv;
|
|
5
5
|
var injectDataFetchFunctionPlugin = function(param) {
|
|
6
6
|
var fetchServerQuery = param.fetchServerQuery;
|
|
@@ -107,7 +107,7 @@ const patchMFConfig = (mfConfig, isServer, remoteIpStrategy, enableSSR) => {
|
|
|
107
107
|
];
|
|
108
108
|
patchDTSConfig(mfConfig, isServer);
|
|
109
109
|
injectRuntimePlugins(require.resolve("@module-federation/modern-js/shared-strategy"), runtimePlugins);
|
|
110
|
-
injectRuntimePlugins(require.resolve("@module-federation/
|
|
110
|
+
injectRuntimePlugins(require.resolve("@module-federation/react/data-fetch-runtime-plugin"), runtimePlugins);
|
|
111
111
|
if (enableSSR && isDev()) {
|
|
112
112
|
injectRuntimePlugins(require.resolve("@module-federation/modern-js/resolve-entry-ipv4"), runtimePlugins);
|
|
113
113
|
}
|
|
@@ -38,7 +38,7 @@ describe("patchMFConfig", async () => {
|
|
|
38
38
|
remoteType: "script",
|
|
39
39
|
runtimePlugins: [
|
|
40
40
|
require.resolve("@module-federation/modern-js/shared-strategy"),
|
|
41
|
-
require.resolve("@module-federation/
|
|
41
|
+
require.resolve("@module-federation/react/data-fetch-runtime-plugin"),
|
|
42
42
|
require.resolve("@module-federation/node/runtimePlugin"),
|
|
43
43
|
require.resolve("@module-federation/modern-js/inject-node-fetch")
|
|
44
44
|
],
|
|
@@ -67,7 +67,7 @@ describe("patchMFConfig", async () => {
|
|
|
67
67
|
remoteType: "script",
|
|
68
68
|
runtimePlugins: [
|
|
69
69
|
require.resolve("@module-federation/modern-js/shared-strategy"),
|
|
70
|
-
require.resolve("@module-federation/
|
|
70
|
+
require.resolve("@module-federation/react/data-fetch-runtime-plugin")
|
|
71
71
|
],
|
|
72
72
|
shared: {
|
|
73
73
|
react: {
|
|
@@ -1,144 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { getDataFetchMap, fetchData, initDataFetchMap, loadDataFetchModule } from "@module-federation/bridge-react/data-fetch-utils";
|
|
3
|
-
import { SEPARATOR, MANIFEST_EXT } from "@module-federation/sdk";
|
|
4
|
-
import logger from "../../logger";
|
|
5
|
-
function wrapSetTimeout(targetPromise, delay = 2e4, id) {
|
|
6
|
-
if (targetPromise && typeof targetPromise.then === "function") {
|
|
7
|
-
return new Promise((resolve, reject) => {
|
|
8
|
-
const timeoutId = setTimeout(() => {
|
|
9
|
-
logger.warn(`Data fetch for ID ${id} timed out after 20 seconds.`);
|
|
10
|
-
reject(new Error(`Data fetch for ID ${id} timed out after 20 seconds`));
|
|
11
|
-
}, delay);
|
|
12
|
-
targetPromise.then((value) => {
|
|
13
|
-
clearTimeout(timeoutId);
|
|
14
|
-
resolve(value);
|
|
15
|
-
}).catch((err) => {
|
|
16
|
-
clearTimeout(timeoutId);
|
|
17
|
-
reject(err);
|
|
18
|
-
});
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
function addProtocol(url) {
|
|
23
|
-
if (url.startsWith("//")) {
|
|
24
|
-
return "https:" + url;
|
|
25
|
-
}
|
|
26
|
-
return url;
|
|
27
|
-
}
|
|
28
|
-
const getDecodeQuery = (url, name) => {
|
|
29
|
-
const res = url.searchParams.get(name);
|
|
30
|
-
if (!res) {
|
|
31
|
-
return null;
|
|
32
|
-
}
|
|
33
|
-
return decodeURIComponent(res);
|
|
34
|
-
};
|
|
35
|
-
const middleware = async (ctx, next) => {
|
|
36
|
-
var _globalThis___FEDERATION__;
|
|
37
|
-
let url;
|
|
38
|
-
let dataFetchId;
|
|
39
|
-
let params;
|
|
40
|
-
let remoteInfo;
|
|
41
|
-
try {
|
|
42
|
-
url = new URL(ctx.req.url);
|
|
43
|
-
dataFetchId = getDecodeQuery(url, DATA_FETCH_QUERY);
|
|
44
|
-
params = JSON.parse(getDecodeQuery(url, "params") || "{}");
|
|
45
|
-
const remoteInfoQuery = getDecodeQuery(url, "remoteInfo");
|
|
46
|
-
remoteInfo = remoteInfoQuery ? JSON.parse(remoteInfoQuery) : null;
|
|
47
|
-
} catch (e) {
|
|
48
|
-
logger.error("fetch data from server, error: ", e);
|
|
49
|
-
return next();
|
|
50
|
-
}
|
|
51
|
-
if (!dataFetchId) {
|
|
52
|
-
return next();
|
|
53
|
-
}
|
|
54
|
-
logger.log("fetch data from server, dataFetchId: ", dataFetchId);
|
|
55
|
-
logger.debug("fetch data from server, moduleInfo: ", (_globalThis___FEDERATION__ = globalThis.__FEDERATION__) === null || _globalThis___FEDERATION__ === void 0 ? void 0 : _globalThis___FEDERATION__.moduleInfo);
|
|
56
|
-
try {
|
|
57
|
-
var _dataFetchMap_dataFetchId, _dataFetchMap_dataFetchId1;
|
|
58
|
-
const dataFetchMap = getDataFetchMap();
|
|
59
|
-
if (!dataFetchMap) {
|
|
60
|
-
initDataFetchMap();
|
|
61
|
-
}
|
|
62
|
-
const fetchDataPromise = (_dataFetchMap_dataFetchId = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId === void 0 ? void 0 : _dataFetchMap_dataFetchId[1];
|
|
63
|
-
logger.debug("fetch data from server, fetchDataPromise: ", fetchDataPromise);
|
|
64
|
-
if (fetchDataPromise && ((_dataFetchMap_dataFetchId1 = dataFetchMap[dataFetchId]) === null || _dataFetchMap_dataFetchId1 === void 0 ? void 0 : _dataFetchMap_dataFetchId1[2]) !== MF_DATA_FETCH_STATUS.ERROR) {
|
|
65
|
-
const targetPromise = fetchDataPromise[0];
|
|
66
|
-
const wrappedPromise = wrapSetTimeout(targetPromise, 2e4, dataFetchId);
|
|
67
|
-
if (wrappedPromise) {
|
|
68
|
-
const res = await wrappedPromise;
|
|
69
|
-
logger.log("fetch data from server, fetchDataPromise res: ", res);
|
|
70
|
-
return ctx.json(res);
|
|
71
|
-
}
|
|
72
|
-
logger.error(`Expected a Promise from fetchDataPromise[0] for dataFetchId ${dataFetchId}, but received:`, targetPromise, "Will try call new dataFetch again...");
|
|
73
|
-
}
|
|
74
|
-
if (remoteInfo) {
|
|
75
|
-
try {
|
|
76
|
-
const hostInstance2 = globalThis.__FEDERATION__.__INSTANCES__[0];
|
|
77
|
-
const remoteEntry = `${addProtocol(remoteInfo.ssrPublicPath) + remoteInfo.ssrRemoteEntry}`;
|
|
78
|
-
if (!hostInstance2) {
|
|
79
|
-
throw new Error("host instance not found!");
|
|
80
|
-
}
|
|
81
|
-
const remote = hostInstance2.options.remotes.find((remote2) => remote2.name === remoteInfo.name);
|
|
82
|
-
logger.debug("find remote: ", JSON.stringify(remote));
|
|
83
|
-
if (!remote) {
|
|
84
|
-
hostInstance2.registerRemotes([
|
|
85
|
-
{
|
|
86
|
-
name: remoteInfo.name,
|
|
87
|
-
entry: remoteEntry,
|
|
88
|
-
entryGlobalName: remoteInfo.globalName
|
|
89
|
-
}
|
|
90
|
-
]);
|
|
91
|
-
} else if (!("entry" in remote) || !remote.entry.includes(MANIFEST_EXT)) {
|
|
92
|
-
const { hostGlobalSnapshot, remoteSnapshot } = hostInstance2.snapshotHandler.getGlobalRemoteInfo(remoteInfo);
|
|
93
|
-
logger.debug("find hostGlobalSnapshot: ", JSON.stringify(hostGlobalSnapshot));
|
|
94
|
-
logger.debug("find remoteSnapshot: ", JSON.stringify(remoteSnapshot));
|
|
95
|
-
if (!hostGlobalSnapshot || !remoteSnapshot) {
|
|
96
|
-
if ("version" in remote) {
|
|
97
|
-
delete remote.version;
|
|
98
|
-
}
|
|
99
|
-
remote.entry = remoteEntry;
|
|
100
|
-
remote.entryGlobalName = remoteInfo.globalName;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
} catch (e) {
|
|
104
|
-
ctx.status(500);
|
|
105
|
-
return ctx.text(`failed to fetch ${remoteInfo.name} data, error:
|
|
106
|
-
${e}`);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
const dataFetchItem = dataFetchMap[dataFetchId];
|
|
110
|
-
logger.debug("fetch data from server, dataFetchItem: ", dataFetchItem);
|
|
111
|
-
if (dataFetchItem) {
|
|
112
|
-
const callFetchDataPromise = fetchData(dataFetchId, {
|
|
113
|
-
...params,
|
|
114
|
-
isDowngrade: !remoteInfo
|
|
115
|
-
});
|
|
116
|
-
const wrappedPromise = wrapSetTimeout(callFetchDataPromise, 2e4, dataFetchId);
|
|
117
|
-
if (wrappedPromise) {
|
|
118
|
-
const res = await wrappedPromise;
|
|
119
|
-
logger.log("fetch data from server, dataFetchItem res: ", res);
|
|
120
|
-
return ctx.json(res);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
const remoteId = dataFetchId.split(SEPARATOR)[0];
|
|
124
|
-
const hostInstance = globalThis.__FEDERATION__.__INSTANCES__[0];
|
|
125
|
-
if (!hostInstance) {
|
|
126
|
-
throw new Error("host instance not found!");
|
|
127
|
-
}
|
|
128
|
-
const dataFetchFn = await loadDataFetchModule(hostInstance, remoteId);
|
|
129
|
-
const data = await dataFetchFn({
|
|
130
|
-
...params,
|
|
131
|
-
isDowngrade: !remoteInfo
|
|
132
|
-
});
|
|
133
|
-
logger.log("fetch data from server, loadDataFetchModule res: ", data);
|
|
134
|
-
return ctx.json(data);
|
|
135
|
-
} catch (e) {
|
|
136
|
-
logger.error("server plugin data fetch error: ", e);
|
|
137
|
-
ctx.status(500);
|
|
138
|
-
return ctx.text(`failed to fetch ${remoteInfo.name} data, error:
|
|
139
|
-
${e}`);
|
|
140
|
-
}
|
|
141
|
-
};
|
|
1
|
+
import dataFetchMiddleWare from "@module-federation/react/data-fetch-server-middleware";
|
|
142
2
|
const dataFetchServePlugin = () => ({
|
|
143
3
|
name: "mf-data-fetch-server-plugin",
|
|
144
4
|
setup: (api) => {
|
|
@@ -147,7 +7,7 @@ const dataFetchServePlugin = () => ({
|
|
|
147
7
|
middlewares.push({
|
|
148
8
|
name: "module-federation-serve-manifest",
|
|
149
9
|
// @ts-ignore type error
|
|
150
|
-
handler:
|
|
10
|
+
handler: dataFetchMiddleWare
|
|
151
11
|
});
|
|
152
12
|
});
|
|
153
13
|
}
|
|
@@ -1,5 +1,40 @@
|
|
|
1
|
+
import * as mfRuntime from "@module-federation/enhanced/runtime";
|
|
2
|
+
import { kit as rawKit, ERROR_TYPE } from "@module-federation/react/pure";
|
|
1
3
|
export * from "@module-federation/enhanced/runtime";
|
|
2
|
-
|
|
4
|
+
const kit = {
|
|
5
|
+
get createRemoteSSRComponent() {
|
|
6
|
+
const { createRemoteSSRComponent } = rawKit;
|
|
7
|
+
return (options) => createRemoteSSRComponent({
|
|
8
|
+
...options,
|
|
9
|
+
runtime: mfRuntime
|
|
10
|
+
});
|
|
11
|
+
},
|
|
12
|
+
get createRemoteComponent() {
|
|
13
|
+
const { createRemoteComponent } = rawKit;
|
|
14
|
+
return (options) => createRemoteComponent({
|
|
15
|
+
...options,
|
|
16
|
+
runtime: mfRuntime
|
|
17
|
+
});
|
|
18
|
+
},
|
|
19
|
+
get collectSSRAssets() {
|
|
20
|
+
const { collectSSRAssets } = rawKit;
|
|
21
|
+
return (options) => collectSSRAssets({
|
|
22
|
+
...options,
|
|
23
|
+
runtime: mfRuntime
|
|
24
|
+
});
|
|
25
|
+
},
|
|
26
|
+
get wrapNoSSR() {
|
|
27
|
+
return (createComponentFn) => {
|
|
28
|
+
return (options) => createComponentFn({
|
|
29
|
+
...options,
|
|
30
|
+
noSSR: true
|
|
31
|
+
});
|
|
32
|
+
};
|
|
33
|
+
},
|
|
34
|
+
get injectDataFetch() {
|
|
35
|
+
return require("@module-federation/react/pure").kit.injectDataFetch;
|
|
36
|
+
}
|
|
37
|
+
};
|
|
3
38
|
export {
|
|
4
39
|
ERROR_TYPE,
|
|
5
40
|
kit
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { SSRLiveReload } from "./SSRLiveReload";
|
|
3
|
-
import { flushDataFetch } from "@module-federation/
|
|
3
|
+
import { flushDataFetch } from "@module-federation/react/data-fetch-utils";
|
|
4
4
|
const mfSSRDevPlugin = () => ({
|
|
5
5
|
name: "@module-federation/modern-js",
|
|
6
6
|
setup: (api) => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { kit } from "@module-federation/
|
|
1
|
+
import { kit } from "@module-federation/react/pure";
|
|
2
2
|
const { callDataFetch, injectDataFetch, setSSREnv } = kit;
|
|
3
3
|
const injectDataFetchFunctionPlugin = ({ fetchServerQuery }) => ({
|
|
4
4
|
name: "@module-federation/inject-data-fetch-function-plugin",
|
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
import { ERROR_TYPE } from '@module-federation/react/pure';
|
|
2
|
+
import type { CollectSSRAssetsOptions, CreateRemoteComponentOptions } from '@module-federation/react/pure';
|
|
1
3
|
export * from '@module-federation/enhanced/runtime';
|
|
2
|
-
export {
|
|
3
|
-
|
|
4
|
+
export { ERROR_TYPE };
|
|
5
|
+
type NewCreateRemoteComponentOptions<T, E extends keyof T> = Omit<CreateRemoteComponentOptions<T, E>, 'runtime'>;
|
|
6
|
+
type NewCreateRemoteComponent = <T, E extends keyof T>(options: NewCreateRemoteComponentOptions<T, E>) => ReturnType<typeof import('@module-federation/react/pure').kit.createRemoteSSRComponent<T, E>>;
|
|
7
|
+
export declare const kit: {
|
|
8
|
+
readonly createRemoteSSRComponent: NewCreateRemoteComponent;
|
|
9
|
+
readonly createRemoteComponent: NewCreateRemoteComponent;
|
|
10
|
+
readonly collectSSRAssets: (options: Omit<CollectSSRAssetsOptions, "runtime">) => ReturnType<typeof import("@module-federation/react/pure").kit.collectSSRAssets>;
|
|
11
|
+
readonly wrapNoSSR: <T, E extends keyof T>(createComponentFn: NewCreateRemoteComponent) => (options: Omit<NewCreateRemoteComponentOptions<T, E>, "noSSR">) => ReturnType<NewCreateRemoteComponent>;
|
|
12
|
+
readonly injectDataFetch: typeof import("@module-federation/react/dist/types/module/data-fetch/inject-data-fetch").injectDataFetch;
|
|
13
|
+
};
|
|
14
|
+
export type { DataFetchParams } from '@module-federation/react/pure';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/modern-js",
|
|
3
|
-
"version": "0.0.0-next-
|
|
3
|
+
"version": "0.0.0-next-20250616123529",
|
|
4
4
|
"files": [
|
|
5
5
|
"dist/",
|
|
6
6
|
"types.d.ts",
|
|
@@ -112,13 +112,13 @@
|
|
|
112
112
|
"@swc/helpers": "^0.5.17",
|
|
113
113
|
"node-fetch": "~3.3.0",
|
|
114
114
|
"react-error-boundary": "4.1.2",
|
|
115
|
-
"@module-federation/rsbuild-plugin": "0.0.0-next-
|
|
116
|
-
"@module-federation/
|
|
117
|
-
"@module-federation/enhanced": "0.0.0-next-
|
|
118
|
-
"@module-federation/runtime": "0.0.0-next-
|
|
119
|
-
"@module-federation/node": "0.0.0-next-
|
|
120
|
-
"@module-federation/sdk": "0.0.0-next-
|
|
121
|
-
"@module-federation/cli": "0.0.0-next-
|
|
115
|
+
"@module-federation/rsbuild-plugin": "0.0.0-next-20250616123529",
|
|
116
|
+
"@module-federation/react": "0.0.0-next-20250616123529",
|
|
117
|
+
"@module-federation/enhanced": "0.0.0-next-20250616123529",
|
|
118
|
+
"@module-federation/runtime": "0.0.0-next-20250616123529",
|
|
119
|
+
"@module-federation/node": "0.0.0-next-20250616123529",
|
|
120
|
+
"@module-federation/sdk": "0.0.0-next-20250616123529",
|
|
121
|
+
"@module-federation/cli": "0.0.0-next-20250616123529"
|
|
122
122
|
},
|
|
123
123
|
"devDependencies": {
|
|
124
124
|
"@modern-js/core": "2.67.5",
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
"@modern-js/module-tools": "2.67.6",
|
|
129
129
|
"@modern-js/runtime": "2.67.6",
|
|
130
130
|
"@modern-js/tsconfig": "2.67.6",
|
|
131
|
-
"@module-federation/manifest": "0.0.0-next-
|
|
131
|
+
"@module-federation/manifest": "0.0.0-next-20250616123529"
|
|
132
132
|
},
|
|
133
133
|
"peerDependencies": {
|
|
134
134
|
"react": ">=17",
|