@module-federation/bridge-react 0.23.0 → 0.24.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.
- package/CHANGELOG.md +7 -0
- package/dist/base.cjs.js +3 -3
- package/dist/base.es.js +11 -11
- package/dist/{bridge-base-RStDxH71.js → bridge-base-1Grpgans.js} +2 -1
- package/dist/{bridge-base-CPSTBjEp.mjs → bridge-base-CIgEZf8X.mjs} +2 -1
- package/dist/{createHelpers-B_L612IN.js → createHelpers-2UBGLdcA.js} +3 -2
- package/dist/{createHelpers-Ui5pt7je.mjs → createHelpers-C9qvVTND.mjs} +5 -4
- package/dist/data-fetch-server-middleware.es.js +1 -1
- package/dist/data-fetch-utils.cjs.js +1 -1
- package/dist/data-fetch-utils.es.js +7 -7
- package/dist/index.cjs.js +5 -5
- package/dist/index.es.js +12 -12
- package/dist/{lazy-load-component-plugin-lLkUGUIW.mjs → lazy-load-component-plugin-BoFzraQv.mjs} +5 -5
- package/dist/{lazy-load-component-plugin-GaQxzHsw.js → lazy-load-component-plugin-DozDrfqb.js} +1 -1
- package/dist/lazy-load-component-plugin.cjs.js +2 -2
- package/dist/lazy-load-component-plugin.es.js +2 -2
- package/dist/lazy-utils.es.js +6 -6
- package/dist/{prefetch-PoipyNzq.js → prefetch-BzfBW4fX.js} +134 -16
- package/dist/{prefetch-Cv8Vx9jG.mjs → prefetch-C8qqTz8_.mjs} +136 -18
- package/dist/router-v5.cjs.js +4 -2
- package/dist/router-v5.d.ts +1 -2
- package/dist/router-v5.es.js +4 -2
- package/dist/router-v7.cjs.js +4 -2
- package/dist/router-v7.d.ts +2 -3
- package/dist/router-v7.es.js +4 -2
- package/dist/{utils-dUgb9Jkm.mjs → utils--qTri1IN.mjs} +8 -8
- package/dist/v18.cjs.js +1 -1
- package/dist/v18.es.js +1 -1
- package/dist/v19.cjs.js +1 -1
- package/dist/v19.es.js +1 -1
- package/package.json +8 -8
- package/src/provider/versions/bridge-base.tsx +5 -2
- package/src/remote/createHelpers.tsx +4 -2
- package/src/router/v5.tsx +7 -7
- package/src/router/v7.tsx +12 -12
package/CHANGELOG.md
CHANGED
package/dist/base.cjs.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const createHelpers = require("./createHelpers-
|
|
4
|
-
const lazyLoadComponentPlugin = require("./lazy-load-component-plugin-
|
|
3
|
+
const createHelpers = require("./createHelpers-2UBGLdcA.js");
|
|
4
|
+
const lazyLoadComponentPlugin = require("./lazy-load-component-plugin-DozDrfqb.js");
|
|
5
5
|
const lazyUtils = require("./utils-tM9yE73c.js");
|
|
6
6
|
const dataFetchUtils = require("./data-fetch-utils.cjs.js");
|
|
7
|
-
const prefetch = require("./prefetch-
|
|
7
|
+
const prefetch = require("./prefetch-BzfBW4fX.js");
|
|
8
8
|
const createRemoteAppComponent = createHelpers.createRemoteAppComponentFactory(createHelpers.RemoteAppWrapper);
|
|
9
9
|
const createRemoteComponent = createHelpers.createDeprecatedRemoteComponentFactory(
|
|
10
10
|
createRemoteAppComponent
|
package/dist/base.es.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { c as
|
|
2
|
-
import { b } from "./createHelpers-
|
|
3
|
-
import { b as b2,
|
|
4
|
-
import { C, a as a2, E, b as b3, d,
|
|
1
|
+
import { c as createRemoteAppComponentFactory, a as createDeprecatedRemoteComponentFactory, R as RemoteAppWrapper } from "./createHelpers-C9qvVTND.mjs";
|
|
2
|
+
import { b } from "./createHelpers-C9qvVTND.mjs";
|
|
3
|
+
import { a, c, b as b2, l } from "./lazy-load-component-plugin-BoFzraQv.mjs";
|
|
4
|
+
import { C, a as a2, E, c as c2, b as b3, d, g, r, s } from "./utils--qTri1IN.mjs";
|
|
5
5
|
import { callDataFetch } from "./data-fetch-utils.es.js";
|
|
6
|
-
import { p } from "./prefetch-
|
|
6
|
+
import { p } from "./prefetch-C8qqTz8_.mjs";
|
|
7
7
|
const createRemoteAppComponent = createRemoteAppComponentFactory(RemoteAppWrapper);
|
|
8
8
|
const createRemoteComponent = createDeprecatedRemoteComponentFactory(
|
|
9
9
|
createRemoteAppComponent
|
|
@@ -12,14 +12,14 @@ export {
|
|
|
12
12
|
C as CacheSize,
|
|
13
13
|
a2 as CacheTime,
|
|
14
14
|
E as ERROR_TYPE,
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
a as autoFetchDataPlugin,
|
|
16
|
+
c2 as cache,
|
|
17
17
|
callDataFetch,
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
b3 as clearStore,
|
|
19
|
+
c as collectSSRAssets,
|
|
20
|
+
d as configureCache,
|
|
21
21
|
b as createBridgeComponent,
|
|
22
|
-
|
|
22
|
+
b2 as createLazyComponent,
|
|
23
23
|
createRemoteAppComponent,
|
|
24
24
|
createRemoteComponent,
|
|
25
25
|
g as generateKey,
|
|
@@ -139,13 +139,14 @@ function createBaseBridgeComponent({
|
|
|
139
139
|
));
|
|
140
140
|
};
|
|
141
141
|
const DefaultFallback = ({ error }) => /* @__PURE__ */ React__namespace.createElement("div", { role: "alert" }, /* @__PURE__ */ React__namespace.createElement("p", null, "Something went wrong:"), /* @__PURE__ */ React__namespace.createElement("pre", { style: { color: "red" } }, error.message));
|
|
142
|
+
const ErrorBoundaryComponent = ErrorBoundary;
|
|
142
143
|
const BridgeWrapper = ({
|
|
143
144
|
basename,
|
|
144
145
|
moduleName,
|
|
145
146
|
memoryRoute,
|
|
146
147
|
propsInfo,
|
|
147
148
|
fallback
|
|
148
|
-
}) => /* @__PURE__ */ React__namespace.createElement(
|
|
149
|
+
}) => /* @__PURE__ */ React__namespace.createElement(ErrorBoundaryComponent, { FallbackComponent: fallback || DefaultFallback }, /* @__PURE__ */ React__namespace.createElement(
|
|
149
150
|
RawComponent,
|
|
150
151
|
{
|
|
151
152
|
appInfo: {
|
|
@@ -122,13 +122,14 @@ function createBaseBridgeComponent({
|
|
|
122
122
|
));
|
|
123
123
|
};
|
|
124
124
|
const DefaultFallback = ({ error }) => /* @__PURE__ */ React.createElement("div", { role: "alert" }, /* @__PURE__ */ React.createElement("p", null, "Something went wrong:"), /* @__PURE__ */ React.createElement("pre", { style: { color: "red" } }, error.message));
|
|
125
|
+
const ErrorBoundaryComponent = ErrorBoundary;
|
|
125
126
|
const BridgeWrapper = ({
|
|
126
127
|
basename,
|
|
127
128
|
moduleName,
|
|
128
129
|
memoryRoute,
|
|
129
130
|
propsInfo,
|
|
130
131
|
fallback
|
|
131
|
-
}) => /* @__PURE__ */ React.createElement(
|
|
132
|
+
}) => /* @__PURE__ */ React.createElement(ErrorBoundaryComponent, { FallbackComponent: fallback || DefaultFallback }, /* @__PURE__ */ React.createElement(
|
|
132
133
|
RawComponent,
|
|
133
134
|
{
|
|
134
135
|
appInfo: {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
const bridgeBase = require("./bridge-base-
|
|
2
|
+
const bridgeBase = require("./bridge-base-1Grpgans.js");
|
|
3
3
|
const ReactDOM = require("react-dom");
|
|
4
4
|
const index = require("./index-DRSBaSu3.js");
|
|
5
5
|
const React = require("react");
|
|
@@ -162,12 +162,13 @@ function createLazyRemoteComponentFactory(RemoteApp) {
|
|
|
162
162
|
};
|
|
163
163
|
}
|
|
164
164
|
function createRemoteAppComponentFactory(RemoteApp) {
|
|
165
|
+
const ErrorBoundaryComponent = bridgeBase.ErrorBoundary;
|
|
165
166
|
const createLazyRemoteComponent = createLazyRemoteComponentFactory(RemoteApp);
|
|
166
167
|
return function createRemoteAppComponent(info) {
|
|
167
168
|
const LazyComponent = createLazyRemoteComponent(info);
|
|
168
169
|
return React.forwardRef((props, ref) => {
|
|
169
170
|
return /* @__PURE__ */ React.createElement(
|
|
170
|
-
|
|
171
|
+
ErrorBoundaryComponent,
|
|
171
172
|
{
|
|
172
173
|
FallbackComponent: info.fallback
|
|
173
174
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { c as createBaseBridgeComponent, E as ErrorBoundary } from "./bridge-base-
|
|
1
|
+
import { c as createBaseBridgeComponent, E as ErrorBoundary } from "./bridge-base-CIgEZf8X.mjs";
|
|
2
2
|
import ReactDOM from "react-dom";
|
|
3
3
|
import { L as LoggerInstance, g as getRootDomDefaultClassName } from "./index-DyQNwY2M.mjs";
|
|
4
4
|
import React__default, { forwardRef, useRef, useState, useEffect } from "react";
|
|
@@ -161,12 +161,13 @@ function createLazyRemoteComponentFactory(RemoteApp) {
|
|
|
161
161
|
};
|
|
162
162
|
}
|
|
163
163
|
function createRemoteAppComponentFactory(RemoteApp) {
|
|
164
|
+
const ErrorBoundaryComponent = ErrorBoundary;
|
|
164
165
|
const createLazyRemoteComponent = createLazyRemoteComponentFactory(RemoteApp);
|
|
165
166
|
return function createRemoteAppComponent(info) {
|
|
166
167
|
const LazyComponent = createLazyRemoteComponent(info);
|
|
167
168
|
return forwardRef((props, ref) => {
|
|
168
169
|
return /* @__PURE__ */ React__default.createElement(
|
|
169
|
-
|
|
170
|
+
ErrorBoundaryComponent,
|
|
170
171
|
{
|
|
171
172
|
FallbackComponent: info.fallback
|
|
172
173
|
},
|
|
@@ -185,7 +186,7 @@ function createDeprecatedRemoteComponentFactory(createFn) {
|
|
|
185
186
|
}
|
|
186
187
|
export {
|
|
187
188
|
RemoteAppWrapper as R,
|
|
188
|
-
|
|
189
|
+
createDeprecatedRemoteComponentFactory as a,
|
|
189
190
|
createBridgeComponent as b,
|
|
190
|
-
|
|
191
|
+
createRemoteAppComponentFactory as c
|
|
191
192
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { D as DATA_FETCH_QUERY, l as logger, e as getDataFetchMap, i as initDataFetchMap, M as MF_DATA_FETCH_STATUS, f as fetchData, h as loadDataFetchModule } from "./utils
|
|
1
|
+
import { D as DATA_FETCH_QUERY, l as logger, e as getDataFetchMap, i as initDataFetchMap, M as MF_DATA_FETCH_STATUS, f as fetchData, h as loadDataFetchModule } from "./utils--qTri1IN.mjs";
|
|
2
2
|
import { M as MANIFEST_EXT, S as SEPARATOR } from "./index.esm-CPwSeCvw.mjs";
|
|
3
3
|
function wrapSetTimeout(targetPromise, delay = 2e4, id) {
|
|
4
4
|
if (targetPromise && typeof targetPromise.then === "function") {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
3
|
const lazyUtils = require("./utils-tM9yE73c.js");
|
|
4
|
-
const prefetch = require("./prefetch-
|
|
4
|
+
const prefetch = require("./prefetch-BzfBW4fX.js");
|
|
5
5
|
async function callDataFetch() {
|
|
6
6
|
const dataFetch = globalThis[lazyUtils.DATA_FETCH_FUNCTION];
|
|
7
7
|
if (dataFetch) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { x as DATA_FETCH_FUNCTION } from "./utils
|
|
2
|
-
import { C, a, b, d,
|
|
3
|
-
import { d as dataFetchFunction } from "./prefetch-
|
|
4
|
-
import { i, p } from "./prefetch-
|
|
1
|
+
import { x as DATA_FETCH_FUNCTION } from "./utils--qTri1IN.mjs";
|
|
2
|
+
import { C, a, c, b, d, g, r } from "./utils--qTri1IN.mjs";
|
|
3
|
+
import { d as dataFetchFunction } from "./prefetch-C8qqTz8_.mjs";
|
|
4
|
+
import { i, p } from "./prefetch-C8qqTz8_.mjs";
|
|
5
5
|
async function callDataFetch() {
|
|
6
6
|
const dataFetch = globalThis[DATA_FETCH_FUNCTION];
|
|
7
7
|
if (dataFetch) {
|
|
@@ -15,10 +15,10 @@ async function callDataFetch() {
|
|
|
15
15
|
export {
|
|
16
16
|
C as CacheSize,
|
|
17
17
|
a as CacheTime,
|
|
18
|
-
|
|
18
|
+
c as cache,
|
|
19
19
|
callDataFetch,
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
b as clearStore,
|
|
21
|
+
d as configureCache,
|
|
22
22
|
g as generateKey,
|
|
23
23
|
i as injectDataFetch,
|
|
24
24
|
p as prefetch,
|
package/dist/index.cjs.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const createHelpers = require("./createHelpers-
|
|
4
|
-
const lazyLoadComponentPlugin = require("./lazy-load-component-plugin-
|
|
3
|
+
const createHelpers = require("./createHelpers-2UBGLdcA.js");
|
|
4
|
+
const lazyLoadComponentPlugin = require("./lazy-load-component-plugin-DozDrfqb.js");
|
|
5
|
+
const lazyUtils = require("./utils-tM9yE73c.js");
|
|
6
|
+
const dataFetchUtils = require("./data-fetch-utils.cjs.js");
|
|
5
7
|
const React = require("react");
|
|
6
8
|
const ReactRouterDOM = require("react-router-dom");
|
|
7
9
|
const index = require("./index-DRSBaSu3.js");
|
|
8
|
-
const
|
|
9
|
-
const dataFetchUtils = require("./data-fetch-utils.cjs.js");
|
|
10
|
-
const prefetch = require("./prefetch-PoipyNzq.js");
|
|
10
|
+
const prefetch = require("./prefetch-BzfBW4fX.js");
|
|
11
11
|
function _interopNamespaceDefault(e2) {
|
|
12
12
|
const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
|
|
13
13
|
if (e2) {
|
package/dist/index.es.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { R as RemoteAppWrapper, c as
|
|
2
|
-
import { b } from "./createHelpers-
|
|
3
|
-
import { b as b2,
|
|
1
|
+
import { R as RemoteAppWrapper, c as createRemoteAppComponentFactory, a as createDeprecatedRemoteComponentFactory } from "./createHelpers-C9qvVTND.mjs";
|
|
2
|
+
import { b } from "./createHelpers-C9qvVTND.mjs";
|
|
3
|
+
import { a, c, b as b2, l } from "./lazy-load-component-plugin-BoFzraQv.mjs";
|
|
4
|
+
import { C, a as a2, E, c as c2, b as b3, d, g, r, s } from "./utils--qTri1IN.mjs";
|
|
5
|
+
import { callDataFetch } from "./data-fetch-utils.es.js";
|
|
4
6
|
import React__default, { forwardRef, useContext, useState, useEffect } from "react";
|
|
5
7
|
import * as ReactRouterDOM from "react-router-dom";
|
|
6
8
|
import { p as pathJoin, L as LoggerInstance } from "./index-DyQNwY2M.mjs";
|
|
7
|
-
import {
|
|
8
|
-
import { callDataFetch } from "./data-fetch-utils.es.js";
|
|
9
|
-
import { p } from "./prefetch-Cv8Vx9jG.mjs";
|
|
9
|
+
import { p } from "./prefetch-C8qqTz8_.mjs";
|
|
10
10
|
function e() {
|
|
11
11
|
const t = new PopStateEvent("popstate", { state: window.history.state });
|
|
12
12
|
window.dispatchEvent(t);
|
|
@@ -91,14 +91,14 @@ export {
|
|
|
91
91
|
C as CacheSize,
|
|
92
92
|
a2 as CacheTime,
|
|
93
93
|
E as ERROR_TYPE,
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
a as autoFetchDataPlugin,
|
|
95
|
+
c2 as cache,
|
|
96
96
|
callDataFetch,
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
97
|
+
b3 as clearStore,
|
|
98
|
+
c as collectSSRAssets,
|
|
99
|
+
d as configureCache,
|
|
100
100
|
b as createBridgeComponent,
|
|
101
|
-
|
|
101
|
+
b2 as createLazyComponent,
|
|
102
102
|
createRemoteAppComponent,
|
|
103
103
|
createRemoteComponent,
|
|
104
104
|
g as generateKey,
|
package/dist/{lazy-load-component-plugin-lLkUGUIW.mjs → lazy-load-component-plugin-BoFzraQv.mjs}
RENAMED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { i as injectDataFetch, p as prefetch } from "./prefetch-
|
|
2
|
-
import { i as initDataFetchMap, j as isDataLoaderExpose, k as getDataFetchInfo, m as getDataFetchMapKey, l as logger, n as getDataFetchItem, o as DATA_FETCH_CLIENT_SUFFIX, p as MF_DATA_FETCH_TYPE, q as isCSROnly,
|
|
1
|
+
import { i as injectDataFetch, p as prefetch } from "./prefetch-C8qqTz8_.mjs";
|
|
2
|
+
import { i as initDataFetchMap, j as isDataLoaderExpose, k as getDataFetchInfo, m as getDataFetchMapKey, l as logger, n as getDataFetchItem, o as DATA_FETCH_CLIENT_SUFFIX, p as MF_DATA_FETCH_TYPE, q as isCSROnly, M as MF_DATA_FETCH_STATUS, h as loadDataFetchModule, e as getDataFetchMap, t as isServerEnv, u as getDataFetchIdWithErrorMsgs, v as DATA_FETCH_ERROR_PREFIX, E as ERROR_TYPE, w as wrapDataFetchId, L as LOAD_REMOTE_ERROR_PREFIX, x as DATA_FETCH_FUNCTION, y as getLoadedRemoteInfos, f as fetchData$1, z as setDataFetchItemLoadedStatus, F as FS_HREF } from "./utils--qTri1IN.mjs";
|
|
3
3
|
import React__default, { useRef, useState, Suspense, useEffect } from "react";
|
|
4
4
|
const autoFetchData = () => {
|
|
5
5
|
initDataFetchMap();
|
|
@@ -515,8 +515,8 @@ function lazyLoadComponentPlugin() {
|
|
|
515
515
|
};
|
|
516
516
|
}
|
|
517
517
|
export {
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
518
|
+
autoFetchData as a,
|
|
519
|
+
createLazyComponent as b,
|
|
520
|
+
collectSSRAssets as c,
|
|
521
521
|
lazyLoadComponentPlugin as l
|
|
522
522
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
|
|
3
|
-
const lazyLoadComponentPlugin = require("./lazy-load-component-plugin-
|
|
4
|
-
require("./prefetch-
|
|
3
|
+
const lazyLoadComponentPlugin = require("./lazy-load-component-plugin-DozDrfqb.js");
|
|
4
|
+
require("./prefetch-BzfBW4fX.js");
|
|
5
5
|
exports.default = lazyLoadComponentPlugin.lazyLoadComponentPlugin;
|
|
6
6
|
exports.lazyLoadComponentPlugin = lazyLoadComponentPlugin.lazyLoadComponentPlugin;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { l, l as l2 } from "./lazy-load-component-plugin-
|
|
2
|
-
import "./prefetch-
|
|
1
|
+
import { l, l as l2 } from "./lazy-load-component-plugin-BoFzraQv.mjs";
|
|
2
|
+
import "./prefetch-C8qqTz8_.mjs";
|
|
3
3
|
export {
|
|
4
4
|
l as default,
|
|
5
5
|
l2 as lazyLoadComponentPlugin
|
package/dist/lazy-utils.es.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import "./index.esm-CPwSeCvw.mjs";
|
|
2
|
-
import {
|
|
2
|
+
import { B, G, f, I, J, u, k, n, e, m, H, y, i, q, j, t, h, z, s, w } from "./utils--qTri1IN.mjs";
|
|
3
3
|
export {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
B as callAllDowngrade,
|
|
5
|
+
G as callDowngrade,
|
|
6
6
|
f as fetchData,
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
I as flushDataFetch,
|
|
8
|
+
J as getDataFetchCache,
|
|
9
9
|
u as getDataFetchIdWithErrorMsgs,
|
|
10
10
|
k as getDataFetchInfo,
|
|
11
11
|
n as getDataFetchItem,
|
|
12
12
|
e as getDataFetchMap,
|
|
13
13
|
m as getDataFetchMapKey,
|
|
14
|
-
|
|
14
|
+
H as getDowngradeTag,
|
|
15
15
|
y as getLoadedRemoteInfos,
|
|
16
16
|
i as initDataFetchMap,
|
|
17
17
|
q as isCSROnly,
|
|
@@ -87,7 +87,7 @@ const RUNTIME_008 = "RUNTIME-008";
|
|
|
87
87
|
const RUNTIME_009 = "RUNTIME-009";
|
|
88
88
|
const getDocsUrl = (errorCode) => {
|
|
89
89
|
const type = errorCode.split("-")[0].toLowerCase();
|
|
90
|
-
return `View the docs to see how to solve: https://module-federation.io/guide/troubleshooting/${type}
|
|
90
|
+
return `View the docs to see how to solve: https://module-federation.io/guide/troubleshooting/${type}#${errorCode.toLowerCase()}`;
|
|
91
91
|
};
|
|
92
92
|
const getShortErrorMsg = (errorCode, errorDescMap, args, originalErrorMsg) => {
|
|
93
93
|
const msg = [`${[errorDescMap[errorCode]]} #${errorCode}`];
|
|
@@ -211,7 +211,7 @@ function getGlobalFederationConstructor() {
|
|
|
211
211
|
function setGlobalFederationConstructor(FederationConstructor, isDebug = index_esm.isDebugMode()) {
|
|
212
212
|
if (isDebug) {
|
|
213
213
|
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
|
|
214
|
-
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.
|
|
214
|
+
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.24.0";
|
|
215
215
|
}
|
|
216
216
|
}
|
|
217
217
|
function getInfoWithoutType(target, key) {
|
|
@@ -667,6 +667,25 @@ function satisfy(version, range) {
|
|
|
667
667
|
}
|
|
668
668
|
return false;
|
|
669
669
|
}
|
|
670
|
+
function shouldUseTreeShaking(treeShaking, usedExports) {
|
|
671
|
+
if (!treeShaking) {
|
|
672
|
+
return false;
|
|
673
|
+
}
|
|
674
|
+
const { status, mode } = treeShaking;
|
|
675
|
+
if (status === 0) {
|
|
676
|
+
return false;
|
|
677
|
+
}
|
|
678
|
+
if (status === 2) {
|
|
679
|
+
return true;
|
|
680
|
+
}
|
|
681
|
+
if (mode === "runtime-infer") {
|
|
682
|
+
if (!usedExports) {
|
|
683
|
+
return true;
|
|
684
|
+
}
|
|
685
|
+
return isMatchUsedExports(treeShaking, usedExports);
|
|
686
|
+
}
|
|
687
|
+
return false;
|
|
688
|
+
}
|
|
670
689
|
function versionLt(a, b) {
|
|
671
690
|
const transformInvalidVersion = (version) => {
|
|
672
691
|
const isNumberVersion = !Number.isNaN(Number(version));
|
|
@@ -709,19 +728,76 @@ const isLoaded = (shared) => {
|
|
|
709
728
|
const isLoading = (shared) => {
|
|
710
729
|
return Boolean(shared.loading);
|
|
711
730
|
};
|
|
712
|
-
|
|
731
|
+
const isMatchUsedExports = (treeShaking, usedExports) => {
|
|
732
|
+
if (!treeShaking || !usedExports) {
|
|
733
|
+
return false;
|
|
734
|
+
}
|
|
735
|
+
const { usedExports: treeShakingUsedExports } = treeShaking;
|
|
736
|
+
if (!treeShakingUsedExports) {
|
|
737
|
+
return false;
|
|
738
|
+
}
|
|
739
|
+
if (usedExports.every((e) => treeShakingUsedExports.includes(e))) {
|
|
740
|
+
return true;
|
|
741
|
+
}
|
|
742
|
+
return false;
|
|
743
|
+
};
|
|
744
|
+
function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName, treeShaking) {
|
|
713
745
|
const versions = shareScopeMap[scope][pkgName];
|
|
746
|
+
let version = "";
|
|
747
|
+
let useTreesShaking = shouldUseTreeShaking(treeShaking);
|
|
714
748
|
const callback = function(prev, cur) {
|
|
749
|
+
if (useTreesShaking) {
|
|
750
|
+
if (!versions[prev].treeShaking) {
|
|
751
|
+
return true;
|
|
752
|
+
}
|
|
753
|
+
if (!versions[cur].treeShaking) {
|
|
754
|
+
return false;
|
|
755
|
+
}
|
|
756
|
+
return !isLoaded(versions[prev].treeShaking) && versionLt(prev, cur);
|
|
757
|
+
}
|
|
715
758
|
return !isLoaded(versions[prev]) && versionLt(prev, cur);
|
|
716
759
|
};
|
|
717
|
-
|
|
760
|
+
if (useTreesShaking) {
|
|
761
|
+
version = findVersion(shareScopeMap[scope][pkgName], callback);
|
|
762
|
+
if (version) {
|
|
763
|
+
return {
|
|
764
|
+
version,
|
|
765
|
+
useTreesShaking
|
|
766
|
+
};
|
|
767
|
+
}
|
|
768
|
+
useTreesShaking = false;
|
|
769
|
+
}
|
|
770
|
+
return {
|
|
771
|
+
version: findVersion(shareScopeMap[scope][pkgName], callback),
|
|
772
|
+
useTreesShaking
|
|
773
|
+
};
|
|
718
774
|
}
|
|
719
|
-
|
|
775
|
+
const isLoadingOrLoaded = (shared) => {
|
|
776
|
+
return isLoaded(shared) || isLoading(shared);
|
|
777
|
+
};
|
|
778
|
+
function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName, treeShaking) {
|
|
720
779
|
const versions = shareScopeMap[scope][pkgName];
|
|
780
|
+
let version = "";
|
|
781
|
+
let useTreesShaking = shouldUseTreeShaking(treeShaking);
|
|
721
782
|
const callback = function(prev, cur) {
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
783
|
+
if (useTreesShaking) {
|
|
784
|
+
if (!versions[prev].treeShaking) {
|
|
785
|
+
return true;
|
|
786
|
+
}
|
|
787
|
+
if (!versions[cur].treeShaking) {
|
|
788
|
+
return false;
|
|
789
|
+
}
|
|
790
|
+
if (isLoadingOrLoaded(versions[cur].treeShaking)) {
|
|
791
|
+
if (isLoadingOrLoaded(versions[prev].treeShaking)) {
|
|
792
|
+
return Boolean(versionLt(prev, cur));
|
|
793
|
+
} else {
|
|
794
|
+
return true;
|
|
795
|
+
}
|
|
796
|
+
}
|
|
797
|
+
if (isLoadingOrLoaded(versions[prev].treeShaking)) {
|
|
798
|
+
return false;
|
|
799
|
+
}
|
|
800
|
+
}
|
|
725
801
|
if (isLoadingOrLoaded(versions[cur])) {
|
|
726
802
|
if (isLoadingOrLoaded(versions[prev])) {
|
|
727
803
|
return Boolean(versionLt(prev, cur));
|
|
@@ -734,7 +810,20 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
|
|
|
734
810
|
}
|
|
735
811
|
return versionLt(prev, cur);
|
|
736
812
|
};
|
|
737
|
-
|
|
813
|
+
if (useTreesShaking) {
|
|
814
|
+
version = findVersion(shareScopeMap[scope][pkgName], callback);
|
|
815
|
+
if (version) {
|
|
816
|
+
return {
|
|
817
|
+
version,
|
|
818
|
+
useTreesShaking
|
|
819
|
+
};
|
|
820
|
+
}
|
|
821
|
+
useTreesShaking = false;
|
|
822
|
+
}
|
|
823
|
+
return {
|
|
824
|
+
version: findVersion(shareScopeMap[scope][pkgName], callback),
|
|
825
|
+
useTreesShaking
|
|
826
|
+
};
|
|
738
827
|
}
|
|
739
828
|
function getFindShareFunction(strategy) {
|
|
740
829
|
if (strategy === "loaded-first") {
|
|
@@ -746,37 +835,65 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
746
835
|
if (!localShareScopeMap) {
|
|
747
836
|
return;
|
|
748
837
|
}
|
|
749
|
-
const { shareConfig, scope = DEFAULT_SCOPE, strategy } = shareInfo;
|
|
838
|
+
const { shareConfig, scope = DEFAULT_SCOPE, strategy, treeShaking } = shareInfo;
|
|
750
839
|
const scopes = Array.isArray(scope) ? scope : [scope];
|
|
751
840
|
for (const sc of scopes) {
|
|
752
841
|
if (shareConfig && localShareScopeMap[sc] && localShareScopeMap[sc][pkgName]) {
|
|
753
842
|
const { requiredVersion } = shareConfig;
|
|
754
843
|
const findShareFunction = getFindShareFunction(strategy);
|
|
755
|
-
const maxOrSingletonVersion = findShareFunction(localShareScopeMap, sc, pkgName);
|
|
844
|
+
const { version: maxOrSingletonVersion, useTreesShaking } = findShareFunction(localShareScopeMap, sc, pkgName, treeShaking);
|
|
756
845
|
const defaultResolver = () => {
|
|
846
|
+
const shared = localShareScopeMap[sc][pkgName][maxOrSingletonVersion];
|
|
757
847
|
if (shareConfig.singleton) {
|
|
758
848
|
if (typeof requiredVersion === "string" && !satisfy(maxOrSingletonVersion, requiredVersion)) {
|
|
759
|
-
const msg = `Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion &&
|
|
849
|
+
const msg = `Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion && shared.from} of shared singleton module ${pkgName} does not satisfy the requirement of ${shareInfo.from} which needs ${requiredVersion})`;
|
|
760
850
|
if (shareConfig.strictVersion) {
|
|
761
851
|
error(msg);
|
|
762
852
|
} else {
|
|
763
853
|
warn(msg);
|
|
764
854
|
}
|
|
765
855
|
}
|
|
766
|
-
return
|
|
856
|
+
return {
|
|
857
|
+
shared,
|
|
858
|
+
useTreesShaking
|
|
859
|
+
};
|
|
767
860
|
} else {
|
|
768
861
|
if (requiredVersion === false || requiredVersion === "*") {
|
|
769
|
-
return
|
|
862
|
+
return {
|
|
863
|
+
shared,
|
|
864
|
+
useTreesShaking
|
|
865
|
+
};
|
|
770
866
|
}
|
|
771
867
|
if (satisfy(maxOrSingletonVersion, requiredVersion)) {
|
|
772
|
-
return
|
|
868
|
+
return {
|
|
869
|
+
shared,
|
|
870
|
+
useTreesShaking
|
|
871
|
+
};
|
|
872
|
+
}
|
|
873
|
+
const _usedTreeShaking = shouldUseTreeShaking(treeShaking);
|
|
874
|
+
if (_usedTreeShaking) {
|
|
875
|
+
for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])) {
|
|
876
|
+
if (!shouldUseTreeShaking(versionValue.treeShaking, treeShaking == null ? void 0 : treeShaking.usedExports)) {
|
|
877
|
+
continue;
|
|
878
|
+
}
|
|
879
|
+
if (satisfy(versionKey, requiredVersion)) {
|
|
880
|
+
return {
|
|
881
|
+
shared: versionValue,
|
|
882
|
+
useTreesShaking: _usedTreeShaking
|
|
883
|
+
};
|
|
884
|
+
}
|
|
885
|
+
}
|
|
773
886
|
}
|
|
774
887
|
for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])) {
|
|
775
888
|
if (satisfy(versionKey, requiredVersion)) {
|
|
776
|
-
return
|
|
889
|
+
return {
|
|
890
|
+
shared: versionValue,
|
|
891
|
+
useTreesShaking: false
|
|
892
|
+
};
|
|
777
893
|
}
|
|
778
894
|
}
|
|
779
895
|
}
|
|
896
|
+
return;
|
|
780
897
|
};
|
|
781
898
|
const params = {
|
|
782
899
|
shareScopeMap: localShareScopeMap,
|
|
@@ -784,6 +901,7 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
784
901
|
pkgName,
|
|
785
902
|
version: maxOrSingletonVersion,
|
|
786
903
|
GlobalFederation: Global.__FEDERATION__,
|
|
904
|
+
shareInfo,
|
|
787
905
|
resolver: defaultResolver
|
|
788
906
|
};
|
|
789
907
|
const resolveShared = resolveShare.emit(params) || params;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { x as DATA_FETCH_FUNCTION, F as FS_HREF, l as logger$1, e as getDataFetchMap, i as initDataFetchMap, n as getDataFetchItem, M as MF_DATA_FETCH_STATUS, p as MF_DATA_FETCH_TYPE, A as DOWNGRADE_KEY, B as
|
|
2
|
-
import {
|
|
1
|
+
import { x as DATA_FETCH_FUNCTION, F as FS_HREF, l as logger$1, e as getDataFetchMap, i as initDataFetchMap, n as getDataFetchItem, M as MF_DATA_FETCH_STATUS, p as MF_DATA_FETCH_TYPE, A as DOWNGRADE_KEY, B as callAllDowngrade, G as callDowngrade, H as getDowngradeTag, k as getDataFetchInfo, m as getDataFetchMapKey } from "./utils--qTri1IN.mjs";
|
|
2
|
+
import { a as createLink, b as createScript, i as isDebugMode, d as isBrowserEnv, e as composeKeyWithSeparator, l as loadScriptNode, c as createLogger, f as loadScript } from "./index.esm-CPwSeCvw.mjs";
|
|
3
3
|
const dataFetchFunction = async function(options) {
|
|
4
4
|
var _a, _b;
|
|
5
5
|
const [id, data, downgrade] = options;
|
|
@@ -86,7 +86,7 @@ const RUNTIME_008 = "RUNTIME-008";
|
|
|
86
86
|
const RUNTIME_009 = "RUNTIME-009";
|
|
87
87
|
const getDocsUrl = (errorCode) => {
|
|
88
88
|
const type = errorCode.split("-")[0].toLowerCase();
|
|
89
|
-
return `View the docs to see how to solve: https://module-federation.io/guide/troubleshooting/${type}
|
|
89
|
+
return `View the docs to see how to solve: https://module-federation.io/guide/troubleshooting/${type}#${errorCode.toLowerCase()}`;
|
|
90
90
|
};
|
|
91
91
|
const getShortErrorMsg = (errorCode, errorDescMap, args, originalErrorMsg) => {
|
|
92
92
|
const msg = [`${[errorDescMap[errorCode]]} #${errorCode}`];
|
|
@@ -210,7 +210,7 @@ function getGlobalFederationConstructor() {
|
|
|
210
210
|
function setGlobalFederationConstructor(FederationConstructor, isDebug = isDebugMode()) {
|
|
211
211
|
if (isDebug) {
|
|
212
212
|
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
|
|
213
|
-
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.
|
|
213
|
+
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.24.0";
|
|
214
214
|
}
|
|
215
215
|
}
|
|
216
216
|
function getInfoWithoutType(target, key) {
|
|
@@ -666,6 +666,25 @@ function satisfy(version, range) {
|
|
|
666
666
|
}
|
|
667
667
|
return false;
|
|
668
668
|
}
|
|
669
|
+
function shouldUseTreeShaking(treeShaking, usedExports) {
|
|
670
|
+
if (!treeShaking) {
|
|
671
|
+
return false;
|
|
672
|
+
}
|
|
673
|
+
const { status, mode } = treeShaking;
|
|
674
|
+
if (status === 0) {
|
|
675
|
+
return false;
|
|
676
|
+
}
|
|
677
|
+
if (status === 2) {
|
|
678
|
+
return true;
|
|
679
|
+
}
|
|
680
|
+
if (mode === "runtime-infer") {
|
|
681
|
+
if (!usedExports) {
|
|
682
|
+
return true;
|
|
683
|
+
}
|
|
684
|
+
return isMatchUsedExports(treeShaking, usedExports);
|
|
685
|
+
}
|
|
686
|
+
return false;
|
|
687
|
+
}
|
|
669
688
|
function versionLt(a, b) {
|
|
670
689
|
const transformInvalidVersion = (version) => {
|
|
671
690
|
const isNumberVersion = !Number.isNaN(Number(version));
|
|
@@ -708,19 +727,76 @@ const isLoaded = (shared) => {
|
|
|
708
727
|
const isLoading = (shared) => {
|
|
709
728
|
return Boolean(shared.loading);
|
|
710
729
|
};
|
|
711
|
-
|
|
730
|
+
const isMatchUsedExports = (treeShaking, usedExports) => {
|
|
731
|
+
if (!treeShaking || !usedExports) {
|
|
732
|
+
return false;
|
|
733
|
+
}
|
|
734
|
+
const { usedExports: treeShakingUsedExports } = treeShaking;
|
|
735
|
+
if (!treeShakingUsedExports) {
|
|
736
|
+
return false;
|
|
737
|
+
}
|
|
738
|
+
if (usedExports.every((e) => treeShakingUsedExports.includes(e))) {
|
|
739
|
+
return true;
|
|
740
|
+
}
|
|
741
|
+
return false;
|
|
742
|
+
};
|
|
743
|
+
function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName, treeShaking) {
|
|
712
744
|
const versions = shareScopeMap[scope][pkgName];
|
|
745
|
+
let version = "";
|
|
746
|
+
let useTreesShaking = shouldUseTreeShaking(treeShaking);
|
|
713
747
|
const callback = function(prev, cur) {
|
|
748
|
+
if (useTreesShaking) {
|
|
749
|
+
if (!versions[prev].treeShaking) {
|
|
750
|
+
return true;
|
|
751
|
+
}
|
|
752
|
+
if (!versions[cur].treeShaking) {
|
|
753
|
+
return false;
|
|
754
|
+
}
|
|
755
|
+
return !isLoaded(versions[prev].treeShaking) && versionLt(prev, cur);
|
|
756
|
+
}
|
|
714
757
|
return !isLoaded(versions[prev]) && versionLt(prev, cur);
|
|
715
758
|
};
|
|
716
|
-
|
|
759
|
+
if (useTreesShaking) {
|
|
760
|
+
version = findVersion(shareScopeMap[scope][pkgName], callback);
|
|
761
|
+
if (version) {
|
|
762
|
+
return {
|
|
763
|
+
version,
|
|
764
|
+
useTreesShaking
|
|
765
|
+
};
|
|
766
|
+
}
|
|
767
|
+
useTreesShaking = false;
|
|
768
|
+
}
|
|
769
|
+
return {
|
|
770
|
+
version: findVersion(shareScopeMap[scope][pkgName], callback),
|
|
771
|
+
useTreesShaking
|
|
772
|
+
};
|
|
717
773
|
}
|
|
718
|
-
|
|
774
|
+
const isLoadingOrLoaded = (shared) => {
|
|
775
|
+
return isLoaded(shared) || isLoading(shared);
|
|
776
|
+
};
|
|
777
|
+
function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName, treeShaking) {
|
|
719
778
|
const versions = shareScopeMap[scope][pkgName];
|
|
779
|
+
let version = "";
|
|
780
|
+
let useTreesShaking = shouldUseTreeShaking(treeShaking);
|
|
720
781
|
const callback = function(prev, cur) {
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
782
|
+
if (useTreesShaking) {
|
|
783
|
+
if (!versions[prev].treeShaking) {
|
|
784
|
+
return true;
|
|
785
|
+
}
|
|
786
|
+
if (!versions[cur].treeShaking) {
|
|
787
|
+
return false;
|
|
788
|
+
}
|
|
789
|
+
if (isLoadingOrLoaded(versions[cur].treeShaking)) {
|
|
790
|
+
if (isLoadingOrLoaded(versions[prev].treeShaking)) {
|
|
791
|
+
return Boolean(versionLt(prev, cur));
|
|
792
|
+
} else {
|
|
793
|
+
return true;
|
|
794
|
+
}
|
|
795
|
+
}
|
|
796
|
+
if (isLoadingOrLoaded(versions[prev].treeShaking)) {
|
|
797
|
+
return false;
|
|
798
|
+
}
|
|
799
|
+
}
|
|
724
800
|
if (isLoadingOrLoaded(versions[cur])) {
|
|
725
801
|
if (isLoadingOrLoaded(versions[prev])) {
|
|
726
802
|
return Boolean(versionLt(prev, cur));
|
|
@@ -733,7 +809,20 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
|
|
|
733
809
|
}
|
|
734
810
|
return versionLt(prev, cur);
|
|
735
811
|
};
|
|
736
|
-
|
|
812
|
+
if (useTreesShaking) {
|
|
813
|
+
version = findVersion(shareScopeMap[scope][pkgName], callback);
|
|
814
|
+
if (version) {
|
|
815
|
+
return {
|
|
816
|
+
version,
|
|
817
|
+
useTreesShaking
|
|
818
|
+
};
|
|
819
|
+
}
|
|
820
|
+
useTreesShaking = false;
|
|
821
|
+
}
|
|
822
|
+
return {
|
|
823
|
+
version: findVersion(shareScopeMap[scope][pkgName], callback),
|
|
824
|
+
useTreesShaking
|
|
825
|
+
};
|
|
737
826
|
}
|
|
738
827
|
function getFindShareFunction(strategy) {
|
|
739
828
|
if (strategy === "loaded-first") {
|
|
@@ -745,37 +834,65 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
745
834
|
if (!localShareScopeMap) {
|
|
746
835
|
return;
|
|
747
836
|
}
|
|
748
|
-
const { shareConfig, scope = DEFAULT_SCOPE, strategy } = shareInfo;
|
|
837
|
+
const { shareConfig, scope = DEFAULT_SCOPE, strategy, treeShaking } = shareInfo;
|
|
749
838
|
const scopes = Array.isArray(scope) ? scope : [scope];
|
|
750
839
|
for (const sc of scopes) {
|
|
751
840
|
if (shareConfig && localShareScopeMap[sc] && localShareScopeMap[sc][pkgName]) {
|
|
752
841
|
const { requiredVersion } = shareConfig;
|
|
753
842
|
const findShareFunction = getFindShareFunction(strategy);
|
|
754
|
-
const maxOrSingletonVersion = findShareFunction(localShareScopeMap, sc, pkgName);
|
|
843
|
+
const { version: maxOrSingletonVersion, useTreesShaking } = findShareFunction(localShareScopeMap, sc, pkgName, treeShaking);
|
|
755
844
|
const defaultResolver = () => {
|
|
845
|
+
const shared = localShareScopeMap[sc][pkgName][maxOrSingletonVersion];
|
|
756
846
|
if (shareConfig.singleton) {
|
|
757
847
|
if (typeof requiredVersion === "string" && !satisfy(maxOrSingletonVersion, requiredVersion)) {
|
|
758
|
-
const msg = `Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion &&
|
|
848
|
+
const msg = `Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion && shared.from} of shared singleton module ${pkgName} does not satisfy the requirement of ${shareInfo.from} which needs ${requiredVersion})`;
|
|
759
849
|
if (shareConfig.strictVersion) {
|
|
760
850
|
error(msg);
|
|
761
851
|
} else {
|
|
762
852
|
warn(msg);
|
|
763
853
|
}
|
|
764
854
|
}
|
|
765
|
-
return
|
|
855
|
+
return {
|
|
856
|
+
shared,
|
|
857
|
+
useTreesShaking
|
|
858
|
+
};
|
|
766
859
|
} else {
|
|
767
860
|
if (requiredVersion === false || requiredVersion === "*") {
|
|
768
|
-
return
|
|
861
|
+
return {
|
|
862
|
+
shared,
|
|
863
|
+
useTreesShaking
|
|
864
|
+
};
|
|
769
865
|
}
|
|
770
866
|
if (satisfy(maxOrSingletonVersion, requiredVersion)) {
|
|
771
|
-
return
|
|
867
|
+
return {
|
|
868
|
+
shared,
|
|
869
|
+
useTreesShaking
|
|
870
|
+
};
|
|
871
|
+
}
|
|
872
|
+
const _usedTreeShaking = shouldUseTreeShaking(treeShaking);
|
|
873
|
+
if (_usedTreeShaking) {
|
|
874
|
+
for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])) {
|
|
875
|
+
if (!shouldUseTreeShaking(versionValue.treeShaking, treeShaking == null ? void 0 : treeShaking.usedExports)) {
|
|
876
|
+
continue;
|
|
877
|
+
}
|
|
878
|
+
if (satisfy(versionKey, requiredVersion)) {
|
|
879
|
+
return {
|
|
880
|
+
shared: versionValue,
|
|
881
|
+
useTreesShaking: _usedTreeShaking
|
|
882
|
+
};
|
|
883
|
+
}
|
|
884
|
+
}
|
|
772
885
|
}
|
|
773
886
|
for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])) {
|
|
774
887
|
if (satisfy(versionKey, requiredVersion)) {
|
|
775
|
-
return
|
|
888
|
+
return {
|
|
889
|
+
shared: versionValue,
|
|
890
|
+
useTreesShaking: false
|
|
891
|
+
};
|
|
776
892
|
}
|
|
777
893
|
}
|
|
778
894
|
}
|
|
895
|
+
return;
|
|
779
896
|
};
|
|
780
897
|
const params = {
|
|
781
898
|
shareScopeMap: localShareScopeMap,
|
|
@@ -783,6 +900,7 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
783
900
|
pkgName,
|
|
784
901
|
version: maxOrSingletonVersion,
|
|
785
902
|
GlobalFederation: Global.__FEDERATION__,
|
|
903
|
+
shareInfo,
|
|
786
904
|
resolver: defaultResolver
|
|
787
905
|
};
|
|
788
906
|
const resolveShared = resolveShare.emit(params) || params;
|
package/dist/router-v5.cjs.js
CHANGED
|
@@ -24,6 +24,8 @@ const ReactRouterDom__namespace = /* @__PURE__ */ _interopNamespaceDefault(React
|
|
|
24
24
|
function WraperRouter(props) {
|
|
25
25
|
const { basename, ...propsRes } = props;
|
|
26
26
|
const routerContextProps = React.useContext(index.RouterContext) || {};
|
|
27
|
+
const MemoryRouter = ReactRouterDom__namespace.MemoryRouter;
|
|
28
|
+
const BrowserRouter = ReactRouterDom__namespace.BrowserRouter;
|
|
27
29
|
index.LoggerInstance.debug(`WraperRouter info >>>`, {
|
|
28
30
|
...routerContextProps,
|
|
29
31
|
routerContextProps,
|
|
@@ -31,7 +33,7 @@ function WraperRouter(props) {
|
|
|
31
33
|
});
|
|
32
34
|
if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
|
|
33
35
|
return /* @__PURE__ */ React.createElement(
|
|
34
|
-
|
|
36
|
+
MemoryRouter,
|
|
35
37
|
{
|
|
36
38
|
...props,
|
|
37
39
|
initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
|
|
@@ -39,7 +41,7 @@ function WraperRouter(props) {
|
|
|
39
41
|
);
|
|
40
42
|
}
|
|
41
43
|
return /* @__PURE__ */ React.createElement(
|
|
42
|
-
|
|
44
|
+
BrowserRouter,
|
|
43
45
|
{
|
|
44
46
|
...propsRes,
|
|
45
47
|
basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
|
package/dist/router-v5.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { default as default_2 } from 'react';
|
|
2
|
-
import * as ReactRouterDom from 'react-router-dom/index.js';
|
|
3
2
|
|
|
4
|
-
export declare function BrowserRouter(props:
|
|
3
|
+
export declare function BrowserRouter(props: Record<string, unknown>): default_2.JSX.Element;
|
|
5
4
|
|
|
6
5
|
|
|
7
6
|
export * from "react-router-dom/";
|
package/dist/router-v5.es.js
CHANGED
|
@@ -5,6 +5,8 @@ export * from "react-router-dom/index.js";
|
|
|
5
5
|
function WraperRouter(props) {
|
|
6
6
|
const { basename, ...propsRes } = props;
|
|
7
7
|
const routerContextProps = useContext(RouterContext) || {};
|
|
8
|
+
const MemoryRouter = ReactRouterDom$1.MemoryRouter;
|
|
9
|
+
const BrowserRouter = ReactRouterDom$1.BrowserRouter;
|
|
8
10
|
LoggerInstance.debug(`WraperRouter info >>>`, {
|
|
9
11
|
...routerContextProps,
|
|
10
12
|
routerContextProps,
|
|
@@ -12,7 +14,7 @@ function WraperRouter(props) {
|
|
|
12
14
|
});
|
|
13
15
|
if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
|
|
14
16
|
return /* @__PURE__ */ React__default.createElement(
|
|
15
|
-
|
|
17
|
+
MemoryRouter,
|
|
16
18
|
{
|
|
17
19
|
...props,
|
|
18
20
|
initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
|
|
@@ -20,7 +22,7 @@ function WraperRouter(props) {
|
|
|
20
22
|
);
|
|
21
23
|
}
|
|
22
24
|
return /* @__PURE__ */ React__default.createElement(
|
|
23
|
-
|
|
25
|
+
BrowserRouter,
|
|
24
26
|
{
|
|
25
27
|
...propsRes,
|
|
26
28
|
basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
|
package/dist/router-v7.cjs.js
CHANGED
|
@@ -23,6 +23,8 @@ const ReactRouterDom__namespace = /* @__PURE__ */ _interopNamespaceDefault(React
|
|
|
23
23
|
function WraperRouter(props) {
|
|
24
24
|
const { basename, ...propsRes } = props;
|
|
25
25
|
const routerContextProps = React.useContext(index.RouterContext) || {};
|
|
26
|
+
const MemoryRouter = ReactRouterDom__namespace.MemoryRouter;
|
|
27
|
+
const BrowserRouter = ReactRouterDom__namespace.BrowserRouter;
|
|
26
28
|
index.LoggerInstance.debug(`WraperRouter info >>>`, {
|
|
27
29
|
...routerContextProps,
|
|
28
30
|
routerContextProps,
|
|
@@ -30,7 +32,7 @@ function WraperRouter(props) {
|
|
|
30
32
|
});
|
|
31
33
|
if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
|
|
32
34
|
return /* @__PURE__ */ React.createElement(
|
|
33
|
-
|
|
35
|
+
MemoryRouter,
|
|
34
36
|
{
|
|
35
37
|
...props,
|
|
36
38
|
initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
|
|
@@ -38,7 +40,7 @@ function WraperRouter(props) {
|
|
|
38
40
|
);
|
|
39
41
|
}
|
|
40
42
|
return /* @__PURE__ */ React.createElement(
|
|
41
|
-
|
|
43
|
+
BrowserRouter,
|
|
42
44
|
{
|
|
43
45
|
...propsRes,
|
|
44
46
|
basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
|
package/dist/router-v7.d.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { default as default_2 } from 'react';
|
|
2
|
-
import * as ReactRouterDom from 'react-router';
|
|
3
2
|
|
|
4
|
-
export declare function BrowserRouter(props:
|
|
3
|
+
export declare function BrowserRouter(props: Record<string, unknown>): default_2.JSX.Element;
|
|
5
4
|
|
|
6
|
-
export declare function RouterProvider(props:
|
|
5
|
+
export declare function RouterProvider(props: Record<string, unknown>): default_2.JSX.Element;
|
|
7
6
|
|
|
8
7
|
|
|
9
8
|
export * from "react-router";
|
package/dist/router-v7.es.js
CHANGED
|
@@ -5,6 +5,8 @@ import { R as RouterContext, L as LoggerInstance } from "./index-DyQNwY2M.mjs";
|
|
|
5
5
|
function WraperRouter(props) {
|
|
6
6
|
const { basename, ...propsRes } = props;
|
|
7
7
|
const routerContextProps = useContext(RouterContext) || {};
|
|
8
|
+
const MemoryRouter = ReactRouterDom.MemoryRouter;
|
|
9
|
+
const BrowserRouter = ReactRouterDom.BrowserRouter;
|
|
8
10
|
LoggerInstance.debug(`WraperRouter info >>>`, {
|
|
9
11
|
...routerContextProps,
|
|
10
12
|
routerContextProps,
|
|
@@ -12,7 +14,7 @@ function WraperRouter(props) {
|
|
|
12
14
|
});
|
|
13
15
|
if (routerContextProps == null ? void 0 : routerContextProps.memoryRoute) {
|
|
14
16
|
return /* @__PURE__ */ React__default.createElement(
|
|
15
|
-
|
|
17
|
+
MemoryRouter,
|
|
16
18
|
{
|
|
17
19
|
...props,
|
|
18
20
|
initialEntries: [routerContextProps == null ? void 0 : routerContextProps.memoryRoute.entryPath]
|
|
@@ -20,7 +22,7 @@ function WraperRouter(props) {
|
|
|
20
22
|
);
|
|
21
23
|
}
|
|
22
24
|
return /* @__PURE__ */ React__default.createElement(
|
|
23
|
-
|
|
25
|
+
BrowserRouter,
|
|
24
26
|
{
|
|
25
27
|
...propsRes,
|
|
26
28
|
basename: (routerContextProps == null ? void 0 : routerContextProps.basename) || basename
|
|
@@ -1976,21 +1976,21 @@ function getLoadedRemoteInfos(id, instance) {
|
|
|
1976
1976
|
}
|
|
1977
1977
|
export {
|
|
1978
1978
|
DOWNGRADE_KEY as A,
|
|
1979
|
-
|
|
1979
|
+
callAllDowngrade as B,
|
|
1980
1980
|
CacheSize as C,
|
|
1981
1981
|
DATA_FETCH_QUERY as D,
|
|
1982
1982
|
ERROR_TYPE as E,
|
|
1983
1983
|
FS_HREF as F,
|
|
1984
|
-
|
|
1985
|
-
|
|
1986
|
-
|
|
1987
|
-
|
|
1984
|
+
callDowngrade as G,
|
|
1985
|
+
getDowngradeTag as H,
|
|
1986
|
+
flushDataFetch as I,
|
|
1987
|
+
getDataFetchCache as J,
|
|
1988
1988
|
LOAD_REMOTE_ERROR_PREFIX as L,
|
|
1989
1989
|
MF_DATA_FETCH_STATUS as M,
|
|
1990
1990
|
CacheTime as a,
|
|
1991
|
-
|
|
1992
|
-
|
|
1993
|
-
|
|
1991
|
+
clearStore as b,
|
|
1992
|
+
cache as c,
|
|
1993
|
+
configureCache as d,
|
|
1994
1994
|
getDataFetchMap as e,
|
|
1995
1995
|
fetchData as f,
|
|
1996
1996
|
generateKey as g,
|
package/dist/v18.cjs.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
3
|
const client = require("react-dom/client");
|
|
4
|
-
const bridgeBase = require("./bridge-base-
|
|
4
|
+
const bridgeBase = require("./bridge-base-1Grpgans.js");
|
|
5
5
|
function createReact18Root(container, options) {
|
|
6
6
|
return client.createRoot(container, options);
|
|
7
7
|
}
|
package/dist/v18.es.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createRoot } from "react-dom/client";
|
|
2
|
-
import { c as createBaseBridgeComponent } from "./bridge-base-
|
|
2
|
+
import { c as createBaseBridgeComponent } from "./bridge-base-CIgEZf8X.mjs";
|
|
3
3
|
function createReact18Root(container, options) {
|
|
4
4
|
return createRoot(container, options);
|
|
5
5
|
}
|
package/dist/v19.cjs.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
3
|
const client = require("react-dom/client");
|
|
4
|
-
const bridgeBase = require("./bridge-base-
|
|
4
|
+
const bridgeBase = require("./bridge-base-1Grpgans.js");
|
|
5
5
|
function createReact19Root(container, options) {
|
|
6
6
|
return client.createRoot(container, options);
|
|
7
7
|
}
|
package/dist/v19.es.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createRoot } from "react-dom/client";
|
|
2
|
-
import { c as createBaseBridgeComponent } from "./bridge-base-
|
|
2
|
+
import { c as createBaseBridgeComponent } from "./bridge-base-CIgEZf8X.mjs";
|
|
3
3
|
function createReact19Root(container, options) {
|
|
4
4
|
return createRoot(container, options);
|
|
5
5
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/bridge-react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.24.0",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -129,8 +129,8 @@
|
|
|
129
129
|
"dependencies": {
|
|
130
130
|
"react-error-boundary": "^4.1.2",
|
|
131
131
|
"lru-cache": "^10.4.3",
|
|
132
|
-
"@module-federation/
|
|
133
|
-
"@module-federation/
|
|
132
|
+
"@module-federation/bridge-shared": "0.24.0",
|
|
133
|
+
"@module-federation/sdk": "0.24.0"
|
|
134
134
|
},
|
|
135
135
|
"peerDependencies": {
|
|
136
136
|
"react": ">=16.9.0",
|
|
@@ -156,14 +156,14 @@
|
|
|
156
156
|
"@vitejs/plugin-vue-jsx": "^4.0.0",
|
|
157
157
|
"react": "18.3.1",
|
|
158
158
|
"react-dom": "18.3.1",
|
|
159
|
-
"react-router-dom": "6.
|
|
160
|
-
"react-router": "7.
|
|
159
|
+
"react-router-dom": "6.30.2",
|
|
160
|
+
"react-router": "7.12.0",
|
|
161
161
|
"typescript": "^5.2.2",
|
|
162
162
|
"vite": "^5.4.21",
|
|
163
163
|
"vite-plugin-dts": "^4.3.0",
|
|
164
|
-
"hono": "4.
|
|
165
|
-
"@module-federation/runtime": "0.
|
|
166
|
-
"@module-federation/runtime-core": "0.
|
|
164
|
+
"hono": "4.11.7",
|
|
165
|
+
"@module-federation/runtime": "0.24.0",
|
|
166
|
+
"@module-federation/runtime-core": "0.24.0"
|
|
167
167
|
},
|
|
168
168
|
"scripts": {
|
|
169
169
|
"dev": "vite",
|
|
@@ -50,6 +50,9 @@ export function createBaseBridgeComponent<T>({
|
|
|
50
50
|
</div>
|
|
51
51
|
);
|
|
52
52
|
|
|
53
|
+
const ErrorBoundaryComponent =
|
|
54
|
+
ErrorBoundary as unknown as React.ComponentType<any>;
|
|
55
|
+
|
|
53
56
|
const BridgeWrapper = ({
|
|
54
57
|
basename,
|
|
55
58
|
moduleName,
|
|
@@ -63,7 +66,7 @@ export function createBaseBridgeComponent<T>({
|
|
|
63
66
|
propsInfo: T;
|
|
64
67
|
fallback?: React.ComponentType<FallbackProps>;
|
|
65
68
|
}) => (
|
|
66
|
-
<
|
|
69
|
+
<ErrorBoundaryComponent FallbackComponent={fallback || DefaultFallback}>
|
|
67
70
|
<RawComponent
|
|
68
71
|
appInfo={{
|
|
69
72
|
moduleName,
|
|
@@ -72,7 +75,7 @@ export function createBaseBridgeComponent<T>({
|
|
|
72
75
|
}}
|
|
73
76
|
propsInfo={propsInfo}
|
|
74
77
|
/>
|
|
75
|
-
</
|
|
78
|
+
</ErrorBoundaryComponent>
|
|
76
79
|
);
|
|
77
80
|
|
|
78
81
|
return {
|
|
@@ -91,6 +91,8 @@ export function createLazyRemoteComponentFactory(
|
|
|
91
91
|
export function createRemoteAppComponentFactory(
|
|
92
92
|
RemoteApp: React.ComponentType<any>,
|
|
93
93
|
) {
|
|
94
|
+
const ErrorBoundaryComponent =
|
|
95
|
+
ErrorBoundary as unknown as React.ComponentType<any>;
|
|
94
96
|
const createLazyRemoteComponent = createLazyRemoteComponentFactory(RemoteApp);
|
|
95
97
|
|
|
96
98
|
return function createRemoteAppComponent<
|
|
@@ -100,7 +102,7 @@ export function createRemoteAppComponentFactory(
|
|
|
100
102
|
const LazyComponent = createLazyRemoteComponent(info);
|
|
101
103
|
return forwardRef<HTMLDivElement, RemoteComponentProps>((props, ref) => {
|
|
102
104
|
return (
|
|
103
|
-
<
|
|
105
|
+
<ErrorBoundaryComponent
|
|
104
106
|
FallbackComponent={
|
|
105
107
|
info.fallback as React.ComponentType<FallbackProps>
|
|
106
108
|
}
|
|
@@ -108,7 +110,7 @@ export function createRemoteAppComponentFactory(
|
|
|
108
110
|
<React.Suspense fallback={info.loading}>
|
|
109
111
|
<LazyComponent {...props} ref={ref} />
|
|
110
112
|
</React.Suspense>
|
|
111
|
-
</
|
|
113
|
+
</ErrorBoundaryComponent>
|
|
112
114
|
);
|
|
113
115
|
});
|
|
114
116
|
};
|
package/src/router/v5.tsx
CHANGED
|
@@ -5,13 +5,13 @@ import * as ReactRouterDom from 'react-router-dom/index.js';
|
|
|
5
5
|
import { RouterContext } from '../provider/context';
|
|
6
6
|
import { LoggerInstance } from '../utils';
|
|
7
7
|
|
|
8
|
-
function WraperRouter(
|
|
9
|
-
props:
|
|
10
|
-
| Parameters<typeof ReactRouterDom.BrowserRouter>[0]
|
|
11
|
-
| Parameters<typeof ReactRouterDom.MemoryRouter>[0],
|
|
12
|
-
) {
|
|
8
|
+
function WraperRouter(props: Record<string, unknown>) {
|
|
13
9
|
const { basename, ...propsRes } = props;
|
|
14
10
|
const routerContextProps = useContext(RouterContext) || {};
|
|
11
|
+
const MemoryRouter =
|
|
12
|
+
ReactRouterDom.MemoryRouter as unknown as React.ComponentType<any>;
|
|
13
|
+
const BrowserRouter =
|
|
14
|
+
ReactRouterDom.BrowserRouter as unknown as React.ComponentType<any>;
|
|
15
15
|
|
|
16
16
|
LoggerInstance.debug(`WraperRouter info >>>`, {
|
|
17
17
|
...routerContextProps,
|
|
@@ -21,14 +21,14 @@ function WraperRouter(
|
|
|
21
21
|
|
|
22
22
|
if (routerContextProps?.memoryRoute) {
|
|
23
23
|
return (
|
|
24
|
-
<
|
|
24
|
+
<MemoryRouter
|
|
25
25
|
{...props}
|
|
26
26
|
initialEntries={[routerContextProps?.memoryRoute.entryPath]}
|
|
27
27
|
/>
|
|
28
28
|
);
|
|
29
29
|
}
|
|
30
30
|
return (
|
|
31
|
-
<
|
|
31
|
+
<BrowserRouter
|
|
32
32
|
{...propsRes}
|
|
33
33
|
basename={routerContextProps?.basename || basename}
|
|
34
34
|
/>
|
package/src/router/v7.tsx
CHANGED
|
@@ -5,13 +5,13 @@ import * as ReactRouterDom from 'react-router';
|
|
|
5
5
|
import { RouterContext } from '../provider/context';
|
|
6
6
|
import { LoggerInstance } from '../utils';
|
|
7
7
|
|
|
8
|
-
function WraperRouter(
|
|
9
|
-
props:
|
|
10
|
-
| Parameters<typeof ReactRouterDom.BrowserRouter>[0]
|
|
11
|
-
| Parameters<typeof ReactRouterDom.MemoryRouter>[0],
|
|
12
|
-
) {
|
|
8
|
+
function WraperRouter(props: Record<string, unknown>) {
|
|
13
9
|
const { basename, ...propsRes } = props;
|
|
14
10
|
const routerContextProps = useContext(RouterContext) || {};
|
|
11
|
+
const MemoryRouter =
|
|
12
|
+
ReactRouterDom.MemoryRouter as unknown as React.ComponentType<any>;
|
|
13
|
+
const BrowserRouter =
|
|
14
|
+
ReactRouterDom.BrowserRouter as unknown as React.ComponentType<any>;
|
|
15
15
|
|
|
16
16
|
LoggerInstance.debug(`WraperRouter info >>>`, {
|
|
17
17
|
...routerContextProps,
|
|
@@ -21,24 +21,22 @@ function WraperRouter(
|
|
|
21
21
|
|
|
22
22
|
if (routerContextProps?.memoryRoute) {
|
|
23
23
|
return (
|
|
24
|
-
<
|
|
24
|
+
<MemoryRouter
|
|
25
25
|
{...props}
|
|
26
26
|
initialEntries={[routerContextProps?.memoryRoute.entryPath]}
|
|
27
27
|
/>
|
|
28
28
|
);
|
|
29
29
|
}
|
|
30
30
|
return (
|
|
31
|
-
<
|
|
31
|
+
<BrowserRouter
|
|
32
32
|
{...propsRes}
|
|
33
33
|
basename={routerContextProps?.basename || basename}
|
|
34
34
|
/>
|
|
35
35
|
);
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
function WraperRouterProvider(
|
|
39
|
-
props:
|
|
40
|
-
) {
|
|
41
|
-
const { router, ...propsRes } = props;
|
|
38
|
+
function WraperRouterProvider(props: Record<string, unknown>) {
|
|
39
|
+
const { router, ...propsRes } = props as { router: any };
|
|
42
40
|
const routerContextProps = useContext(RouterContext) || {};
|
|
43
41
|
const routers = router.routes;
|
|
44
42
|
LoggerInstance.debug(`WraperRouterProvider info >>>`, {
|
|
@@ -47,7 +45,9 @@ function WraperRouterProvider(
|
|
|
47
45
|
WraperRouterProviderProps: props,
|
|
48
46
|
router,
|
|
49
47
|
});
|
|
50
|
-
const RouterProvider = (ReactRouterDom as any)[
|
|
48
|
+
const RouterProvider = (ReactRouterDom as any)[
|
|
49
|
+
'Router' + 'Provider'
|
|
50
|
+
] as React.ComponentType<any>;
|
|
51
51
|
const createMemoryRouter = (ReactRouterDom as any)['create' + 'MemoryRouter'];
|
|
52
52
|
const createBrowserRouter = (ReactRouterDom as any)[
|
|
53
53
|
'create' + 'BrowserRouter'
|