@module-federation/nextjs-mf 6.2.1 → 6.2.3
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 +12 -33
- package/client/RemoteContainer.js +1 -1
- package/client/RemoteContainer.js.map +1 -1
- package/package.json +6 -6
- package/src/loaders/async-boundary-loader.d.ts +1 -1
- package/src/loaders/async-boundary-loader.js +26 -46
- package/src/loaders/async-boundary-loader.js.map +1 -1
- package/src/plugins/NextFederationPlugin.js +51 -16
- 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.3](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.2.2...nextjs-mf-6.2.3) (2023-04-09)
|
|
6
|
+
|
|
7
|
+
### Dependency Updates
|
|
8
|
+
|
|
9
|
+
* `utils` updated to version `1.4.1`
|
|
10
|
+
* `utils` updated to version `1.4.1`
|
|
11
|
+
* `node` updated to version `0.12.3`
|
|
12
|
+
* `node` updated to version `0.12.3`
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
* loader handling of getServerProps ([#697](https://github.com/module-federation/nextjs-mf/issues/697)) ([aade75c](https://github.com/module-federation/nextjs-mf/commit/aade75c450c5773c9c21fe4f3d29ed4c1409a532))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
## [6.2.2](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.2.1...nextjs-mf-6.2.2) (2023-03-24)
|
|
21
|
+
|
|
22
|
+
### Dependency Updates
|
|
23
|
+
|
|
24
|
+
* `node` updated to version `0.12.2`
|
|
25
|
+
* `node` updated to version `0.12.2`
|
|
26
|
+
|
|
27
|
+
|
|
5
28
|
## [6.2.1](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.2.0...nextjs-mf-6.2.1) (2023-03-18)
|
|
6
29
|
|
|
7
30
|
|
package/README.md
CHANGED
|
@@ -175,9 +175,7 @@ module.exports = {
|
|
|
175
175
|
new NextFederationPlugin({
|
|
176
176
|
name: 'next2',
|
|
177
177
|
remotes: {
|
|
178
|
-
next1: `next1@http://localhost:3001/_next/static/${
|
|
179
|
-
isServer ? 'ssr' : 'chunks'
|
|
180
|
-
}/remoteEntry.js`,
|
|
178
|
+
next1: `next1@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
181
179
|
},
|
|
182
180
|
filename: 'static/chunks/remoteEntry.js',
|
|
183
181
|
exposes: {
|
|
@@ -215,9 +213,7 @@ module.exports = {
|
|
|
215
213
|
new NextFederationPlugin({
|
|
216
214
|
name: 'next1',
|
|
217
215
|
remotes: {
|
|
218
|
-
next2: `next2@http://localhost:3000/_next/static/${
|
|
219
|
-
isServer ? 'ssr' : 'chunks'
|
|
220
|
-
}/remoteEntry.js`,
|
|
216
|
+
next2: `next2@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
221
217
|
},
|
|
222
218
|
})
|
|
223
219
|
);
|
|
@@ -237,12 +233,9 @@ import '@module-federation/nextjs-mf/src/include-defaults';
|
|
|
237
233
|
```js
|
|
238
234
|
import dynamic from 'next/dynamic';
|
|
239
235
|
|
|
240
|
-
const SampleComponent = dynamic(
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
ssr: false,
|
|
244
|
-
}
|
|
245
|
-
);
|
|
236
|
+
const SampleComponent = dynamic(() => window.next2.get('./sampleComponent').then((factory) => factory()), {
|
|
237
|
+
ssr: false,
|
|
238
|
+
});
|
|
246
239
|
|
|
247
240
|
// or
|
|
248
241
|
|
|
@@ -283,9 +276,7 @@ If an error occurs while loading the script, a custom error object is created an
|
|
|
283
276
|
const { createDelegatedModule } = require('@module-federation/utilities');
|
|
284
277
|
const remotes = {
|
|
285
278
|
checkout: createDelegatedModule(require.resolve('./remote-delegate.js'), {
|
|
286
|
-
remote: `checkout@http://localhost:3002/_next/static/${
|
|
287
|
-
isServer ? 'ssr' : 'chunks'
|
|
288
|
-
}/remoteEntry.js`,
|
|
279
|
+
remote: `checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
289
280
|
}),
|
|
290
281
|
};
|
|
291
282
|
|
|
@@ -339,12 +330,8 @@ For more information on `__resourceQuery` visit: https://webpack.js.org/api/modu
|
|
|
339
330
|
const remotes = {
|
|
340
331
|
// pass pointer to remote-delegate, pass delegate remote name as query param,
|
|
341
332
|
// at runtime webpack will pass this as __resourceQuery
|
|
342
|
-
shop: `internal ./remote-delegate.js?remote=shop@http://localhost:3001/_next/static/${
|
|
343
|
-
|
|
344
|
-
}/remoteEntry.js`,
|
|
345
|
-
checkout: `internal ./remote-delegate.js?remote=checkout@http://localhost:3002/_next/static/${
|
|
346
|
-
isServer ? 'ssr' : 'chunks'
|
|
347
|
-
}/remoteEntry.js`,
|
|
333
|
+
shop: `internal ./remote-delegate.js?remote=shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
334
|
+
checkout: `internal ./remote-delegate.js?remote=checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
348
335
|
};
|
|
349
336
|
```
|
|
350
337
|
|
|
@@ -359,12 +346,8 @@ const remotes = {
|
|
|
359
346
|
const remotes = {
|
|
360
347
|
// pass pointer to remote-delegate, pass deletae remote name as query param,
|
|
361
348
|
// at runtime webpack will pass this as __resourceQuery
|
|
362
|
-
shop: `internal ./remote-delegate.js?remote=shop@http://localhost:3001/_next/static/${
|
|
363
|
-
|
|
364
|
-
}/remoteEntry.js`,
|
|
365
|
-
checkout: `internal ./remote-delegate.js?remote=checkout@http://localhost:3002/_next/static/${
|
|
366
|
-
isServer ? 'ssr' : 'chunks'
|
|
367
|
-
}/remoteEntry.js`,
|
|
349
|
+
shop: `internal ./remote-delegate.js?remote=shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
350
|
+
checkout: `internal ./remote-delegate.js?remote=checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`,
|
|
368
351
|
};
|
|
369
352
|
|
|
370
353
|
// remote-delegate.js
|
|
@@ -392,15 +375,11 @@ module.exports = new Promise((resolve, reject) => {
|
|
|
392
375
|
url,
|
|
393
376
|
function (event) {
|
|
394
377
|
// resolve promise with container, for browser env or node env.
|
|
395
|
-
const container =
|
|
396
|
-
typeof window === 'undefined'
|
|
397
|
-
? global.__remote_scope__[containerGlobal]
|
|
398
|
-
: window[containerGlobal];
|
|
378
|
+
const container = typeof window === 'undefined' ? global.__remote_scope__[containerGlobal] : window[containerGlobal];
|
|
399
379
|
console.log('delegate resolving', container);
|
|
400
380
|
if (typeof container !== 'undefined') return resolve(container);
|
|
401
381
|
var realSrc = event && event.target && event.target.src;
|
|
402
|
-
__webpack_error__.message =
|
|
403
|
-
'Loading script failed.\\n(' + event.message + ': ' + realSrc + ')';
|
|
382
|
+
__webpack_error__.message = 'Loading script failed.\\n(' + event.message + ': ' + realSrc + ')';
|
|
404
383
|
__webpack_error__.name = 'ScriptExternalLoadError';
|
|
405
384
|
__webpack_error__.stack = event.stack;
|
|
406
385
|
reject(__webpack_error__);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RemoteContainer.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/client/RemoteContainer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RemoteContainer.js","sourceRoot":"","sources":["../../../../packages/nextjs-mf/client/RemoteContainer.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": "6.2.
|
|
3
|
+
"version": "6.2.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"registry": "https://registry.npmjs.org/"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@module-federation/node": "0.12.
|
|
19
|
+
"@module-federation/node": "0.12.2",
|
|
20
|
+
"encoding": "0.1.13",
|
|
20
21
|
"eventemitter3": "4.0.7",
|
|
21
|
-
"fast-glob": "
|
|
22
|
-
"webpack-sources": "3.2.3",
|
|
23
|
-
"@module-federation/utilities": "1.4.0",
|
|
22
|
+
"fast-glob": "3.2.12",
|
|
24
23
|
"node-fetch": "2.6.7",
|
|
25
|
-
"
|
|
24
|
+
"webpack-sources": "3.2.3",
|
|
25
|
+
"@module-federation/utilities": "1.4.1"
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|
|
28
28
|
"next": "^12 || ^13",
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import type { LoaderContext } from 'webpack';
|
|
2
|
-
export
|
|
2
|
+
export default function (this: LoaderContext<Record<string, unknown>>, source: string, sourceMap: string): void;
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
Author Zack Jackson @ScriptedAlchemy
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.pitch = void 0;
|
|
8
7
|
const pageTemplate = (request) => `
|
|
9
8
|
import dynamic from "next/dynamic"
|
|
10
9
|
const AsyncBoundary = dynamic(() => import("${request}"), {suspense:true});
|
|
@@ -39,51 +38,32 @@ const getStaticPathsTemplate = (request) => `
|
|
|
39
38
|
})
|
|
40
39
|
}
|
|
41
40
|
`;
|
|
42
|
-
|
|
41
|
+
function default_1(source, sourceMap) {
|
|
43
42
|
this.cacheable && this.cacheable();
|
|
44
43
|
const callback = this.async();
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const hasGSPT = !!source.includes('getStaticPaths');
|
|
71
|
-
const relativeResource = this.utils.contextify(this.context, this.resource);
|
|
72
|
-
const result = [pageTemplate(`${relativeResource}?hasBoundary`)];
|
|
73
|
-
if (hasGIP) {
|
|
74
|
-
result.push(getInitialPropsTemplate(`${relativeResource}?hasBoundary`));
|
|
75
|
-
}
|
|
76
|
-
if (hasGSP) {
|
|
77
|
-
result.push(getStaticPropsTemplate(`${relativeResource}?hasBoundary`));
|
|
78
|
-
}
|
|
79
|
-
if (hasGSSP) {
|
|
80
|
-
result.push(getServerSidePropsTemplate(`${relativeResource}?hasBoundary`));
|
|
81
|
-
}
|
|
82
|
-
if (hasGSPT) {
|
|
83
|
-
result.push(getStaticPathsTemplate(`${relativeResource}?hasBoundary`));
|
|
84
|
-
}
|
|
85
|
-
callback(null, result.join('\n'));
|
|
86
|
-
});
|
|
87
|
-
};
|
|
88
|
-
exports.pitch = pitch;
|
|
44
|
+
if (this._compilation && this._compilation.name === 'ChildFederationPlugin') {
|
|
45
|
+
callback(null, source, sourceMap);
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
const hasGIP = source.includes('getInitialProps');
|
|
49
|
+
const hasGSP = source.includes('getStaticProps');
|
|
50
|
+
const hasGSSP = source.includes('getServerSideProps');
|
|
51
|
+
const hasGSPT = source.includes('getStaticPaths');
|
|
52
|
+
const relativeResource = this.utils.contextify(this.context, this.resource);
|
|
53
|
+
const result = [pageTemplate(`${relativeResource}?hasBoundary`)];
|
|
54
|
+
if (hasGIP) {
|
|
55
|
+
result.push(getInitialPropsTemplate(`${relativeResource}?hasBoundary`));
|
|
56
|
+
}
|
|
57
|
+
if (hasGSP) {
|
|
58
|
+
result.push(getStaticPropsTemplate(`${relativeResource}?hasBoundary`));
|
|
59
|
+
}
|
|
60
|
+
if (hasGSSP) {
|
|
61
|
+
result.push(getServerSidePropsTemplate(`${relativeResource}?hasBoundary`));
|
|
62
|
+
}
|
|
63
|
+
if (hasGSPT) {
|
|
64
|
+
result.push(getStaticPathsTemplate(`${relativeResource}?hasBoundary`));
|
|
65
|
+
}
|
|
66
|
+
callback(null, result.join('\n'));
|
|
67
|
+
}
|
|
68
|
+
exports.default = default_1;
|
|
89
69
|
//# 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":";AAAA;;;EAGE
|
|
1
|
+
{"version":3,"file":"async-boundary-loader.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/loaders/async-boundary-loader.ts"],"names":[],"mappings":";AAAA;;;EAGE;;AAIF,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CACvC;;kDAEgD,OAAO;;KAEpD,CAAC;AAEN,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,EAAE,CAClD;;uBAEqB,OAAO;;;;;KAKzB,CAAC;AAEN,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,EAAE,CACjD;;uBAEqB,OAAO;;;;KAIzB,CAAC;AAEN,MAAM,0BAA0B,GAAG,CAAC,OAAe,EAAE,EAAE,CACrD;;uBAEqB,OAAO;;;;KAIzB,CAAC;AAEN,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,EAAE,CACjD;;uBAEqB,OAAO;;;;KAIzB,CAAC;AAEN,mBAEE,MAAc,EACd,SAAiB;IAEjB,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAE9B,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,uBAAuB,EAAE;QAC3E,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAClC,OAAO;KACR;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAElD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAG,CAAC,YAAY,CAAC,GAAG,gBAAgB,cAAc,CAAC,CAAC,CAAC;IAEjE,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,gBAAgB,cAAc,CAAC,CAAC,CAAC;KACzE;IAED,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,gBAAgB,cAAc,CAAC,CAAC,CAAC;KACxE;IAED,IAAI,OAAO,EAAE;QACX,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,gBAAgB,cAAc,CAAC,CAAC,CAAC;KAC5E;IAED,IAAI,OAAO,EAAE;QACX,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,gBAAgB,cAAc,CAAC,CAAC,CAAC;KACxE;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACpC,CAAC;AAtCD,4BAsCC"}
|
|
@@ -12,6 +12,15 @@ const internal_1 = require("../internal");
|
|
|
12
12
|
const AddRuntimeRequirementToPromiseExternalPlugin_1 = tslib_1.__importDefault(require("./AddRuntimeRequirementToPromiseExternalPlugin"));
|
|
13
13
|
const ChildFederationPlugin_1 = tslib_1.__importDefault(require("./ChildFederationPlugin"));
|
|
14
14
|
const DevHmrFixInvalidPongPlugin_1 = tslib_1.__importDefault(require("./DevHmrFixInvalidPongPlugin"));
|
|
15
|
+
// @ts-ignore
|
|
16
|
+
const regexEqual = (x, y) => {
|
|
17
|
+
return (x instanceof RegExp &&
|
|
18
|
+
y instanceof RegExp &&
|
|
19
|
+
x.source === y.source &&
|
|
20
|
+
x.global === y.global &&
|
|
21
|
+
x.ignoreCase === y.ignoreCase &&
|
|
22
|
+
x.multiline === y.multiline);
|
|
23
|
+
};
|
|
15
24
|
class NextFederationPlugin {
|
|
16
25
|
constructor(options) {
|
|
17
26
|
const { extraOptions, ...mainOpts } = options;
|
|
@@ -139,23 +148,49 @@ class NextFederationPlugin {
|
|
|
139
148
|
}
|
|
140
149
|
}
|
|
141
150
|
if (this._extraOptions.automaticAsyncBoundary) {
|
|
142
|
-
compiler.options.module.rules.
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(request);
|
|
146
|
-
}
|
|
147
|
-
return false;
|
|
148
|
-
},
|
|
149
|
-
exclude: [
|
|
150
|
-
/node_modules/,
|
|
151
|
-
/_document/,
|
|
152
|
-
/_middleware/,
|
|
153
|
-
/pages[\\/]middleware/,
|
|
154
|
-
/pages[\\/]api/,
|
|
155
|
-
],
|
|
156
|
-
resourceQuery: (query) => !query.includes('hasBoundary'),
|
|
157
|
-
loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader'),
|
|
151
|
+
const jsRules = compiler.options.module.rules.find((r) => {
|
|
152
|
+
//@ts-ignore
|
|
153
|
+
return r && r.oneOf;
|
|
158
154
|
});
|
|
155
|
+
//@ts-ignore
|
|
156
|
+
if (jsRules && jsRules.oneOf) {
|
|
157
|
+
//@ts-ignore
|
|
158
|
+
const foundJsLayer = jsRules.oneOf.find((r) => {
|
|
159
|
+
return (regexEqual(r.test, /\.(tsx|ts|js|cjs|mjs|jsx)$/) && !r.issuerLayer);
|
|
160
|
+
});
|
|
161
|
+
if (foundJsLayer) {
|
|
162
|
+
let loaderChain = [];
|
|
163
|
+
if (Array.isArray(foundJsLayer.use)) {
|
|
164
|
+
loaderChain = [...foundJsLayer.use];
|
|
165
|
+
}
|
|
166
|
+
else {
|
|
167
|
+
loaderChain = [foundJsLayer.use];
|
|
168
|
+
}
|
|
169
|
+
//@ts-ignore
|
|
170
|
+
jsRules.oneOf.unshift({
|
|
171
|
+
test: (request) => {
|
|
172
|
+
if (allowedPaths.some((p) => request.includes(path_1.default.join(compiler.context, p)))) {
|
|
173
|
+
return /\.(js|jsx|ts|tsx|md|mdx|mjs)$/i.test(request);
|
|
174
|
+
}
|
|
175
|
+
return false;
|
|
176
|
+
},
|
|
177
|
+
exclude: [
|
|
178
|
+
/node_modules/,
|
|
179
|
+
/_document/,
|
|
180
|
+
/_middleware/,
|
|
181
|
+
/pages[\\/]middleware/,
|
|
182
|
+
/pages[\\/]api/,
|
|
183
|
+
],
|
|
184
|
+
resourceQuery: (query) => !query.includes('hasBoundary'),
|
|
185
|
+
use: [
|
|
186
|
+
...loaderChain,
|
|
187
|
+
{
|
|
188
|
+
loader: path_1.default.resolve(__dirname, '../loaders/async-boundary-loader'),
|
|
189
|
+
},
|
|
190
|
+
],
|
|
191
|
+
});
|
|
192
|
+
}
|
|
193
|
+
}
|
|
159
194
|
}
|
|
160
195
|
//todo runtime variable creation needs to be applied for server as well. this is just for client
|
|
161
196
|
// TODO: this needs to be refactored into something more comprehensive. this is just a quick fix
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NextFederationPlugin.js","sourceRoot":"","sources":["../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin.ts"],"names":[],"mappings":"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"}
|