@module-federation/nextjs-mf 6.0.7 → 6.1.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 +167 -305
- package/README.md +193 -22
- package/package.json +10 -7
- package/src/internal-delegate-hoist.d.ts +0 -0
- package/src/internal-delegate-hoist.js +3 -0
- package/src/internal-delegate-hoist.js.map +1 -0
- package/src/internal.d.ts +1 -0
- package/src/internal.js +32 -16
- package/src/internal.js.map +1 -1
- package/src/loaders/async-boundary-loader.js +21 -18
- package/src/loaders/async-boundary-loader.js.map +1 -1
- package/src/loaders/delegateLoader.d.ts +7 -0
- package/src/loaders/delegateLoader.js +38 -0
- package/src/loaders/delegateLoader.js.map +1 -0
- package/src/loaders/patchDefaultSharedLoader.js +2 -2
- package/src/loaders/patchDefaultSharedLoader.js.map +1 -1
- package/src/plugins/AddRuntimeRequirementToPromiseExternalPlugin.js.map +1 -1
- package/src/plugins/ChildFederationPlugin.js +6 -2
- package/src/plugins/ChildFederationPlugin.js.map +1 -1
- package/src/plugins/DevHmrFixInvalidPongPlugin.js.map +1 -1
- package/src/plugins/ModuleFederationPlugin.js.map +1 -1
- package/src/plugins/NextFederationPlugin.js +53 -3
- package/src/plugins/NextFederationPlugin.js.map +1 -1
- package/utils/Template.d.ts +1 -1
- package/utils/Template.js +55 -55
- package/utils/Template.js.map +1 -1
- package/utils/build-utils.d.ts +6 -0
- package/utils/build-utils.js +23 -7
- package/utils/build-utils.js.map +1 -1
|
@@ -18,8 +18,8 @@ function patchDefaultSharedLoader(content) {
|
|
|
18
18
|
return [
|
|
19
19
|
'',
|
|
20
20
|
`require(${JSON.stringify('./' + pathIncludeDefaults)});`,
|
|
21
|
-
content
|
|
22
|
-
].join(
|
|
21
|
+
content,
|
|
22
|
+
].join('\n');
|
|
23
23
|
}
|
|
24
24
|
exports.default = patchDefaultSharedLoader;
|
|
25
25
|
//# sourceMappingURL=patchDefaultSharedLoader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"patchDefaultSharedLoader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/patchDefaultSharedLoader.ts"],"names":[],"mappings":";;;AAEA,wDAAwB;AAExB;;;;GAIG;AACH,SAAwB,wBAAwB,CAE9C,OAAe;IAEf,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QACxC,6BAA6B;QAC7B,OAAO,OAAO,CAAC;KAChB;IAED,oFAAoF;IACpF,0EAA0E;IAC1E,MAAM,mBAAmB,GAAG,cAAI,CAAC,QAAQ,CACvC,IAAI,CAAC,OAAO,EACZ,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAClD,CAAC;IAEF,OAAO;QACL,EAAE;QACF,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI;QACzD,OAAO;KACR,CAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"patchDefaultSharedLoader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/patchDefaultSharedLoader.ts"],"names":[],"mappings":";;;AAEA,wDAAwB;AAExB;;;;GAIG;AACH,SAAwB,wBAAwB,CAE9C,OAAe;IAEf,IAAI,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QACxC,6BAA6B;QAC7B,OAAO,OAAO,CAAC;KAChB;IAED,oFAAoF;IACpF,0EAA0E;IAC1E,MAAM,mBAAmB,GAAG,cAAI,CAAC,QAAQ,CACvC,IAAI,CAAC,OAAO,EACZ,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAClD,CAAC;IAEF,OAAO;QACL,EAAE;QACF,WAAW,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,mBAAmB,CAAC,IAAI;QACzD,OAAO;KACR,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AArBD,2CAqBC"}
|
|
@@ -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,
|
|
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,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC;YAC5C,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"}
|
|
@@ -92,6 +92,7 @@ class ChildFederationPlugin {
|
|
|
92
92
|
};
|
|
93
93
|
if (compiler.options.name === 'client') {
|
|
94
94
|
plugins = [
|
|
95
|
+
new webpack.EntryPlugin(compiler.context, require.resolve('../internal-delegate-hoist'), buildName),
|
|
95
96
|
new FederationPlugin(federationPluginOptions),
|
|
96
97
|
new webpack.web.JsonpTemplatePlugin(),
|
|
97
98
|
new LoaderTargetPlugin('web'),
|
|
@@ -106,6 +107,7 @@ class ChildFederationPlugin {
|
|
|
106
107
|
else if (compiler.options.name === 'server') {
|
|
107
108
|
const { StreamingTargetPlugin, NodeFederationPlugin, } = require('@module-federation/node');
|
|
108
109
|
plugins = [
|
|
110
|
+
new webpack.EntryPlugin(compiler.context, require.resolve('../internal-delegate-hoist'), buildName),
|
|
109
111
|
new NodeFederationPlugin(federationPluginOptions, {
|
|
110
112
|
ModuleFederationPlugin: FederationPlugin,
|
|
111
113
|
}),
|
|
@@ -113,7 +115,7 @@ class ChildFederationPlugin {
|
|
|
113
115
|
//TODO: Externals function needs to internalize any shared module for host and remote build
|
|
114
116
|
new webpack.ExternalsPlugin(compiler.options.externalsType, [
|
|
115
117
|
// next dynamic needs to be within webpack, cannot be externalized
|
|
116
|
-
...Object.keys(internal_1.DEFAULT_SHARE_SCOPE).filter((k) =>
|
|
118
|
+
...Object.keys(internal_1.DEFAULT_SHARE_SCOPE).filter((k) => k !== 'next/dynamic' && k !== 'next/link' && k !== 'next/script'),
|
|
117
119
|
'react/jsx-runtime',
|
|
118
120
|
'react/jsx-dev-runtime',
|
|
119
121
|
]),
|
|
@@ -131,7 +133,9 @@ class ChildFederationPlugin {
|
|
|
131
133
|
}
|
|
132
134
|
const childCompiler = compilation.createChildCompiler(CHILD_PLUGIN_NAME, childOutput, plugins);
|
|
133
135
|
if (!isServer) {
|
|
134
|
-
new node_1.ChunkCorrelationPlugin({
|
|
136
|
+
new node_1.ChunkCorrelationPlugin({
|
|
137
|
+
filename: 'static/ssr/federated-stats.json',
|
|
138
|
+
}).apply(childCompiler);
|
|
135
139
|
}
|
|
136
140
|
childCompiler.outputPath = outputPath;
|
|
137
141
|
childCompiler.options.module.rules.forEach((rule) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChildFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/ChildFederationPlugin.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"ChildFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/ChildFederationPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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,UAAU,GAAG,EAAE,MAAM;QACjD,qBAAqB;QACrB,IACE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,iBAAiB,EACvE;YACA,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;IAC5D,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,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAa,CAAA,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/ModuleFederationPlugin.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ModuleFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/ModuleFederationPlugin.ts"],"names":[],"mappings":";;AAMA,MAAqB,sBAAsB;IAGzC,YAAY,OAAsC;QAChD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IACD,KAAK,CAAC,QAAkB;QACtB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QACjC,MAAM,EAAE,eAAe,EAAE,wBAAwB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;QACxE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACvE,MAAM,UAAU,GACd,OAAO,CAAC,UAAU;YAClB,CAAC,OAAO,CAAC,OAAO,IAAK,OAAO,CAAC,OAAO,CAAC,IAAsB,CAAC;YAC5D,QAAQ,CAAC;QAEX,IACE,OAAO;YACP,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EACpE;YACA,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACjE;QAED,IACE,OAAO,CAAC,OAAO;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAC5C;YACA,IAAI,eAAe,CAAC;gBAClB,IAAI,EAAE,OAAO,CAAC,IAAc;gBAC5B,OAAO;gBACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACpB;QACD,IACE,OAAO,CAAC,OAAO;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBAC5B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,EAC5C;YACA,IAAI,wBAAwB,CAAC;gBAC3B,UAAU;gBACV,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACpB;QACD,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,WAAW,CAAC;gBACd,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACpB;IACH,CAAC;CACF;AAxDD,yCAwDC"}
|
|
@@ -52,8 +52,21 @@ class NextFederationPlugin {
|
|
|
52
52
|
this._options.filename = this._options.filename.replace('/chunks', '/ssr');
|
|
53
53
|
// should this be a plugin that we apply to the compiler?
|
|
54
54
|
(0, internal_1.internalizeSharedPackages)(this._options, compiler);
|
|
55
|
+
// module-federation/utilities uses internal webpack methods and must be bundled into runtime code.
|
|
56
|
+
if (Array.isArray(compiler.options.externals)) {
|
|
57
|
+
const originalExternals = compiler.options.externals[0];
|
|
58
|
+
compiler.options.externals[0] = function (ctx, callback) {
|
|
59
|
+
if (ctx.request &&
|
|
60
|
+
ctx.request.includes('@module-federation/utilities')) {
|
|
61
|
+
return callback();
|
|
62
|
+
}
|
|
63
|
+
// @ts-ignore
|
|
64
|
+
return originalExternals(ctx, callback);
|
|
65
|
+
};
|
|
66
|
+
}
|
|
55
67
|
}
|
|
56
68
|
else {
|
|
69
|
+
new webpack.EntryPlugin(compiler.context, require.resolve('../internal-delegate-hoist'), 'main').apply(compiler);
|
|
57
70
|
if (this._extraOptions.automaticPageStitching) {
|
|
58
71
|
compiler.options.module.rules.push({
|
|
59
72
|
test: /next[\\/]dist[\\/]client[\\/]page-loader\.js$/,
|
|
@@ -75,7 +88,8 @@ class NextFederationPlugin {
|
|
|
75
88
|
//patch next
|
|
76
89
|
compiler.options.module.rules.push({
|
|
77
90
|
test(req) {
|
|
78
|
-
if (req.includes(path_1.default.join(compiler.context, 'pages')) ||
|
|
91
|
+
if (req.includes(path_1.default.join(compiler.context, 'pages/')) ||
|
|
92
|
+
req.includes(path_1.default.join(compiler.context, 'app/'))) {
|
|
79
93
|
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(req);
|
|
80
94
|
}
|
|
81
95
|
return false;
|
|
@@ -84,17 +98,53 @@ class NextFederationPlugin {
|
|
|
84
98
|
exclude: /node_modules/,
|
|
85
99
|
loader: path_1.default.resolve(__dirname, '../loaders/patchDefaultSharedLoader'),
|
|
86
100
|
});
|
|
101
|
+
if (this._options.remotes) {
|
|
102
|
+
const delegates = (0, internal_1.getDelegates)(this._options.remotes);
|
|
103
|
+
// only apply loader if delegates are present
|
|
104
|
+
if (delegates && Object.keys(delegates).length > 0) {
|
|
105
|
+
compiler.options.module.rules.push({
|
|
106
|
+
test(req) {
|
|
107
|
+
if (isServer) {
|
|
108
|
+
// server has no common chunk or entry to hoist into
|
|
109
|
+
if (req.includes(path_1.default.join(compiler.context, 'pages/')) ||
|
|
110
|
+
req.includes(path_1.default.join(compiler.context, 'app/'))) {
|
|
111
|
+
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(req);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
if (req.includes('internal-delegate-hoist')) {
|
|
115
|
+
return true;
|
|
116
|
+
}
|
|
117
|
+
return false;
|
|
118
|
+
},
|
|
119
|
+
resourceQuery: this._extraOptions.automaticAsyncBoundary
|
|
120
|
+
? (query) => !query.includes('hasBoundary')
|
|
121
|
+
: undefined,
|
|
122
|
+
include: [compiler.context, /internal-delegate-hoist/],
|
|
123
|
+
exclude: (request) => {
|
|
124
|
+
if (request.includes('internal-delegate-hoist')) {
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
127
|
+
return /node_modules/.test(request);
|
|
128
|
+
},
|
|
129
|
+
loader: path_1.default.resolve(__dirname, '../loaders/delegateLoader'),
|
|
130
|
+
options: {
|
|
131
|
+
delegates,
|
|
132
|
+
},
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
}
|
|
87
136
|
if (this._extraOptions.automaticAsyncBoundary) {
|
|
88
137
|
compiler.options.module.rules.push({
|
|
89
138
|
test: (request) => {
|
|
90
|
-
if (request.includes(path_1.default.join(compiler.context, 'pages')) ||
|
|
139
|
+
if (request.includes(path_1.default.join(compiler.context, 'pages/')) ||
|
|
140
|
+
request.includes(path_1.default.join(compiler.context, 'app/'))) {
|
|
91
141
|
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(request);
|
|
92
142
|
}
|
|
93
143
|
return false;
|
|
94
144
|
},
|
|
95
145
|
exclude: [/node_modules/, /_document/, /_middleware/, /pages\/api/],
|
|
96
146
|
resourceQuery: (query) => !query.includes('hasBoundary'),
|
|
97
|
-
loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader')
|
|
147
|
+
loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader'),
|
|
98
148
|
});
|
|
99
149
|
}
|
|
100
150
|
//todo runtime variable creation needs to be applied for server as well. this is just for client
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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"}
|
package/utils/Template.d.ts
CHANGED
package/utils/Template.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
MIT License http://www.opensource.org/licenses/mit-license.php
|
|
3
3
|
Author Tobias Koppers @sokra
|
|
4
4
|
*/
|
|
5
|
-
|
|
5
|
+
'use strict';
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS = exports.NUMBER_OF_IDENTIFIER_START_CHARS = void 0;
|
|
8
8
|
const webpack_sources_1 = require("webpack-sources");
|
|
@@ -21,9 +21,9 @@ const webpack_sources_1 = require("webpack-sources");
|
|
|
21
21
|
/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
|
|
22
22
|
/** @typedef {import("./javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
|
|
23
23
|
/** @typedef {import("./javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
|
|
24
|
-
const START_LOWERCASE_ALPHABET_CODE =
|
|
25
|
-
const START_UPPERCASE_ALPHABET_CODE =
|
|
26
|
-
const DELTA_A_TO_Z =
|
|
24
|
+
const START_LOWERCASE_ALPHABET_CODE = 'a'.charCodeAt(0);
|
|
25
|
+
const START_UPPERCASE_ALPHABET_CODE = 'A'.charCodeAt(0);
|
|
26
|
+
const DELTA_A_TO_Z = 'z'.charCodeAt(0) - START_LOWERCASE_ALPHABET_CODE + 1;
|
|
27
27
|
exports.NUMBER_OF_IDENTIFIER_START_CHARS = DELTA_A_TO_Z * 2 + 2; // a-z A-Z _ $
|
|
28
28
|
exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS = exports.NUMBER_OF_IDENTIFIER_START_CHARS + 10; // a-z A-Z _ $ 0-9
|
|
29
29
|
const FUNCTION_CONTENT_REGEX = /^function\s?\(\)\s?\{\r?\n?|\r?\n?\}$/g;
|
|
@@ -83,20 +83,20 @@ class Template {
|
|
|
83
83
|
static getFunctionContent(fn) {
|
|
84
84
|
return fn
|
|
85
85
|
.toString()
|
|
86
|
-
.replace(FUNCTION_CONTENT_REGEX,
|
|
87
|
-
.replace(INDENT_MULTILINE_REGEX,
|
|
88
|
-
.replace(LINE_SEPARATOR_REGEX,
|
|
86
|
+
.replace(FUNCTION_CONTENT_REGEX, '')
|
|
87
|
+
.replace(INDENT_MULTILINE_REGEX, '')
|
|
88
|
+
.replace(LINE_SEPARATOR_REGEX, '\n');
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
91
|
* @param {string} str the string converted to identifier
|
|
92
92
|
* @returns {string} created identifier
|
|
93
93
|
*/
|
|
94
94
|
static toIdentifier(str) {
|
|
95
|
-
if (typeof str !==
|
|
96
|
-
return
|
|
95
|
+
if (typeof str !== 'string')
|
|
96
|
+
return '';
|
|
97
97
|
return str
|
|
98
|
-
.replace(IDENTIFIER_NAME_REPLACE_REGEX,
|
|
99
|
-
.replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX,
|
|
98
|
+
.replace(IDENTIFIER_NAME_REPLACE_REGEX, '_$1')
|
|
99
|
+
.replace(IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX, '_');
|
|
100
100
|
}
|
|
101
101
|
/**
|
|
102
102
|
*
|
|
@@ -105,8 +105,8 @@ class Template {
|
|
|
105
105
|
*/
|
|
106
106
|
static toComment(str) {
|
|
107
107
|
if (!str)
|
|
108
|
-
return
|
|
109
|
-
return `/*! ${str.replace(COMMENT_END_REGEX,
|
|
108
|
+
return '';
|
|
109
|
+
return `/*! ${str.replace(COMMENT_END_REGEX, '* /')} */`;
|
|
110
110
|
}
|
|
111
111
|
/**
|
|
112
112
|
*
|
|
@@ -115,19 +115,19 @@ class Template {
|
|
|
115
115
|
*/
|
|
116
116
|
static toNormalComment(str) {
|
|
117
117
|
if (!str)
|
|
118
|
-
return
|
|
119
|
-
return `/* ${str.replace(COMMENT_END_REGEX,
|
|
118
|
+
return '';
|
|
119
|
+
return `/* ${str.replace(COMMENT_END_REGEX, '* /')} */`;
|
|
120
120
|
}
|
|
121
121
|
/**
|
|
122
122
|
* @param {string} str string path to be normalized
|
|
123
123
|
* @returns {string} normalized bundle-safe path
|
|
124
124
|
*/
|
|
125
125
|
static toPath(str) {
|
|
126
|
-
if (typeof str !==
|
|
127
|
-
return
|
|
126
|
+
if (typeof str !== 'string')
|
|
127
|
+
return '';
|
|
128
128
|
return str
|
|
129
|
-
.replace(PATH_NAME_NORMALIZE_REPLACE_REGEX,
|
|
130
|
-
.replace(MATCH_PADDED_HYPHENS_REPLACE_REGEX,
|
|
129
|
+
.replace(PATH_NAME_NORMALIZE_REPLACE_REGEX, '-')
|
|
130
|
+
.replace(MATCH_PADDED_HYPHENS_REPLACE_REGEX, '');
|
|
131
131
|
}
|
|
132
132
|
// map number to a single character a-z, A-Z or multiple characters if number is too big
|
|
133
133
|
/**
|
|
@@ -150,8 +150,8 @@ class Template {
|
|
|
150
150
|
return String.fromCharCode(START_UPPERCASE_ALPHABET_CODE + n);
|
|
151
151
|
}
|
|
152
152
|
if (n === DELTA_A_TO_Z)
|
|
153
|
-
return
|
|
154
|
-
return
|
|
153
|
+
return '_';
|
|
154
|
+
return '$';
|
|
155
155
|
}
|
|
156
156
|
/**
|
|
157
157
|
* @param {number} n number to convert to ident
|
|
@@ -178,8 +178,8 @@ class Template {
|
|
|
178
178
|
return `${n}`;
|
|
179
179
|
}
|
|
180
180
|
if (n === 10)
|
|
181
|
-
return
|
|
182
|
-
return
|
|
181
|
+
return '_';
|
|
182
|
+
return '$';
|
|
183
183
|
}
|
|
184
184
|
/**
|
|
185
185
|
*
|
|
@@ -188,14 +188,14 @@ class Template {
|
|
|
188
188
|
*/
|
|
189
189
|
static indent(s) {
|
|
190
190
|
if (Array.isArray(s)) {
|
|
191
|
-
return s.map(Template.indent).join(
|
|
191
|
+
return s.map(Template.indent).join('\n');
|
|
192
192
|
}
|
|
193
193
|
else {
|
|
194
194
|
const str = s.trimRight();
|
|
195
195
|
if (!str)
|
|
196
|
-
return
|
|
197
|
-
const ind = str[0] ===
|
|
198
|
-
return ind + str.replace(/\n([^\n])/g,
|
|
196
|
+
return '';
|
|
197
|
+
const ind = str[0] === '\n' ? '' : '\t';
|
|
198
|
+
return ind + str.replace(/\n([^\n])/g, '\n\t$1');
|
|
199
199
|
}
|
|
200
200
|
}
|
|
201
201
|
/**
|
|
@@ -207,9 +207,9 @@ class Template {
|
|
|
207
207
|
static prefix(s, prefix) {
|
|
208
208
|
const str = Template.asString(s).trim();
|
|
209
209
|
if (!str)
|
|
210
|
-
return
|
|
211
|
-
const ind = str[0] ===
|
|
212
|
-
return ind + str.replace(/\n([^\n])/g,
|
|
210
|
+
return '';
|
|
211
|
+
const ind = str[0] === '\n' ? '' : prefix;
|
|
212
|
+
return ind + str.replace(/\n([^\n])/g, '\n' + prefix + '$1');
|
|
213
213
|
}
|
|
214
214
|
/**
|
|
215
215
|
*
|
|
@@ -218,7 +218,7 @@ class Template {
|
|
|
218
218
|
*/
|
|
219
219
|
static asString(str) {
|
|
220
220
|
if (Array.isArray(str)) {
|
|
221
|
-
return str.join(
|
|
221
|
+
return str.join('\n');
|
|
222
222
|
}
|
|
223
223
|
return str;
|
|
224
224
|
}
|
|
@@ -236,14 +236,14 @@ class Template {
|
|
|
236
236
|
let minId = Infinity;
|
|
237
237
|
for (const module of modules) {
|
|
238
238
|
const moduleId = module.id;
|
|
239
|
-
if (typeof moduleId !==
|
|
239
|
+
if (typeof moduleId !== 'number')
|
|
240
240
|
return false;
|
|
241
241
|
if (maxId < moduleId)
|
|
242
242
|
maxId = moduleId;
|
|
243
243
|
if (minId > moduleId)
|
|
244
244
|
minId = moduleId;
|
|
245
245
|
}
|
|
246
|
-
if (minId < 16 + (
|
|
246
|
+
if (minId < 16 + ('' + minId).length) {
|
|
247
247
|
// add minId x ',' instead of 'Array(minId).concat(…)'
|
|
248
248
|
minId = 0;
|
|
249
249
|
}
|
|
@@ -264,17 +264,17 @@ class Template {
|
|
|
264
264
|
* @param {string=} prefix applying prefix strings
|
|
265
265
|
* @returns {Source} rendered chunk modules in a Source object
|
|
266
266
|
*/
|
|
267
|
-
static renderChunkModules(renderContext, modules, renderModule, prefix =
|
|
267
|
+
static renderChunkModules(renderContext, modules, renderModule, prefix = '') {
|
|
268
268
|
const { chunkGraph } = renderContext;
|
|
269
269
|
var source = new webpack_sources_1.ConcatSource();
|
|
270
270
|
if (modules.length === 0) {
|
|
271
271
|
return null;
|
|
272
272
|
}
|
|
273
273
|
/** @type {{id: string|number, source: Source|string}[]} */
|
|
274
|
-
const allModules = modules.map(module => {
|
|
274
|
+
const allModules = modules.map((module) => {
|
|
275
275
|
return {
|
|
276
276
|
id: chunkGraph.getModuleId(module),
|
|
277
|
-
source: renderModule(module) ||
|
|
277
|
+
source: renderModule(module) || 'false',
|
|
278
278
|
};
|
|
279
279
|
});
|
|
280
280
|
const bounds = Template.getModulesArrayBounds(allModules);
|
|
@@ -285,7 +285,7 @@ class Template {
|
|
|
285
285
|
if (minId !== 0) {
|
|
286
286
|
source.add(`Array(${minId}).concat(`);
|
|
287
287
|
}
|
|
288
|
-
source.add(
|
|
288
|
+
source.add('[\n');
|
|
289
289
|
/** @type {Map<string|number, {id: string|number, source: Source|string}>} */
|
|
290
290
|
const modules = new Map();
|
|
291
291
|
for (const module of allModules) {
|
|
@@ -294,26 +294,26 @@ class Template {
|
|
|
294
294
|
for (let idx = minId; idx <= maxId; idx++) {
|
|
295
295
|
const module = modules.get(idx);
|
|
296
296
|
if (idx !== minId) {
|
|
297
|
-
source.add(
|
|
297
|
+
source.add(',\n');
|
|
298
298
|
}
|
|
299
299
|
source.add(`/* ${idx} */`);
|
|
300
300
|
if (module) {
|
|
301
|
-
source.add(
|
|
301
|
+
source.add('\n');
|
|
302
302
|
source.add(module.source);
|
|
303
303
|
}
|
|
304
304
|
}
|
|
305
|
-
source.add(
|
|
305
|
+
source.add('\n' + prefix + ']');
|
|
306
306
|
if (minId !== 0) {
|
|
307
|
-
source.add(
|
|
307
|
+
source.add(')');
|
|
308
308
|
}
|
|
309
309
|
}
|
|
310
310
|
else {
|
|
311
311
|
// Render an object
|
|
312
|
-
source.add(
|
|
312
|
+
source.add('{\n');
|
|
313
313
|
for (let i = 0; i < allModules.length; i++) {
|
|
314
314
|
const module = allModules[i];
|
|
315
315
|
if (i !== 0) {
|
|
316
|
-
source.add(
|
|
316
|
+
source.add(',\n');
|
|
317
317
|
}
|
|
318
318
|
source.add(`\n/***/ ${JSON.stringify(module.id)}:\n`);
|
|
319
319
|
source.add(module.source);
|
|
@@ -333,7 +333,7 @@ class Template {
|
|
|
333
333
|
const codeGenerationResults = renderContext.codeGenerationResults;
|
|
334
334
|
let runtimeSource;
|
|
335
335
|
if (codeGenerationResults) {
|
|
336
|
-
runtimeSource = codeGenerationResults.getSource(module, renderContext.chunk.runtime,
|
|
336
|
+
runtimeSource = codeGenerationResults.getSource(module, renderContext.chunk.runtime, 'runtime');
|
|
337
337
|
}
|
|
338
338
|
else {
|
|
339
339
|
const codeGenResult = module.codeGeneration({
|
|
@@ -342,27 +342,27 @@ class Template {
|
|
|
342
342
|
moduleGraph: renderContext.moduleGraph,
|
|
343
343
|
runtimeTemplate: renderContext.runtimeTemplate,
|
|
344
344
|
runtime: renderContext.chunk.runtime,
|
|
345
|
-
codeGenerationResults
|
|
345
|
+
codeGenerationResults,
|
|
346
346
|
});
|
|
347
347
|
if (!codeGenResult)
|
|
348
348
|
continue;
|
|
349
|
-
runtimeSource = codeGenResult.sources.get(
|
|
349
|
+
runtimeSource = codeGenResult.sources.get('runtime');
|
|
350
350
|
}
|
|
351
351
|
if (runtimeSource) {
|
|
352
|
-
source.add(Template.toNormalComment(module.identifier()) +
|
|
352
|
+
source.add(Template.toNormalComment(module.identifier()) + '\n');
|
|
353
353
|
if (!module.shouldIsolate()) {
|
|
354
354
|
source.add(runtimeSource);
|
|
355
|
-
source.add(
|
|
355
|
+
source.add('\n\n');
|
|
356
356
|
}
|
|
357
357
|
else if (renderContext.runtimeTemplate.supportsArrowFunction()) {
|
|
358
|
-
source.add(
|
|
359
|
-
source.add(new webpack_sources_1.PrefixSource(
|
|
360
|
-
source.add(
|
|
358
|
+
source.add('(() => {\n');
|
|
359
|
+
source.add(new webpack_sources_1.PrefixSource('\t', runtimeSource));
|
|
360
|
+
source.add('\n})();\n\n');
|
|
361
361
|
}
|
|
362
362
|
else {
|
|
363
|
-
source.add(
|
|
364
|
-
source.add(new webpack_sources_1.PrefixSource(
|
|
365
|
-
source.add(
|
|
363
|
+
source.add('!function() {\n');
|
|
364
|
+
source.add(new webpack_sources_1.PrefixSource('\t', runtimeSource));
|
|
365
|
+
source.add('\n}();\n\n');
|
|
366
366
|
}
|
|
367
367
|
}
|
|
368
368
|
}
|
|
@@ -374,7 +374,7 @@ class Template {
|
|
|
374
374
|
* @returns {Source} rendered chunk runtime modules in a Source object
|
|
375
375
|
*/
|
|
376
376
|
static renderChunkRuntimeModules(runtimeModules, renderContext) {
|
|
377
|
-
return new webpack_sources_1.PrefixSource(
|
|
377
|
+
return new webpack_sources_1.PrefixSource('/******/ ', new webpack_sources_1.ConcatSource('function(__webpack_require__) { // webpackRuntimeModules\n', this.renderRuntimeModules(runtimeModules, renderContext), '}\n'));
|
|
378
378
|
}
|
|
379
379
|
}
|
|
380
380
|
exports.default = Template;
|
package/utils/Template.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/utils/Template.ts"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;;;AAEb,
|
|
1
|
+
{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/utils/Template.ts"],"names":[],"mappings":"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"}
|
package/utils/build-utils.d.ts
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
export declare const computeRemoteFilename: (isServer: boolean, filename: string) => string;
|
|
2
|
+
/**
|
|
3
|
+
* @deprecated This function is being deprecated in favor of delegate modules
|
|
4
|
+
*/
|
|
2
5
|
export declare const promiseFactory: (factory: string | Function) => string;
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated This function is being deprecated in favor of delegate modules
|
|
8
|
+
*/
|
|
3
9
|
export declare const promiseTemplate: (remote: string, ...otherPromises: Function[]) => string;
|