@module-federation/nextjs-mf 6.0.5 → 6.0.7
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 +28 -0
- package/README.md +1 -1
- package/client/MFClient.d.ts +3 -3
- package/client/RemoteContainer.js +5 -5
- package/client/RemoteContainer.js.map +1 -1
- package/client/RemotePages.d.ts +3 -3
- package/client/useMFClient.d.ts +1 -1
- package/client/useMFRemote.d.ts +1 -1
- package/package.json +11 -10
- package/src/internal.js +27 -5
- package/src/internal.js.map +1 -1
- package/src/loaders/fixImageLoader.js +2 -1
- package/src/loaders/fixImageLoader.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,34 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [6.0.7](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.0.6...nextjs-mf-6.0.7) (2023-02-02)
|
|
6
|
+
|
|
7
|
+
### Dependency Updates
|
|
8
|
+
|
|
9
|
+
* `node` updated to version `0.10.4`
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
## [6.0.7](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.0.6...nextjs-mf-6.0.7) (2023-02-02)
|
|
13
|
+
|
|
14
|
+
### Dependency Updates
|
|
15
|
+
|
|
16
|
+
* `node` updated to version `0.10.5`
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
## [6.0.6](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.0.5...nextjs-mf-6.0.6) (2023-01-31)
|
|
20
|
+
|
|
21
|
+
### Dependency Updates
|
|
22
|
+
|
|
23
|
+
* `node` updated to version `0.10.3`
|
|
24
|
+
* `utils` updated to version `1.2.0`
|
|
25
|
+
|
|
26
|
+
### Bug Fixes
|
|
27
|
+
|
|
28
|
+
* **deps:** update dependency eventemitter3 to v5 ([#539](https://github.com/module-federation/nextjs-mf/issues/539)) ([f2d634a](https://github.com/module-federation/nextjs-mf/commit/f2d634ab0f186467120acaac662a13dbeaf3e56e))
|
|
29
|
+
* getOutputPath to find if endsWith server ([#555](https://github.com/module-federation/nextjs-mf/issues/555)) ([d5386c4](https://github.com/module-federation/nextjs-mf/commit/d5386c475bc53a28e2348d10d8280714560ccc4b))
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
5
33
|
## [6.0.5](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.0.4...nextjs-mf-6.0.5) (2023-01-21)
|
|
6
34
|
|
|
7
35
|
### Dependency Updates
|
package/README.md
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<div align="center">
|
|
2
2
|
<!-- for version -->
|
|
3
3
|
<img src="https://img.shields.io/npm/v/@module-federation/nextjs-mf" alt="version" >
|
|
4
|
-
<img src="https://img.shields.io/
|
|
4
|
+
<img src="https://img.shields.io/npm/l/@module-federation/nextjs-mf.svg?" alt="license" >
|
|
5
5
|
<!-- for downloads -->
|
|
6
6
|
<img src="https://img.shields.io/npm/dt/@module-federation/nextjs-mf" alt="downloads">
|
|
7
7
|
</div>
|
package/client/MFClient.d.ts
CHANGED
|
@@ -3,10 +3,10 @@ import EventEmitter from 'eventemitter3';
|
|
|
3
3
|
import { CombinedPages } from './CombinedPages';
|
|
4
4
|
import { RemotePages } from './RemotePages';
|
|
5
5
|
import { RemoteContainer } from './RemoteContainer';
|
|
6
|
-
|
|
6
|
+
type EventTypes = 'loadedRemoteRoute' | 'loadedLocalRoute';
|
|
7
7
|
/** Remote Container string eg `home@https://example.com/_next/static/chunks/remoteEntry.js` */
|
|
8
|
-
export
|
|
9
|
-
export
|
|
8
|
+
export type RemoteString = string;
|
|
9
|
+
export type MFClientOptions = {
|
|
10
10
|
mode: 'production' | 'development';
|
|
11
11
|
};
|
|
12
12
|
/**
|
|
@@ -10,11 +10,6 @@ const utils_1 = require("../utils");
|
|
|
10
10
|
* It provides the ability to register remote, and load & init it on the first use.
|
|
11
11
|
*/
|
|
12
12
|
class RemoteContainer {
|
|
13
|
-
constructor(opts) {
|
|
14
|
-
this.global = opts.global;
|
|
15
|
-
this.url = opts.url;
|
|
16
|
-
this.events = new eventemitter3_1.default();
|
|
17
|
-
}
|
|
18
13
|
/**
|
|
19
14
|
* Create or reuse existed remote entry.
|
|
20
15
|
*
|
|
@@ -45,6 +40,11 @@ class RemoteContainer {
|
|
|
45
40
|
}
|
|
46
41
|
return container;
|
|
47
42
|
}
|
|
43
|
+
constructor(opts) {
|
|
44
|
+
this.global = opts.global;
|
|
45
|
+
this.url = opts.url;
|
|
46
|
+
this.events = new eventemitter3_1.default();
|
|
47
|
+
}
|
|
48
48
|
/**
|
|
49
49
|
* Check is the current remoteEntry.js loaded or not
|
|
50
50
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteContainer.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/client/RemoteContainer.ts"],"names":[],"mappings":";;;;AAOA,0EAAyC;AAEzC,oCAAwC;AAExC;;;;GAIG;AACH,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"RemoteContainer.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/client/RemoteContainer.ts"],"names":[],"mappings":"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"}
|
package/client/RemotePages.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { PageMap } from '@module-federation/utilities';
|
|
2
2
|
import { RemoteContainer } from './RemoteContainer';
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
3
|
+
export type PathPrefix = string;
|
|
4
|
+
export type RemoteToRoutes = Map<RemoteContainer, PathPrefix | PathPrefix[]>;
|
|
5
|
+
export type RouteInfo = {
|
|
6
6
|
component: any;
|
|
7
7
|
exports: any;
|
|
8
8
|
styles: string[];
|
package/client/useMFClient.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { MFClient } from './MFClient';
|
|
2
2
|
import type { RemoteContainer } from './RemoteContainer';
|
|
3
|
-
export
|
|
3
|
+
export type MFClientHookOptions = {
|
|
4
4
|
/**
|
|
5
5
|
* This callback will be called when user switches to federated page
|
|
6
6
|
* - as a first arg you will receive RemoteContainer
|
package/client/useMFRemote.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/nextjs-mf",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.0.7",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -16,20 +16,21 @@
|
|
|
16
16
|
"registry": "https://registry.npmjs.org/"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"
|
|
20
|
-
"webpack-sources": "^3.2.3",
|
|
21
|
-
"eventemitter3": "^4.0.7",
|
|
22
|
-
"@module-federation/node": "0.10.2",
|
|
23
|
-
"@module-federation/utilities": "1.1.2",
|
|
24
|
-
"node-fetch": "2.6.7",
|
|
25
|
-
"styled-jsx": "5.1.1",
|
|
19
|
+
"@module-federation/node": "0.10.1",
|
|
26
20
|
"@swc/core": "1.3.26",
|
|
21
|
+
"eventemitter3": "4.0.7",
|
|
22
|
+
"fast-glob": "3.2.12",
|
|
23
|
+
"styled-jsx": "5.1.1",
|
|
24
|
+
"webpack-sources": "3.2.3",
|
|
25
|
+
"@module-federation/utilities": "1.2.0",
|
|
26
|
+
"node-fetch": "2.6.7",
|
|
27
|
+
"encoding": "0.1.13",
|
|
27
28
|
"tslib": "2.4.0"
|
|
28
29
|
},
|
|
29
30
|
"peerDependencies": {
|
|
30
|
-
"webpack": "^5.40.0",
|
|
31
31
|
"next": "^12 || ^13",
|
|
32
32
|
"react": "^17 || ^18",
|
|
33
|
-
"react-dom": "^17 || ^18"
|
|
33
|
+
"react-dom": "^17 || ^18",
|
|
34
|
+
"webpack": "^5.40.0"
|
|
34
35
|
}
|
|
35
36
|
}
|
package/src/internal.js
CHANGED
|
@@ -83,11 +83,32 @@ const generateRemoteTemplate = (url, global) => `new Promise(function (resolve,
|
|
|
83
83
|
var url = new URL(${JSON.stringify(url)});
|
|
84
84
|
url.searchParams.set('t', Date.now());
|
|
85
85
|
var __webpack_error__ = new Error();
|
|
86
|
-
if
|
|
87
|
-
|
|
86
|
+
if(!window.remoteLoading) {
|
|
87
|
+
window.remoteLoading = {};
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
if(window.remoteLoading[${JSON.stringify(global)}]) {
|
|
91
|
+
return window.remoteLoading[${JSON.stringify(global)}].then(resolve).catch(reject);
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
var res, rej;
|
|
95
|
+
window.remoteLoading[${JSON.stringify(global)}] = new Promise(function(rs,rj){
|
|
96
|
+
res = rs;
|
|
97
|
+
rej = rj;
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
if (typeof window[${JSON.stringify(global)}] !== 'undefined') {
|
|
101
|
+
res();
|
|
102
|
+
return resolve();
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
__webpack_require__.l(
|
|
88
106
|
url.href,
|
|
89
107
|
function (event) {
|
|
90
|
-
if (typeof ${global} !== 'undefined')
|
|
108
|
+
if (typeof window[${JSON.stringify(global)}] !== 'undefined') {
|
|
109
|
+
res();
|
|
110
|
+
return resolve();
|
|
111
|
+
}
|
|
91
112
|
var errorType = event && (event.type === 'load' ? 'missing' : event.type);
|
|
92
113
|
var realSrc = event && event.target && event.target.src;
|
|
93
114
|
__webpack_error__.message =
|
|
@@ -95,9 +116,10 @@ const generateRemoteTemplate = (url, global) => `new Promise(function (resolve,
|
|
|
95
116
|
__webpack_error__.name = 'ScriptExternalLoadError';
|
|
96
117
|
__webpack_error__.type = errorType;
|
|
97
118
|
__webpack_error__.request = realSrc;
|
|
119
|
+
rej(__webpack_error__);
|
|
98
120
|
reject(__webpack_error__);
|
|
99
121
|
},
|
|
100
|
-
${JSON.stringify(global)}
|
|
122
|
+
${JSON.stringify(global)}
|
|
101
123
|
);
|
|
102
124
|
}).then(function () {
|
|
103
125
|
const proxy = {
|
|
@@ -184,7 +206,7 @@ exports.externalizedShares = Object.entries(exports.DEFAULT_SHARE_SCOPE).reduce(
|
|
|
184
206
|
const getOutputPath = (compiler) => {
|
|
185
207
|
const isServer = compiler.options.target !== 'client';
|
|
186
208
|
let outputPath = compiler.options.output.path?.split(path_1.default.sep);
|
|
187
|
-
const foundIndex = outputPath?.
|
|
209
|
+
const foundIndex = outputPath?.lastIndexOf(isServer ? 'server' : 'static');
|
|
188
210
|
outputPath = outputPath
|
|
189
211
|
?.slice(0, foundIndex && foundIndex > 0 ? foundIndex : outputPath.length)
|
|
190
212
|
.join(path_1.default.sep);
|
package/src/internal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/src/internal.ts"],"names":[],"mappings":";;;;AAQA,wDAAwB;AAExB,qDAA8D;AAC9D,2DAA6D;AAE7D,4DAAmE;AAEnE,uCAAuC;AACvC,0GAA0G;AAC1G,wFAAwF;AAC3E,QAAA,mBAAmB,GAAiB;IAC/C,KAAK,EAAE;QACL,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,KAAK;KACvB;IACD,mBAAmB,EAAE;QACnB,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,KAAK;KACvB;IACD,WAAW,EAAE;QACX,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,KAAK;KACvB;IACD,cAAc,EAAE;QACd,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;IACD,YAAY,EAAE;QACZ,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;IACD,kBAAkB,EAAE;QAClB,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;IACD,WAAW,EAAE;QACX,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;IACD,aAAa,EAAE;QACb,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;IACD,aAAa,EAAE;QACb,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;IACD,WAAW,EAAE;QACX,eAAe,EAAE,KAAK;QACtB,SAAS,EAAE,IAAI;KAChB;CACF,CAAC;AAEF,6DAA6D;AACtD,MAAM,eAAe,GAAG,CAC7B,UAAkB,EAAE,EACU,EAAE;IAChC,MAAM,MAAM,GAAG;QACb,sGAAsG;QACtG,GAAG,2BAAmB;KACS,CAAC;IAElC,MAAM,sBAAsB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACzE,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC;QAErC,MAAM,QAAQ,GAAG,OAAQ,IAAY,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC;QAC5D,GAAG,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC;QAE7B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACxB,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC;SAChC;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YAC1B,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,GAAG,OAAO,CAAC;SAClC;QAED,IAAI,2BAAmB,CAAC,OAAO,CAAC,EAAE;YAChC,GAAG,CAAC,QAAQ,CAAC,CAAC,WAAW,GAAG,OAAO,CAAC;SACrC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAkC,CAAC,CAAC;IAEvC,OAAO;QACL,GAAG,OAAO;QACV,GAAG,sBAAsB;KACM,CAAA;AACnC,CAAC,CAAC;AAjCW,QAAA,eAAe,mBAiC1B;AAEF,0GAA0G;AACnG,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAE,MAAW,EAAE,EAAE,CAAC;wBAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/src/internal.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,8 @@ async function fixImageLoader(remaining) {
|
|
|
65
65
|
]),
|
|
66
66
|
'} catch (e) {',
|
|
67
67
|
webpack_1.Template.indent([
|
|
68
|
-
`
|
|
68
|
+
`const path = document.currentScript && document.currentScript.src;`,
|
|
69
|
+
`console.error('failed generating CSR image path', e, path);`,
|
|
69
70
|
'return "";',
|
|
70
71
|
]),
|
|
71
72
|
'}',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixImageLoader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/fixImageLoader.ts"],"names":[],"mappings":";;;;AAEA,qCAAmC;AACnC,wDAAwB;AAExB;;;;;;;;;;;;;;;;;GAiBG;AACI,KAAK,UAAU,cAAc,CAElC,SAAiB;IAEjB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;IAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC;IAErE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CACpC,GAAG,IAAI,CAAC,YAAY,+BAA+B,SAAS,EAAE,CAC/D,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAA2B,CAAC;IAErE,MAAM,mBAAmB,GAAG,QAAQ;QAClC,CAAC,CAAC,GAAG,kBAAQ,CAAC,QAAQ,CAAC;YACnB,6BAA6B;YAC7B,kBAAQ,CAAC,QAAQ,CAAC;gBAChB,OAAO;gBACP,kBAAQ,CAAC,MAAM,CAAC;oBACd,mIAAmI;oBACnI,oBAAoB;oBACpB,kBAAQ,CAAC,MAAM,CAAC;wBACd,8CAA8C;wBAC9C,kDAAkD;qBACnD,CAAC;oBACF,GAAG;oBACH,YAAY;iBACb,CAAC;gBACF,eAAe;gBACf,kBAAQ,CAAC,MAAM,CAAC;oBACd,uDAAuD;oBACvD,YAAY;iBACb,CAAC;gBACF,GAAG;aACJ,CAAC;YACF,KAAK;SACN,CAAC,EAAE;QACN,CAAC,CAAC,GAAG,kBAAQ,CAAC,QAAQ,CAAC;YACnB,6BAA6B;YAC7B,kBAAQ,CAAC,MAAM,CAAC;gBACd,OAAO;gBACP,kBAAQ,CAAC,MAAM,CAAC;oBACd,qCAAqC;oBACrC,kBAAQ,CAAC,MAAM,CACb,UAAU,UAAU,OAAO,UAAU,iCAAiC,UAAU,eAAe,CAChG;oBACD,oEAAoE;oBACpE,uCAAuC;oBACvC,kDAAkD;iBACnD,CAAC;gBACF,eAAe;gBACf,kBAAQ,CAAC,MAAM,CAAC;oBACd,
|
|
1
|
+
{"version":3,"file":"fixImageLoader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/fixImageLoader.ts"],"names":[],"mappings":"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"}
|