@module-federation/nextjs-mf 5.12.4 → 5.12.6
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 +16 -0
- package/client/helpers.js +1 -1
- package/client/helpers.js.map +1 -1
- package/package.json +2 -2
- package/src/internal.js +20 -30
- package/src/internal.js.map +1 -1
- package/src/loaders/async-boundary-loader.js +12 -23
- package/src/loaders/async-boundary-loader.js.map +1 -1
- package/src/loaders/fixImageLoader.js +3 -4
- package/src/loaders/fixImageLoader.js.map +1 -1
- package/src/plugins/AddRuntimeRequirementToPromiseExternalPlugin.js +1 -1
- package/src/plugins/AddRuntimeRequirementToPromiseExternalPlugin.js.map +1 -1
- package/src/plugins/DevHmrFixInvalidPongPlugin.js +12 -11
- package/src/plugins/DevHmrFixInvalidPongPlugin.js.map +1 -1
- package/src/plugins/NextFederationPlugin.js +26 -27
- package/src/plugins/NextFederationPlugin.js.map +1 -1
- package/src/plugins/RemoveRRRuntimePlugin.js +13 -12
- package/src/plugins/RemoveRRRuntimePlugin.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,22 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [5.12.6](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.5...nextjs-mf-5.12.6) (2022-11-22)
|
|
6
|
+
|
|
7
|
+
### Dependency Updates
|
|
8
|
+
|
|
9
|
+
* `node` updated to version `0.9.5`
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* Improve logic ([#387](https://github.com/module-federation/nextjs-mf/issues/387)) ([0eb7f1b](https://github.com/module-federation/nextjs-mf/commit/0eb7f1bb77ef0a72ad26adeea1b508fbae60656f))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [5.12.5](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.4...nextjs-mf-5.12.5) (2022-11-20)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
5
21
|
## [5.12.4](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.3...nextjs-mf-5.12.4) (2022-11-20)
|
|
6
22
|
|
|
7
23
|
### Dependency Updates
|
package/client/helpers.js
CHANGED
|
@@ -52,7 +52,7 @@ function getRouteRegex(normalizedRoute) {
|
|
|
52
52
|
const { parameterizedRoute, groups } = getParametrizedRoute(normalizedRoute);
|
|
53
53
|
return {
|
|
54
54
|
re: new RegExp(`^${parameterizedRoute}(?:/)?$`),
|
|
55
|
-
groups
|
|
55
|
+
groups,
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
58
|
exports.getRouteRegex = getRouteRegex;
|
package/client/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/client/helpers.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAClD,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAE/C,SAAgB,cAAc,CAAC,KAAa;IAC1C,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC;AAED;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9D,IAAI,QAAQ,EAAE;QACZ,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5B;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,MAAM,EAAE;QACV,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAa;IACzC,kEAAkE;IAClE,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,EAA6B,CAAC;IAC7C,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO;QACL,kBAAkB,EAAE,QAAQ;aACzB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACpD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,cAAc,CAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CACrB,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;gBACtD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;aACrE;iBAAM;gBACL,OAAO,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;aAC1C;QACH,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC;QACX,MAAM;KACP,CAAC;AACJ,CAAC;AAED,SAAgB,aAAa,CAAC,eAAuB;IACnD,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAC7E,OAAO;QACL,EAAE,EAAE,IAAI,MAAM,CAAC,IAAI,kBAAkB,SAAS,CAAC;QAC/C,MAAM
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/client/helpers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/nextjs-mf",
|
|
3
|
-
"version": "5.12.
|
|
3
|
+
"version": "5.12.6",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"fast-glob": "^3.2.11",
|
|
20
20
|
"webpack-sources": "^3.2.3",
|
|
21
21
|
"eventemitter3": "^4.0.7",
|
|
22
|
-
"@module-federation/node": "0.9.
|
|
22
|
+
"@module-federation/node": "0.9.5",
|
|
23
23
|
"@module-federation/utilities": "1.0.1",
|
|
24
24
|
"@swc/core": "^1.3.3",
|
|
25
25
|
"tslib": "^2.3.0"
|
package/src/internal.js
CHANGED
|
@@ -59,7 +59,7 @@ const reKeyHostShared = (options = {}) => {
|
|
|
59
59
|
};
|
|
60
60
|
return Object.entries(shared).reduce((acc, item) => {
|
|
61
61
|
const [itemKey, shareOptions] = item;
|
|
62
|
-
const shareKey =
|
|
62
|
+
const shareKey = `host${item.shareKey || itemKey}`;
|
|
63
63
|
acc[shareKey] = shareOptions;
|
|
64
64
|
if (!shareOptions.import) {
|
|
65
65
|
acc[shareKey].import = itemKey;
|
|
@@ -75,8 +75,7 @@ const reKeyHostShared = (options = {}) => {
|
|
|
75
75
|
};
|
|
76
76
|
exports.reKeyHostShared = reKeyHostShared;
|
|
77
77
|
// browser template to convert remote into promise new promise and use require.loadChunk to load the chunk
|
|
78
|
-
const generateRemoteTemplate = (url, global) => {
|
|
79
|
-
return `new Promise(function (resolve, reject) {
|
|
78
|
+
const generateRemoteTemplate = (url, global) => `new Promise(function (resolve, reject) {
|
|
80
79
|
var url = new URL(${JSON.stringify(url)});
|
|
81
80
|
url.searchParams.set('t', Date.now());
|
|
82
81
|
var __webpack_error__ = new Error();
|
|
@@ -133,7 +132,6 @@ const generateRemoteTemplate = (url, global) => {
|
|
|
133
132
|
}
|
|
134
133
|
return proxy
|
|
135
134
|
})`;
|
|
136
|
-
};
|
|
137
135
|
exports.generateRemoteTemplate = generateRemoteTemplate;
|
|
138
136
|
// shared packages must be compiled into webpack bundle, not require() pass through
|
|
139
137
|
const internalizeSharedPackages = (options, compiler) => {
|
|
@@ -182,9 +180,7 @@ exports.externalizedShares = Object.entries(exports.DEFAULT_SHARE_SCOPE).reduce(
|
|
|
182
180
|
const getOutputPath = (compiler) => {
|
|
183
181
|
const isServer = compiler.options.target !== 'client';
|
|
184
182
|
let outputPath = compiler.options.output.path?.split(path_1.default.sep);
|
|
185
|
-
const foundIndex = outputPath?.findIndex((i) =>
|
|
186
|
-
return i === (isServer ? 'server' : 'static');
|
|
187
|
-
});
|
|
183
|
+
const foundIndex = outputPath?.findIndex((i) => i === (isServer ? 'server' : 'static'));
|
|
188
184
|
outputPath = outputPath
|
|
189
185
|
?.slice(0, foundIndex && foundIndex > 0 ? foundIndex : outputPath.length)
|
|
190
186
|
.join(path_1.default.sep);
|
|
@@ -212,23 +208,20 @@ const parseRemoteSyntax = (remote) => {
|
|
|
212
208
|
return remote;
|
|
213
209
|
};
|
|
214
210
|
exports.parseRemoteSyntax = parseRemoteSyntax;
|
|
215
|
-
const parseRemotes = (remotes) => {
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
acc[remote[0]] = 'promise ' + (0, exports.parseRemoteSyntax)(remote[1]);
|
|
219
|
-
return acc;
|
|
220
|
-
}
|
|
221
|
-
acc[remote[0]] = remote[1];
|
|
211
|
+
const parseRemotes = (remotes) => Object.entries(remotes).reduce((acc, remote) => {
|
|
212
|
+
if (!remote[1].startsWith('promise ') && remote[1].includes('@')) {
|
|
213
|
+
acc[remote[0]] = `promise ${(0, exports.parseRemoteSyntax)(remote[1])}`;
|
|
222
214
|
return acc;
|
|
223
|
-
}
|
|
224
|
-
|
|
215
|
+
}
|
|
216
|
+
acc[remote[0]] = remote[1];
|
|
217
|
+
return acc;
|
|
218
|
+
}, {});
|
|
225
219
|
exports.parseRemotes = parseRemotes;
|
|
226
220
|
const parseShareOptions = (options) => {
|
|
227
221
|
const sharedOptions = (0, options_1.parseOptions)(options.shared, (item, key) => {
|
|
228
222
|
if (typeof item !== 'string')
|
|
229
223
|
throw new Error('Unexpected array in shared');
|
|
230
|
-
|
|
231
|
-
const config = item === key || !(0, utils_1.isRequiredVersion)(item)
|
|
224
|
+
return item === key || !(0, utils_1.isRequiredVersion)(item)
|
|
232
225
|
? {
|
|
233
226
|
import: item,
|
|
234
227
|
}
|
|
@@ -236,7 +229,6 @@ const parseShareOptions = (options) => {
|
|
|
236
229
|
import: key,
|
|
237
230
|
requiredVersion: item,
|
|
238
231
|
};
|
|
239
|
-
return config;
|
|
240
232
|
}, (item) => item);
|
|
241
233
|
return sharedOptions.reduce((acc, [key, options]) => {
|
|
242
234
|
acc[key] = {
|
|
@@ -252,16 +244,14 @@ const parseShareOptions = (options) => {
|
|
|
252
244
|
return acc;
|
|
253
245
|
}, {});
|
|
254
246
|
};
|
|
255
|
-
const toDisplayErrors = (err) =>
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
.join('\n');
|
|
265
|
-
};
|
|
247
|
+
const toDisplayErrors = (err) => err
|
|
248
|
+
.map((error) => {
|
|
249
|
+
let { message } = error;
|
|
250
|
+
if (error.stack) {
|
|
251
|
+
message += `\n${error.stack}`;
|
|
252
|
+
}
|
|
253
|
+
return message;
|
|
254
|
+
})
|
|
255
|
+
.join('\n');
|
|
266
256
|
exports.toDisplayErrors = toDisplayErrors;
|
|
267
257
|
//# sourceMappingURL=internal.js.map
|
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,GAAG,OAAO;QACV,GAAG,2BAAmB;KACS,CAAC;IAElC,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACjD,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC;QAErC,MAAM,QAAQ,GAAG,
|
|
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,GAAG,OAAO;QACV,GAAG,2BAAmB;KACS,CAAC;IAElC,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACjD,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;AACzC,CAAC,CAAC;AA5BW,QAAA,eAAe,mBA4B1B;AAEF,0GAA0G;AACnG,MAAM,sBAAsB,GAAG,CAAC,GAAW,EAAE,MAAW,EAAE,EAAE,CAAC;wBAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;;;iBAG1B,MAAM;;;;qBAIF,MAAM;;;;;;;;;;QAUnB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;;;;aAIjB,MAAM;;;;;;;;;;;;;;;;;;;;;;;YAuBP,MAAM;;;;UAIR,MAAM;;;WAGL,MAAM;;;;KAIZ,CAAC;AAxDO,QAAA,sBAAsB,0BAwD7B;AAEN,mFAAmF;AAC5E,MAAM,yBAAyB,GAAG,CACvC,OAAsC,EACtC,QAAkB,EAClB,EAAE;IACF,mFAAmF;IACnF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO;KACR;IACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACjD,qEAAqE;IACrE,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QACnE,IAAI,CAAC,2BAAmB,CAAC,GAAG,CAAC,EAAE;YAC7B,OAAO,IAAI,CAAC;SACb;QAED,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QAExC,IAAI,KAAK,IAAI,CAAC,2BAAmB,CAAC,KAAK,CAAC,EAAE;YACxC,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC7C,gCAAgC;QAChC,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtD,0GAA0G;QAC1G,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;YACzC,+EAA+E;YAC/E,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBAChD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC7D,OAAO,eAAe,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;iBACvC;gBACD,YAAY;gBACZ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,CAAC,CAAC;SACH;KACF;AACH,CAAC,CAAC;AAvCW,QAAA,yBAAyB,6BAuCpC;AAEW,QAAA,kBAAkB,GAAiB,MAAM,CAAC,OAAO,CAC5D,2BAAmB,CACpB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IACrB,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAA8B,CAAC;IAEpD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAEvC,IAAI,GAAG,KAAK,mBAAmB,EAAE;QAC/B,OAAQ,GAAG,CAAC,GAAG,CAAkB,CAAC,MAAM,CAAC;KAC1C;IAED,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAAkB,CAAC,CAAC;AAEvB,4DAA4D;AACrD,MAAM,aAAa,GAAG,CAAC,QAAkB,EAAE,EAAE;IAClD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC;IACtD,IAAI,UAAU,GACZ,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;IAEhD,MAAM,UAAU,GAAG,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAExF,UAAU,GAAG,UAAU;QACrB,EAAE,KAAK,CAAC,CAAC,EAAE,UAAU,IAAI,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;SACxE,IAAI,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;IAElB,OAAO,UAAoB,CAAC;AAC9B,CAAC,CAAC;AAZW,QAAA,aAAa,iBAYxB;AAEW,QAAA,aAAa,GAAG;IAC3B,+BAA+B;IAC/B,qBAAqB;IACrB,uBAAuB;IACvB,0BAA0B;IAC1B,4BAA4B;IAC5B,0BAA0B;IAC1B,sBAAsB;IACtB,gBAAgB;IAChB,iBAAiB;IACjB,gBAAgB;IAChB,yBAAyB;CAC1B,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE;IAClD,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtD,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAA,+BAAmB,EAAC,MAAM,CAAC,CAAC;QAClD,OAAO,IAAA,8BAAsB,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KAC5C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B;AAEK,MAAM,YAAY,GAAG,CAAC,OAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;IAC3G,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAChE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3D,OAAO,GAAG,CAAC;KACZ;IACD,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAA4B,CAAC,CAAC;AAPpB,QAAA,YAAY,gBAOQ;AAEjC,MAAM,iBAAiB,GAAG,CAAC,OAAsC,EAAE,EAAE;IACnE,MAAM,aAAa,GAA6B,IAAA,sBAAY,EAC1D,OAAO,CAAC,MAAM,EACd,CAAC,IAAY,EAAE,GAAW,EAAE,EAAE;QAC5B,IAAI,OAAO,IAAI,KAAK,QAAQ;YAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAEhD,OAAO,IAAI,KAAK,GAAG,IAAI,CAAC,IAAA,yBAAiB,EAAC,IAAI,CAAC;YAC/C,CAAC,CAAC;gBACE,MAAM,EAAE,IAAI;aACb;YACH,CAAC,CAAC;gBACE,MAAM,EAAE,GAAG;gBACX,eAAe,EAAE,IAAI;aACtB,CAAC;IACN,CAAC,EACD,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CACpB,CAAC;IAEF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE;QAClD,GAAG,CAAC,GAAG,CAAC,GAAG;YACT,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG;YACjC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAkC,CAAC,CAAC;AACzC,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,GAAY,EAAE,EAAE,CAAC,GAAG;KACnD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;IACb,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACxB,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,OAAO,IAAI,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;KAC/B;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;KACD,IAAI,CAAC,IAAI,CAAC,CAAC;AARC,QAAA,eAAe,mBAQhB"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
MIT License http://www.opensource.org/licenses/mit-license.php
|
|
4
|
+
Author Zack Jackson @ScriptedAlchemy
|
|
5
|
+
*/
|
|
2
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
7
|
exports.pitch = void 0;
|
|
4
|
-
const pageTemplate = (request) =>
|
|
5
|
-
return (`
|
|
8
|
+
const pageTemplate = (request) => (`
|
|
6
9
|
import dynamic from "next/dynamic"
|
|
7
10
|
const AsyncBoundary = dynamic(() => import("${request}"), {suspense:true});
|
|
8
11
|
export default AsyncBoundary;
|
|
9
12
|
`);
|
|
10
|
-
|
|
11
|
-
const getInitialPropsTemplate = (request) => {
|
|
12
|
-
return (`
|
|
13
|
+
const getInitialPropsTemplate = (request) => (`
|
|
13
14
|
AsyncBoundary.getInitialProps = async (ctx) => {
|
|
14
15
|
return import("${request}").then((mod) => {
|
|
15
16
|
const page = mod.default || mod;
|
|
@@ -17,44 +18,34 @@ const getInitialPropsTemplate = (request) => {
|
|
|
17
18
|
})
|
|
18
19
|
}
|
|
19
20
|
`);
|
|
20
|
-
|
|
21
|
-
const getStaticPropsTemplate = (request) => {
|
|
22
|
-
return (`
|
|
21
|
+
const getStaticPropsTemplate = (request) => (`
|
|
23
22
|
export const getStaticProps = async (ctx) => {
|
|
24
23
|
return import("${request}").then((mod) => {
|
|
25
24
|
return mod.getStaticProps(ctx)
|
|
26
25
|
})
|
|
27
26
|
}
|
|
28
27
|
`);
|
|
29
|
-
|
|
30
|
-
const getServerSidePropsTemplate = (request) => {
|
|
31
|
-
return (`
|
|
28
|
+
const getServerSidePropsTemplate = (request) => (`
|
|
32
29
|
export const getServerSideProps = async (ctx) => {
|
|
33
30
|
return import("${request}").then((mod) => {
|
|
34
31
|
return mod.getServerSideProps(ctx)
|
|
35
32
|
})
|
|
36
33
|
}
|
|
37
34
|
`);
|
|
38
|
-
|
|
39
|
-
const getStaticPathsTemplate = (request) => {
|
|
40
|
-
return (`
|
|
35
|
+
const getStaticPathsTemplate = (request) => (`
|
|
41
36
|
export const getStaticPaths = async (ctx) => {
|
|
42
37
|
return import("${request}").then((mod) => {
|
|
43
38
|
return mod.getStaticPaths(ctx)
|
|
44
39
|
})
|
|
45
40
|
}
|
|
46
41
|
`);
|
|
47
|
-
};
|
|
48
42
|
const pitch = function (remainingRequest) {
|
|
49
43
|
this.cacheable && this.cacheable();
|
|
50
44
|
const callback = this.async();
|
|
51
45
|
const loaderWithoutBoundaryOrShared = this.request.split('!').filter((loader) => {
|
|
52
46
|
return !loader.includes('async-boundary-loader') && !loader.includes('patchDefaultSharedLoader');
|
|
53
47
|
}).join('!');
|
|
54
|
-
|
|
55
|
-
return !loader.includes('async-boundary-loader');
|
|
56
|
-
}).join('!');
|
|
57
|
-
this.loadModule(`${this.resourcePath}.webpack[javascript/auto]` + `!=!${loaderWithoutBoundaryOrShared}`,
|
|
48
|
+
this.loadModule(`${this.resourcePath}.webpack[javascript/auto]!=!${loaderWithoutBoundaryOrShared}`,
|
|
58
49
|
/**
|
|
59
50
|
* @param {Error | null | undefined} error
|
|
60
51
|
* @param {object} exports
|
|
@@ -64,8 +55,7 @@ const pitch = function (remainingRequest) {
|
|
|
64
55
|
callback(error);
|
|
65
56
|
return;
|
|
66
57
|
}
|
|
67
|
-
|
|
68
|
-
if (this._compilation.name === 'ChildFederationPlugin') {
|
|
58
|
+
if (this._compilation && this._compilation.name === 'ChildFederationPlugin') {
|
|
69
59
|
callback(null, source, sourceMap);
|
|
70
60
|
return;
|
|
71
61
|
}
|
|
@@ -74,7 +64,7 @@ const pitch = function (remainingRequest) {
|
|
|
74
64
|
const hasGSSP = !!source.includes('getServerSideProps');
|
|
75
65
|
const hasGSPT = !!source.includes('getStaticPaths');
|
|
76
66
|
const relativeResource = this.utils.contextify(this.context, this.resource);
|
|
77
|
-
|
|
67
|
+
const result = [
|
|
78
68
|
pageTemplate(`${this.resource}?hasBoundary`)
|
|
79
69
|
];
|
|
80
70
|
if (hasGIP) {
|
|
@@ -91,7 +81,6 @@ const pitch = function (remainingRequest) {
|
|
|
91
81
|
}
|
|
92
82
|
callback(null, result.join("\n"));
|
|
93
83
|
});
|
|
94
|
-
// }
|
|
95
84
|
};
|
|
96
85
|
exports.pitch = pitch;
|
|
97
86
|
//# sourceMappingURL=async-boundary-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async-boundary-loader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/async-boundary-loader.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"async-boundary-loader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/async-boundary-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,14 +21,14 @@ async function fixImageLoader(remaining) {
|
|
|
21
21
|
this.cacheable(true);
|
|
22
22
|
const publicPath = this._compiler?.webpack.RuntimeGlobals.publicPath;
|
|
23
23
|
const isServer = this._compiler?.options.name !== 'client';
|
|
24
|
-
const result = await this.importModule(`${this.resourcePath}.webpack[javascript/auto]
|
|
24
|
+
const result = await this.importModule(`${this.resourcePath}.webpack[javascript/auto]!=!${remaining}`);
|
|
25
25
|
const content = (result.default || result);
|
|
26
26
|
const computedAssetPrefix = isServer
|
|
27
27
|
? `new URL(global.__remote_scope__._config[global.remoteEntryName]).origin`
|
|
28
28
|
: `(${publicPath} && ${publicPath}.indexOf('://') > 0 ? new URL(${publicPath}).origin : '')`;
|
|
29
29
|
const constructedObject = Object.entries(content).reduce((acc, [key, value]) => {
|
|
30
30
|
if (key === 'src') {
|
|
31
|
-
if (value && value.
|
|
31
|
+
if (value && !value.includes('://')) {
|
|
32
32
|
value = path_1.default.join(value);
|
|
33
33
|
}
|
|
34
34
|
acc.push(`${key}: computedAssetsPrefixReference + ${JSON.stringify(value)}`);
|
|
@@ -37,7 +37,7 @@ async function fixImageLoader(remaining) {
|
|
|
37
37
|
acc.push(`${key}: ${JSON.stringify(value)}`);
|
|
38
38
|
return acc;
|
|
39
39
|
}, []);
|
|
40
|
-
|
|
40
|
+
return webpack_1.Template.asString([
|
|
41
41
|
"let computedAssetsPrefixReference = '';",
|
|
42
42
|
'try {',
|
|
43
43
|
webpack_1.Template.indent(`computedAssetsPrefixReference = ${computedAssetPrefix};`),
|
|
@@ -46,7 +46,6 @@ async function fixImageLoader(remaining) {
|
|
|
46
46
|
webpack_1.Template.indent(constructedObject.join(',\n')),
|
|
47
47
|
'}',
|
|
48
48
|
]);
|
|
49
|
-
return updated;
|
|
50
49
|
}
|
|
51
50
|
exports.fixImageLoader = fixImageLoader;
|
|
52
51
|
exports.pitch = fixImageLoader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixImageLoader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/fixImageLoader.ts"],"names":[],"mappings":";;;;AAEA,qCAAmC;AACnC,wDAAwB;AAExB;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,cAAc,CAElC,SAAiB;IAEjB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC;IACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;IAE3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CACpC,GAAG,IAAI,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"fixImageLoader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/fixImageLoader.ts"],"names":[],"mappings":";;;;AAEA,qCAAmC;AACnC,wDAAwB;AAExB;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,cAAc,CAElC,SAAiB;IAEjB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAErB,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC;IACrE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;IAE3D,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,yEAAyE;QAC3E,CAAC,CAAC,IAAI,UAAU,OAAO,UAAU,iCAAiC,UAAU,gBAAgB,CAAC;IAE/F,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CACtD,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpB,IAAI,GAAG,KAAK,KAAK,EAAE;YACjB,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACnC,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1B;YACD,GAAG,CAAC,IAAI,CACN,GAAG,GAAG,qCAAqC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CACnE,CAAC;YACF,OAAO,GAAG,CAAC;SACZ;QACD,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7C,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAc,CACf,CAAC;IAEF,OAAO,kBAAQ,CAAC,QAAQ,CAAC;QACvB,yCAAyC;QACzC,OAAO;QACP,kBAAQ,CAAC,MAAM,CAAC,mCAAmC,mBAAmB,GAAG,CAAC;QAC1E,gBAAgB;QAChB,kBAAkB;QAClB,kBAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AA7CD,wCA6CC;AAEY,QAAA,KAAK,GAAG,cAAc,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.AddRuntimeRequirementToPromiseExternal = void 0;
|
|
|
4
4
|
class AddRuntimeRequirementToPromiseExternal {
|
|
5
5
|
apply(compiler) {
|
|
6
6
|
compiler.hooks.compilation.tap('AddRuntimeRequirementToPromiseExternal', (compilation) => {
|
|
7
|
-
const RuntimeGlobals = compiler.webpack
|
|
7
|
+
const { RuntimeGlobals } = compiler.webpack;
|
|
8
8
|
compilation.hooks.additionalModuleRuntimeRequirements.tap('AddRuntimeRequirementToPromiseExternal', (module, set) => {
|
|
9
9
|
if (module.externalType === 'promise') {
|
|
10
10
|
set.add(RuntimeGlobals.loadScript);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddRuntimeRequirementToPromiseExternalPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/AddRuntimeRequirementToPromiseExternalPlugin.ts"],"names":[],"mappings":";;;AAEA,MAAa,sCAAsC;IACjD,KAAK,CAAC,QAAkB;QACtB,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAC5B,wCAAwC,EACxC,CAAC,WAAW,EAAE,EAAE;YACd,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"AddRuntimeRequirementToPromiseExternalPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/AddRuntimeRequirementToPromiseExternalPlugin.ts"],"names":[],"mappings":";;;AAEA,MAAa,sCAAsC;IACjD,KAAK,CAAC,QAAkB;QACtB,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAC5B,wCAAwC,EACxC,CAAC,WAAW,EAAE,EAAE;YACd,MAAM,EAAC,cAAc,EAAC,GAAG,QAAQ,CAAC,OAAO,CAAC;YAC1C,WAAW,CAAC,KAAK,CAAC,mCAAmC,CAAC,GAAG,CACvD,wCAAwC,EACxC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;gBACd,IAAK,MAAc,CAAC,YAAY,KAAK,SAAS,EAAE;oBAC9C,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;oBACnC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;iBACjC;YACH,CAAC,CACF,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;CACF;AAlBD,wFAkBC;AAED,kBAAe,sCAAsC,CAAC"}
|
|
@@ -20,7 +20,7 @@ if (!String.prototype.replaceAll) {
|
|
|
20
20
|
*/
|
|
21
21
|
class DevHmrFixInvalidPongPlugin {
|
|
22
22
|
apply(compiler) {
|
|
23
|
-
const webpack = compiler
|
|
23
|
+
const { webpack } = compiler;
|
|
24
24
|
compiler.hooks.thisCompilation.tap('DevHmrFixInvalidPongPlugin', (compilation) => {
|
|
25
25
|
compilation.hooks.processAssets.tap({
|
|
26
26
|
name: 'DevHmrFixInvalidPongPlugin',
|
|
@@ -29,18 +29,19 @@ class DevHmrFixInvalidPongPlugin {
|
|
|
29
29
|
stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_PRE_PROCESS,
|
|
30
30
|
}, (assets) => {
|
|
31
31
|
Object.keys(assets).forEach((filename) => {
|
|
32
|
-
if (filename.endsWith('/main.js')) {
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
if (!filename.endsWith('/main.js')) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
const asset = compilation.getAsset(filename);
|
|
36
|
+
const newSource = asset?.source.source().replace(new RegExp(escapeRegExp('if (payload.event === \\"pong\\" && payload.invalid && !self.__NEXT_DATA__.err) {'), 'g'), `if (payload.event === \\"pong\\" && payload.invalid && !self.__NEXT_DATA__.err) {
|
|
35
37
|
if (window.mf_client && window.mf_client.isFederatedPathname(window.location.pathname)) return;
|
|
36
38
|
`.replaceAll('\n', '\\n'));
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
}
|
|
39
|
+
const updatedAsset = new webpack.sources.RawSource(newSource);
|
|
40
|
+
if (asset) {
|
|
41
|
+
compilation.updateAsset(filename, updatedAsset);
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
compilation.emitAsset(filename, updatedAsset);
|
|
44
45
|
}
|
|
45
46
|
});
|
|
46
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevHmrFixInvalidPongPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/DevHmrFixInvalidPongPlugin.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE;IAChC,MAAM,CAAC,SAAS,CAAC,UAAU,GAAG,UAAS,GAAG,EAAE,MAAM;QAEhD,qBAAqB;QACrB,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,iBAAiB,EAAE;YAC3E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAU,MAAM,CAAC,CAAC;SAC1C;QAED,cAAc;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAU,MAAM,CAAC,CAAC;IAE5D,CAAC,CAAC;CACH;AAED;;;;;GAKG;AACH,MAAa,0BAA0B;IACrC,KAAK,CAAC,QAAkB;QACtB,MAAM,OAAO,GAAG,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"DevHmrFixInvalidPongPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/DevHmrFixInvalidPongPlugin.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE;IAChC,MAAM,CAAC,SAAS,CAAC,UAAU,GAAG,UAAS,GAAG,EAAE,MAAM;QAEhD,qBAAqB;QACrB,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,iBAAiB,EAAE;YAC3E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAU,MAAM,CAAC,CAAC;SAC1C;QAED,cAAc;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAU,MAAM,CAAC,CAAC;IAE5D,CAAC,CAAC;CACH;AAED;;;;;GAKG;AACH,MAAa,0BAA0B;IACrC,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAE7B,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAChC,4BAA4B,EAC5B,CAAC,WAAW,EAAE,EAAE;YACd,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;gBACE,IAAI,EAAE,4BAA4B;gBAClC,iCAAiC;gBACjC,uCAAuC;gBACvC,KAAK,EAAE,qBAAW,CAAC,gCAAgC;aACpD,EACD,CAAC,MAAM,EAAE,EAAE;gBACT,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACvC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;wBAClC,OAAO;qBACR;oBACD,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBAC7C,MAAM,SAAS,GAAI,KAAK,EAAE,MAAM,CAAC,MAAM,EAAa,CAAC,OAAO,CAC1D,IAAI,MAAM,CACR,YAAY,CACV,mFAAmF,CACpF,EACD,GAAG,CACJ,EACD;;mBAEG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAC5B,CAAC;oBAEF,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAE9D,IAAI,KAAK,EAAE;wBACT,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;qBACjD;yBAAM;wBACL,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;qBAC/C;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CACF,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;CACF;AA7CD,gEA6CC;AAED,SAAS,YAAY,CAAC,MAAc;IAClC,OAAO,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,oCAAoC;AAC5F,CAAC;AAED,kBAAe,0BAA0B,CAAC"}
|
|
@@ -36,11 +36,11 @@ class NextFederationPlugin {
|
|
|
36
36
|
return;
|
|
37
37
|
}
|
|
38
38
|
const isServer = compiler.options.name === 'server';
|
|
39
|
-
const webpack = compiler
|
|
39
|
+
const { webpack } = compiler;
|
|
40
40
|
if (isServer) {
|
|
41
41
|
// target false because we use our own target for node env
|
|
42
42
|
compiler.options.target = false;
|
|
43
|
-
const StreamingTargetPlugin = require('@module-federation/node')
|
|
43
|
+
const { StreamingTargetPlugin } = require('@module-federation/node');
|
|
44
44
|
new StreamingTargetPlugin(this._options, {
|
|
45
45
|
ModuleFederationPlugin: webpack.container.ModuleFederationPlugin,
|
|
46
46
|
}).apply(compiler);
|
|
@@ -93,9 +93,7 @@ class NextFederationPlugin {
|
|
|
93
93
|
return false;
|
|
94
94
|
},
|
|
95
95
|
exclude: [/node_modules/, /_document/, /_middleware/],
|
|
96
|
-
resourceQuery: (query) =>
|
|
97
|
-
return !query.includes('hasBoundary');
|
|
98
|
-
},
|
|
96
|
+
resourceQuery: (query) => !query.includes('hasBoundary'),
|
|
99
97
|
loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader')
|
|
100
98
|
});
|
|
101
99
|
}
|
|
@@ -109,29 +107,30 @@ class NextFederationPlugin {
|
|
|
109
107
|
? require('@module-federation/node').NodeFederationPlugin
|
|
110
108
|
: webpack.container.ModuleFederationPlugin;
|
|
111
109
|
// ignore edge runtime and middleware builds
|
|
112
|
-
if (ModuleFederationPlugin) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
110
|
+
if (!ModuleFederationPlugin) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
const internalShare = (0, internal_1.reKeyHostShared)(this._options.shared);
|
|
114
|
+
const hostFederationPluginOptions = {
|
|
115
|
+
...this._options,
|
|
116
|
+
exposes: {},
|
|
117
|
+
shared: {
|
|
118
|
+
noop: {
|
|
119
|
+
import: 'data:text/javascript,module.exports = {};',
|
|
120
|
+
requiredVersion: false,
|
|
121
|
+
eager: true,
|
|
122
|
+
version: '0',
|
|
125
123
|
},
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
124
|
+
...internalShare,
|
|
125
|
+
},
|
|
126
|
+
};
|
|
127
|
+
new ModuleFederationPlugin(hostFederationPluginOptions, {
|
|
128
|
+
ModuleFederationPlugin,
|
|
129
|
+
}).apply(compiler);
|
|
130
|
+
new ChildFederationPlugin_1.default(this._options, this._extraOptions).apply(compiler);
|
|
131
|
+
new AddRuntimeRequirementToPromiseExternalPlugin_1.default().apply(compiler);
|
|
132
|
+
if (compiler.options.mode === 'development') {
|
|
133
|
+
new DevHmrFixInvalidPongPlugin_1.default().apply(compiler);
|
|
135
134
|
}
|
|
136
135
|
}
|
|
137
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"AAAA;;;EAGE;AACF,YAAY,CAAC;;;;AAOb,4DAAoE;AAGpE,wDAAwB;AAExB,0CAAsF;AACtF,0IAAoG;AACpG,4FAA4D;AAE5D,sGAAsE;AAEtE,MAAa,oBAAoB;IAI/B,YAAY,OAAoC;QAC9C,MAAM,EAAC,YAAY,EAAE,GAAG,QAAQ,EAAC,GAAG,OAAO,CAAC;QAC5C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG;YACnB,sBAAsB,EAAE,KAAK;YAC7B,oBAAoB,EAAE,KAAK;YAC3B,kBAAkB,EAAE,KAAK;YACzB,wBAAwB,EAAE,KAAK;YAC/B,sBAAsB,EAAE,KAAK;YAC7B,GAAG,YAAY;SAChB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;SAC5D;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;SACtE;QAED,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACzD,OAAM;SACP;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;QACpD,MAAM,OAAO,GAAG,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ exports.RemoveRRRuntimePlugin = void 0;
|
|
|
4
4
|
const webpack_1 = require("webpack");
|
|
5
5
|
class RemoveRRRuntimePlugin {
|
|
6
6
|
apply(compiler) {
|
|
7
|
-
const webpack = compiler
|
|
7
|
+
const { webpack } = compiler;
|
|
8
8
|
// only impacts dev mode - dont waste the memory during prod build
|
|
9
9
|
if (compiler.options.mode === 'development') {
|
|
10
10
|
compiler.hooks.thisCompilation.tap('RemoveRRRuntimePlugin', (compilation) => {
|
|
@@ -16,17 +16,18 @@ class RemoveRRRuntimePlugin {
|
|
|
16
16
|
}, (assets) => {
|
|
17
17
|
//can this be improved? I need react refresh not to cause global collision in dev mode
|
|
18
18
|
Object.keys(assets).forEach((filename) => {
|
|
19
|
-
if (filename.endsWith('.js') || filename.endsWith('.mjs')) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
19
|
+
if (!(filename.endsWith('.js') || filename.endsWith('.mjs'))) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const asset = compilation.getAsset(filename);
|
|
23
|
+
// easiest way to solve it is to prevent react refresh helpers from running when its a federated module chunk
|
|
24
|
+
const newSource = asset?.source.source().replace(/RefreshHelpers/g, 'NoExist');
|
|
25
|
+
const updatedAsset = new webpack.sources.RawSource(newSource);
|
|
26
|
+
if (asset) {
|
|
27
|
+
compilation.updateAsset(filename, updatedAsset);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
compilation.emitAsset(filename, updatedAsset);
|
|
30
31
|
}
|
|
31
32
|
});
|
|
32
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoveRRRuntimePlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/RemoveRRRuntimePlugin.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,MAAa,qBAAqB;IAChC,KAAK,CAAC,QAAkB;QACtB,MAAM,OAAO,GAAG,QAAQ,CAAC
|
|
1
|
+
{"version":3,"file":"RemoveRRRuntimePlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/RemoveRRRuntimePlugin.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAEhD,MAAa,qBAAqB;IAChC,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAE7B,kEAAkE;QAClE,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,aAAa,EAAE;YAC3C,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAChC,uBAAuB,EACvB,CAAC,WAAW,EAAE,EAAE;gBACd,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;oBACE,IAAI,EAAE,uBAAuB;oBAC7B,iCAAiC;oBACjC,uCAAuC;oBACvC,KAAK,EAAE,qBAAW,CAAC,oCAAoC;iBACxD,EACD,CAAC,MAAM,EAAE,EAAE;oBACT,sFAAsF;oBACtF,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;wBACvC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE;4BAC5D,OAAO;yBACR;wBACD,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;wBAC7C,6GAA6G;wBAC7G,MAAM,SAAS,GAAI,KAAK,EAAE,MAAM,CAAC,MAAM,EAAa,CAAC,OAAO,CAC1D,iBAAiB,EACjB,SAAS,CACV,CAAC;wBACF,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;wBAE9D,IAAI,KAAK,EAAE;4BACT,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;yBACjD;6BAAM;4BACL,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;yBAC/C;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;YACJ,CAAC,CACF,CAAC;SACH;IACH,CAAC;CACF;AA1CD,sDA0CC;AAED,kBAAe,qBAAqB,CAAC"}
|