@module-federation/utilities 1.4.0 → 1.5.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 +13 -0
- package/README.md +4 -15
- package/package.json +1 -1
- package/src/Logger.js +1 -2
- package/src/Logger.js.map +1 -1
- package/src/utils/common.js +20 -16
- package/src/utils/common.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [1.5.0](https://github.com/module-federation/nextjs-mf/compare/utils-1.4.1...utils-1.5.0) (2023-04-09)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* Allow Container Utils to work Server Side ([#723](https://github.com/module-federation/nextjs-mf/issues/723)) ([232ba24](https://github.com/module-federation/nextjs-mf/commit/232ba24072f19bd32d1f745d4edf1518e548df50))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [1.4.1](https://github.com/module-federation/nextjs-mf/compare/utils-1.4.0...utils-1.4.1) (2023-04-05)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
5
18
|
# [1.4.0](https://github.com/module-federation/nextjs-mf/compare/utils-1.3.0...utils-1.4.0) (2023-03-14)
|
|
6
19
|
|
|
7
20
|
|
package/README.md
CHANGED
|
@@ -29,18 +29,11 @@ import { FederationBoundary } from '@module-federation/utilities/src/utils/react
|
|
|
29
29
|
|
|
30
30
|
// defining dynamicImport and fallback outside the Component to keep the component identity
|
|
31
31
|
// another alternative would be to use useMemo
|
|
32
|
-
const dynamicImport = () =>
|
|
33
|
-
import('some_remote_host_name').then((m) => m.Component);
|
|
32
|
+
const dynamicImport = () => import('some_remote_host_name').then((m) => m.Component);
|
|
34
33
|
const fallback = () => import('@npm/backup').then((m) => m.Component);
|
|
35
34
|
|
|
36
35
|
const MyPage = () => {
|
|
37
|
-
return
|
|
38
|
-
<FederationBoundary
|
|
39
|
-
dynamicImporter={dynamicImport}
|
|
40
|
-
fallback={fallback}
|
|
41
|
-
customBoundary={CustomErrorBoundary}
|
|
42
|
-
/>
|
|
43
|
-
);
|
|
36
|
+
return <FederationBoundary dynamicImporter={dynamicImport} fallback={fallback} customBoundary={CustomErrorBoundary} />;
|
|
44
37
|
};
|
|
45
38
|
```
|
|
46
39
|
|
|
@@ -73,9 +66,7 @@ importRemote({
|
|
|
73
66
|
);
|
|
74
67
|
|
|
75
68
|
// If Bar is a React component you can use it with lazy and Suspense just like a dynamic import:
|
|
76
|
-
const Bar = lazy(() =>
|
|
77
|
-
importRemote({ url: 'http://localhost:3001', scope: 'Foo', module: 'Bar' })
|
|
78
|
-
);
|
|
69
|
+
const Bar = lazy(() => importRemote({ url: 'http://localhost:3001', scope: 'Foo', module: 'Bar' }));
|
|
79
70
|
|
|
80
71
|
return (
|
|
81
72
|
<Suspense fallback={<div>Loading Bar...</div>}>
|
|
@@ -130,9 +121,7 @@ const dynamicImporter = () =>
|
|
|
130
121
|
const fallback = () => import('@npm/backup').then((m) => m.Component);
|
|
131
122
|
|
|
132
123
|
const Bar = () => {
|
|
133
|
-
return
|
|
134
|
-
<FederationBoundary dynamicImporter={dynamicImporter} fallback={fallback} />
|
|
135
|
-
);
|
|
124
|
+
return <FederationBoundary dynamicImporter={dynamicImporter} fallback={fallback} />;
|
|
136
125
|
};
|
|
137
126
|
```
|
|
138
127
|
|
package/package.json
CHANGED
package/src/Logger.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = void 0;
|
|
4
|
-
var Logger = /** @class */ (function () {
|
|
4
|
+
var Logger = exports.Logger = /** @class */ (function () {
|
|
5
5
|
function Logger() {
|
|
6
6
|
}
|
|
7
7
|
Logger.getLogger = function () {
|
|
@@ -14,5 +14,4 @@ var Logger = /** @class */ (function () {
|
|
|
14
14
|
Logger.loggerInstance = console;
|
|
15
15
|
return Logger;
|
|
16
16
|
}());
|
|
17
|
-
exports.Logger = Logger;
|
|
18
17
|
//# sourceMappingURL=Logger.js.map
|
package/src/Logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../packages/utilities/src/Logger.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAWA,CAAC;IARQ,gBAAS,GAAhB;QACE,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEM,gBAAS,GAAhB,UAAiB,MAA6B;QAC5C,IAAI,CAAC,cAAc,GAAG,MAAM,IAAI,OAAO,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IATc,qBAAc,GAAmB,OAAO,CAAC;IAU1D,aAAC;CAAA,AAXD,IAWC
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../packages/utilities/src/Logger.ts"],"names":[],"mappings":";;;AAIA;IAAA;IAWA,CAAC;IARQ,gBAAS,GAAhB;QACE,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAEM,gBAAS,GAAhB,UAAiB,MAA6B;QAC5C,IAAI,CAAC,cAAc,GAAG,MAAM,IAAI,OAAO,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IATc,qBAAc,GAAmB,OAAO,CAAC;IAU1D,aAAC;CAAA,AAXD,IAWC"}
|
package/src/utils/common.js
CHANGED
|
@@ -29,6 +29,7 @@ var getRuntimeRemotes = function () {
|
|
|
29
29
|
}
|
|
30
30
|
// if its a delegate module, skip it
|
|
31
31
|
else if (typeof value === 'string' && value.startsWith('internal ')) {
|
|
32
|
+
// do nothing to internal modules
|
|
32
33
|
}
|
|
33
34
|
// if its just a string (global@url)
|
|
34
35
|
else if (typeof value === 'string') {
|
|
@@ -128,28 +129,28 @@ var loadScript = function (keyOrRuntimeRemoteItem) {
|
|
|
128
129
|
? reference.uniqueKey
|
|
129
130
|
: remoteGlobal_1;
|
|
130
131
|
var __webpack_error__1 = new Error();
|
|
131
|
-
|
|
132
|
+
// @ts-ignore
|
|
132
133
|
if (!global.__remote_scope__) {
|
|
133
134
|
// create a global scope for container, similar to how remotes are set on window in the browser
|
|
134
|
-
|
|
135
|
+
// @ts-ignore
|
|
135
136
|
global.__remote_scope__ = {
|
|
137
|
+
// @ts-ignore
|
|
136
138
|
_config: {},
|
|
137
139
|
};
|
|
138
140
|
}
|
|
139
141
|
var globalScope_1 =
|
|
140
|
-
|
|
141
|
-
typeof window !== 'undefined' ? window : global.__remote_scope__;
|
|
142
|
+
// @ts-ignore
|
|
143
|
+
typeof window !== 'undefined' ? window : global.__remote_scope__;
|
|
142
144
|
if (typeof window === 'undefined') {
|
|
143
|
-
|
|
144
|
-
globalScope_1._config[containerKey_1] = reference.url;
|
|
145
|
+
globalScope_1['_config'][containerKey_1] = reference.url;
|
|
145
146
|
}
|
|
146
147
|
else {
|
|
147
148
|
// to match promise template system, can be removed once promise template is gone
|
|
148
|
-
if (!globalScope_1
|
|
149
|
-
globalScope_1
|
|
149
|
+
if (!globalScope_1['remoteLoading']) {
|
|
150
|
+
globalScope_1['remoteLoading'] = {};
|
|
150
151
|
}
|
|
151
|
-
if (globalScope_1
|
|
152
|
-
return globalScope_1
|
|
152
|
+
if (globalScope_1['remoteLoading'][containerKey_1]) {
|
|
153
|
+
return globalScope_1['remoteLoading'][containerKey_1];
|
|
153
154
|
}
|
|
154
155
|
}
|
|
155
156
|
asyncContainer = new Promise(function (resolve, reject) {
|
|
@@ -181,7 +182,7 @@ var loadScript = function (keyOrRuntimeRemoteItem) {
|
|
|
181
182
|
}, containerKey_1);
|
|
182
183
|
});
|
|
183
184
|
if (typeof window !== 'undefined') {
|
|
184
|
-
globalScope_1
|
|
185
|
+
globalScope_1['remoteLoading'][containerKey_1] = asyncContainer;
|
|
185
186
|
}
|
|
186
187
|
}
|
|
187
188
|
return asyncContainer;
|
|
@@ -254,22 +255,25 @@ exports.createRuntimeVariables = createRuntimeVariables;
|
|
|
254
255
|
* If its' script does not loaded - then load & init it firstly.
|
|
255
256
|
*/
|
|
256
257
|
var getContainer = function (remoteContainer) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
257
|
-
var uniqueKey, container;
|
|
258
|
+
var containerScope, uniqueKey, container;
|
|
258
259
|
return tslib_1.__generator(this, function (_a) {
|
|
259
260
|
switch (_a.label) {
|
|
260
261
|
case 0:
|
|
261
262
|
if (!remoteContainer) {
|
|
262
263
|
throw Error("Remote container options is empty");
|
|
263
264
|
}
|
|
265
|
+
containerScope =
|
|
266
|
+
//@ts-ignore
|
|
267
|
+
typeof window !== 'undefined' ? window : global.__remote_scope__;
|
|
264
268
|
if (!(typeof remoteContainer === 'string')) return [3 /*break*/, 1];
|
|
265
|
-
if (
|
|
266
|
-
return [2 /*return*/,
|
|
269
|
+
if (containerScope[remoteContainer]) {
|
|
270
|
+
return [2 /*return*/, containerScope[remoteContainer]];
|
|
267
271
|
}
|
|
268
272
|
return [2 /*return*/];
|
|
269
273
|
case 1:
|
|
270
274
|
uniqueKey = remoteContainer.uniqueKey;
|
|
271
|
-
if (
|
|
272
|
-
return [2 /*return*/,
|
|
275
|
+
if (containerScope[uniqueKey]) {
|
|
276
|
+
return [2 /*return*/, containerScope[uniqueKey]];
|
|
273
277
|
}
|
|
274
278
|
return [4 /*yield*/, (0, exports.injectScript)({
|
|
275
279
|
global: remoteContainer.global,
|
package/src/utils/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/common.ts"],"names":[],"mappings":";AAAA,sDAAsD;;;;AAmBtD,yCAAyC;AAClC,IAAM,mBAAmB,GAAG,UAAC,YAAoB;IACtD,IAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,KAAK,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,4BAAoB,YAAY,OAAG,CAAC,CAAC;KACtD;IACD,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEF,IAAM,iBAAiB,GAAG;IACxB,IAAI;QACF,YAAY;QACZ,IAAM,UAAU,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAe,CAAC;QAE7D,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,UACvD,GAAG,EACH,IAAI;YAEG,IAAA,GAAG,GAAW,IAAI,GAAf,EAAE,KAAK,GAAI,IAAI,GAAR,CAAS;YAC1B,gEAAgE;YAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;gBACjE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;aACtC;YACD,oEAAoE;iBAC/D,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gBACpC,aAAa;gBACb,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;aACtC;YACD,oCAAoC;iBAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/common.ts"],"names":[],"mappings":"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"}
|