@module-federation/nextjs-mf 6.1.3 → 6.2.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 +23 -0
- package/README.md +1 -1
- package/package.json +2 -2
- package/src/internal.js +19 -0
- package/src/internal.js.map +1 -1
- package/src/plugins/ChildFederationPlugin.js +26 -2
- package/src/plugins/ChildFederationPlugin.js.map +1 -1
- package/src/plugins/NextFederationPlugin.js +20 -10
- package/src/plugins/NextFederationPlugin.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,29 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
# [6.2.0](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.1.4...nextjs-mf-6.2.0) (2023-03-14)
|
|
6
|
+
|
|
7
|
+
### Dependency Updates
|
|
8
|
+
|
|
9
|
+
* `utils` updated to version `1.4.0`
|
|
10
|
+
* `node` updated to version `0.12.0`
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* Medusa Support in NextFederationPlugin ([#609](https://github.com/module-federation/nextjs-mf/issues/609)) ([0bbba38](https://github.com/module-federation/nextjs-mf/commit/0bbba384c45b7d149b7a6be2dfbe9851b541b528)), closes [#606](https://github.com/module-federation/nextjs-mf/issues/606)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
## [6.1.4](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.1.3...nextjs-mf-6.1.4) (2023-03-08)
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### Bug Fixes
|
|
22
|
+
|
|
23
|
+
* exclude next middleware from async boundary loader ([#615](https://github.com/module-federation/nextjs-mf/issues/615)) ([9560d92](https://github.com/module-federation/nextjs-mf/commit/9560d926de176e08b6e1b7a32488f5036cb04be3))
|
|
24
|
+
* include src folder in paths validation ([#605](https://github.com/module-federation/nextjs-mf/issues/605)) ([89a9417](https://github.com/module-federation/nextjs-mf/commit/89a9417faaad50533c4bca1683ea94406ca6f532))
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
5
28
|
## [6.1.3](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.1.2...nextjs-mf-6.1.3) (2023-02-17)
|
|
6
29
|
|
|
7
30
|
|
package/README.md
CHANGED
|
@@ -291,7 +291,7 @@ const remotes = {
|
|
|
291
291
|
|
|
292
292
|
//remote-delegate.js
|
|
293
293
|
import { importDelegatedModule } from '@module-federation/utilities';
|
|
294
|
-
|
|
294
|
+
//Delegate MUST use module.exports, not export default - this is a webpack limitation
|
|
295
295
|
module.exports = new Promise((resolve, reject) => {
|
|
296
296
|
console.log('Delegate being called for', __resourceQuery);
|
|
297
297
|
const currentRequest = new URLSearchParams(__resourceQuery).get('remote');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/nextjs-mf",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"eventemitter3": "4.0.7",
|
|
21
21
|
"fast-glob": "^3.2.12",
|
|
22
22
|
"webpack-sources": "3.2.3",
|
|
23
|
-
"@module-federation/utilities": "1.
|
|
23
|
+
"@module-federation/utilities": "1.4.0",
|
|
24
24
|
"node-fetch": "2.6.7",
|
|
25
25
|
"encoding": "0.1.13"
|
|
26
26
|
},
|
package/src/internal.js
CHANGED
|
@@ -225,7 +225,12 @@ exports.removePlugins = [
|
|
|
225
225
|
'ProfilingPlugin',
|
|
226
226
|
'DropClientPage',
|
|
227
227
|
'ReactFreshWebpackPlugin',
|
|
228
|
+
'NextMedusaPlugin',
|
|
228
229
|
];
|
|
230
|
+
/*
|
|
231
|
+
This code is checking if the remote is a string and that it includes an symbol If
|
|
232
|
+
both of these conditions are met then we extract the url and global from the remote
|
|
233
|
+
*/
|
|
229
234
|
const parseRemoteSyntax = (remote) => {
|
|
230
235
|
if (typeof remote === 'string' &&
|
|
231
236
|
remote.includes('@') &&
|
|
@@ -236,6 +241,11 @@ const parseRemoteSyntax = (remote) => {
|
|
|
236
241
|
return remote;
|
|
237
242
|
};
|
|
238
243
|
exports.parseRemoteSyntax = parseRemoteSyntax;
|
|
244
|
+
/*
|
|
245
|
+
This code is doing the following It\'s iterating over all remotes and checking if
|
|
246
|
+
they are using a custom promise template or not If it\'s a custom promise template
|
|
247
|
+
we\'re parsing the remote syntax to get the module name and version number
|
|
248
|
+
*/
|
|
239
249
|
const parseRemotes = (remotes) => Object.entries(remotes).reduce((acc, [key, value]) => {
|
|
240
250
|
// check if user is passing a internal "delegate module" reference
|
|
241
251
|
if (value.startsWith('internal ')) {
|
|
@@ -259,6 +269,15 @@ const getDelegates = (remotes) => {
|
|
|
259
269
|
}, {});
|
|
260
270
|
};
|
|
261
271
|
exports.getDelegates = getDelegates;
|
|
272
|
+
/*
|
|
273
|
+
This code is parsing the options shared object and creating a new object with all
|
|
274
|
+
of the shared configs Then it is iterating over each key in this new object and
|
|
275
|
+
assigning them to an array that will be returned by this function This array contains
|
|
276
|
+
objects that are used as values for the shared property of Module Federation Plugin
|
|
277
|
+
Options The first thing we do here is check if the item passed into shared was a
|
|
278
|
+
string or not if it\'s an array If it wasn\'t then throw an error because there should
|
|
279
|
+
only be strings in there Otherwise continue on with our code below
|
|
280
|
+
*/
|
|
262
281
|
const parseShareOptions = (options) => {
|
|
263
282
|
const sharedOptions = (0, options_1.parseOptions)(options.shared, (item, key) => {
|
|
264
283
|
if (typeof item !== 'string')
|
package/src/internal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/src/internal.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/src/internal.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,14 +46,21 @@ class ChildFederationPlugin {
|
|
|
46
46
|
const buildName = this._options.name;
|
|
47
47
|
// using ModuleFederationPlugin does not work, i had to fork because of afterPlugins hook on containerPlugin.
|
|
48
48
|
const FederationPlugin = ModuleFederationPlugin_1.default;
|
|
49
|
+
const MedusaPlugin = compiler.options.plugins.find((p) => {
|
|
50
|
+
return p.constructor.name === 'NextMedusaPlugin';
|
|
51
|
+
});
|
|
52
|
+
let uniqueName = buildName;
|
|
53
|
+
if (MedusaPlugin && compiler.options.output.uniqueName !== '_N_E') {
|
|
54
|
+
uniqueName = compiler.options.output.uniqueName;
|
|
55
|
+
}
|
|
49
56
|
const childOutput = {
|
|
50
57
|
...compiler.options.output,
|
|
51
58
|
path: outputPath,
|
|
52
59
|
// path: deriveOutputPath(isServer, compiler.options.output.path),
|
|
53
60
|
name: 'child-' + compiler.options.name,
|
|
54
61
|
publicPath: 'auto',
|
|
55
|
-
chunkLoadingGlobal:
|
|
56
|
-
uniqueName:
|
|
62
|
+
chunkLoadingGlobal: uniqueName + 'chunkLoader',
|
|
63
|
+
uniqueName: uniqueName,
|
|
57
64
|
library: {
|
|
58
65
|
name: buildName,
|
|
59
66
|
type: library?.type,
|
|
@@ -72,6 +79,15 @@ class ChildFederationPlugin {
|
|
|
72
79
|
const federationPluginOptions = {
|
|
73
80
|
// library: {type: 'var', name: buildName},
|
|
74
81
|
...this._options,
|
|
82
|
+
name: MedusaPlugin
|
|
83
|
+
? '__REMOTE_VERSION__' + this._options.name
|
|
84
|
+
: this._options.name,
|
|
85
|
+
library: {
|
|
86
|
+
type: this._options.library?.type,
|
|
87
|
+
name: MedusaPlugin
|
|
88
|
+
? '__REMOTE_VERSION__' + this._options.name
|
|
89
|
+
: this._options.name,
|
|
90
|
+
},
|
|
75
91
|
filename: (0, build_utils_1.computeRemoteFilename)(isServer, this._options.filename),
|
|
76
92
|
exposes: {
|
|
77
93
|
// in development we do not hash chunks, so we need some way to cache bust the server container when remote changes
|
|
@@ -176,6 +192,14 @@ class ChildFederationPlugin {
|
|
|
176
192
|
const MiniCss = childCompiler.options.plugins.find((p) => {
|
|
177
193
|
return p.constructor.name === 'NextMiniCssExtractPlugin';
|
|
178
194
|
});
|
|
195
|
+
if (MedusaPlugin) {
|
|
196
|
+
//@ts-ignore
|
|
197
|
+
new MedusaPlugin.constructor({
|
|
198
|
+
//@ts-ignore
|
|
199
|
+
...MedusaPlugin._options,
|
|
200
|
+
filename: compiler.options.name + '-dashboard-child.json',
|
|
201
|
+
}).apply(childCompiler);
|
|
202
|
+
}
|
|
179
203
|
childCompiler.options.plugins = childCompiler.options.plugins.filter((plugin) => !internal_1.removePlugins.includes(plugin.constructor.name));
|
|
180
204
|
if (MiniCss) {
|
|
181
205
|
// grab mini-css and reconfigure it to avoid conflicts with host
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChildFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/ChildFederationPlugin.ts"],"names":[],"mappings":";;;;AAMA,qCAAsC;AAEtC,kDAAiE;AAMjE,wDAAwB;AACxB,oDAAoB;AAEpB,oEAAiE;AACjE,gDAAiE;AAEjE,0CAMqB;AACrB,4DAAsE;AAEtE,yDAAgE;AAEhE,8FAA2E;AAC3E,4FAA4D;AAC5D,0IAAoG;AAEpG,MAAM,iBAAiB,GAAG,uBAAuB,CAAC;AAClD,MAAM,cAAc,GAAG,EAA8B,CAAC;AAEtD,MAAa,qBAAqB;IAMhC,YACE,OAAsC,EACtC,YAA8C;QAE9C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC;QAC1D,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACtD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;QAChD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;QACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,aAAa,CAAC;QACtD,IAAI,UAAkB,CAAC;QAEvB,IAAI,KAAK,IAAI,QAAQ,EAAE;YACrB,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,wBAAa,EAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;SAC/D;aAAM;YACL,IAAI,QAAQ,EAAE;gBACZ,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,wBAAa,EAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;aAC/D;iBAAM;gBACL,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAc,CAAC;aACrD;SACF;QAED,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC,WAAW,EAAE,EAAE;YACpE,IAAI,OAAO,GAAG,EAA6B,CAAC;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACrC,6GAA6G;YAC7G,MAAM,gBAAgB,GAAG,gCAAmC,CAAC;YAE7D,MAAM,WAAW,GAAG;gBAClB,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM;gBAC1B,IAAI,EAAE,UAAU;gBAChB,kEAAkE;gBAClE,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI;gBACtC,UAAU,EAAE,MAAM;gBAClB,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"ChildFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/ChildFederationPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,7 +49,7 @@ class NextFederationPlugin {
|
|
|
49
49
|
name: this._options.name,
|
|
50
50
|
};
|
|
51
51
|
// output remote to ssr if server
|
|
52
|
-
this._options.filename = this._options.filename
|
|
52
|
+
this._options.filename = path_1.default.basename(this._options.filename);
|
|
53
53
|
// should this be a plugin that we apply to the compiler?
|
|
54
54
|
(0, internal_1.internalizeSharedPackages)(this._options, compiler);
|
|
55
55
|
// module-federation/utilities uses internal webpack methods and must be bundled into runtime code.
|
|
@@ -57,7 +57,8 @@ class NextFederationPlugin {
|
|
|
57
57
|
const originalExternals = compiler.options.externals[0];
|
|
58
58
|
compiler.options.externals[0] = function (ctx, callback) {
|
|
59
59
|
if (ctx.request &&
|
|
60
|
-
ctx.request.includes('@module-federation/utilities')
|
|
60
|
+
(ctx.request.includes('@module-federation/utilities') ||
|
|
61
|
+
ctx.request.includes('@module-federation/dashboard-plugin'))) {
|
|
61
62
|
return callback();
|
|
62
63
|
}
|
|
63
64
|
// @ts-ignore
|
|
@@ -85,17 +86,22 @@ class NextFederationPlugin {
|
|
|
85
86
|
name: this._options.name,
|
|
86
87
|
};
|
|
87
88
|
}
|
|
89
|
+
const allowedPaths = ['pages/', 'app/', 'src/pages/', 'src/app/'];
|
|
88
90
|
//patch next
|
|
89
91
|
compiler.options.module.rules.push({
|
|
90
92
|
test(req) {
|
|
91
|
-
if (req.includes(path_1.default.join(compiler.context,
|
|
92
|
-
req.includes(path_1.default.join(compiler.context, 'app/'))) {
|
|
93
|
+
if (allowedPaths.some((p) => req.includes(path_1.default.join(compiler.context, p)))) {
|
|
93
94
|
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(req);
|
|
94
95
|
}
|
|
95
96
|
return false;
|
|
96
97
|
},
|
|
97
98
|
include: compiler.context,
|
|
98
|
-
exclude:
|
|
99
|
+
exclude: [
|
|
100
|
+
/node_modules/,
|
|
101
|
+
/_middleware/,
|
|
102
|
+
/pages[\\/]middleware/,
|
|
103
|
+
/pages[\\/]api/,
|
|
104
|
+
],
|
|
99
105
|
loader: path_1.default.resolve(__dirname, '../loaders/patchDefaultSharedLoader'),
|
|
100
106
|
});
|
|
101
107
|
if (this._options.remotes) {
|
|
@@ -106,8 +112,7 @@ class NextFederationPlugin {
|
|
|
106
112
|
test(req) {
|
|
107
113
|
if (isServer) {
|
|
108
114
|
// server has no common chunk or entry to hoist into
|
|
109
|
-
if (req.includes(path_1.default.join(compiler.context,
|
|
110
|
-
req.includes(path_1.default.join(compiler.context, 'app/'))) {
|
|
115
|
+
if (allowedPaths.some((p) => req.includes(path_1.default.join(compiler.context, p)))) {
|
|
111
116
|
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(req);
|
|
112
117
|
}
|
|
113
118
|
}
|
|
@@ -136,13 +141,18 @@ class NextFederationPlugin {
|
|
|
136
141
|
if (this._extraOptions.automaticAsyncBoundary) {
|
|
137
142
|
compiler.options.module.rules.push({
|
|
138
143
|
test: (request) => {
|
|
139
|
-
if (request.includes(path_1.default.join(compiler.context,
|
|
140
|
-
request.includes(path_1.default.join(compiler.context, 'app/'))) {
|
|
144
|
+
if (allowedPaths.some((p) => request.includes(path_1.default.join(compiler.context, p)))) {
|
|
141
145
|
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(request);
|
|
142
146
|
}
|
|
143
147
|
return false;
|
|
144
148
|
},
|
|
145
|
-
exclude: [
|
|
149
|
+
exclude: [
|
|
150
|
+
/node_modules/,
|
|
151
|
+
/_document/,
|
|
152
|
+
/_middleware/,
|
|
153
|
+
/pages[\\/]middleware/,
|
|
154
|
+
/pages[\\/]api/,
|
|
155
|
+
],
|
|
146
156
|
resourceQuery: (query) => !query.includes('hasBoundary'),
|
|
147
157
|
loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader'),
|
|
148
158
|
});
|
|
@@ -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,4DAAsE;AAGtE,wDAAwB;AAExB,0CAKqB;AACrB,0IAAoG;AACpG,4FAA4D;AAE5D,sGAAsE;AAEtE,MAAa,oBAAoB;IAI/B,YAAY,OAAoC;QAC9C,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC9C,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,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC;QACpD,MAAM,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;QAE7B,IAAI,QAAQ,EAAE;YACZ,0DAA0D;YAC1D,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;YAChC,MAAM,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;YAErE,IAAI,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACvC,sBAAsB,EAAE,OAAO,CAAC,SAAS,CAAC,sBAAsB;aACjE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEnB,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG;gBACtB,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;aACzB,CAAC;YACF,iCAAiC;YACjC,IAAI,CAAC,QAAQ,CAAC,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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"}
|