@module-federation/nextjs-mf 5.9.11 → 5.9.13

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 CHANGED
@@ -2,6 +2,23 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [5.9.13](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.9.12...nextjs-mf-5.9.13) (2022-10-14)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * improve include defaults loader ([#315](https://github.com/module-federation/nextjs-mf/issues/315)) ([f228e49](https://github.com/module-federation/nextjs-mf/commit/f228e49afbbe54950b4187b72aabaef8174d0758))
11
+
12
+
13
+
14
+ ## [5.9.12](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.9.11...nextjs-mf-5.9.12) (2022-10-13)
15
+
16
+ ### Dependency Updates
17
+
18
+ * `node` updated to version `0.6.4`
19
+ * `utils` updated to version `0.3.3`
20
+
21
+
5
22
  ## [5.9.11](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.9.10...nextjs-mf-5.9.11) (2022-10-12)
6
23
 
7
24
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/nextjs-mf",
3
- "version": "5.9.11",
3
+ "version": "5.9.13",
4
4
  "license": "MIT",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
@@ -19,8 +19,8 @@
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.6.3",
23
- "@module-federation/utilities": "0.3.2",
22
+ "@module-federation/node": "0.6.4",
23
+ "@module-federation/utilities": "0.3.3",
24
24
  "@swc/core": "^1.3.3",
25
25
  "tslib": "^2.3.0"
26
26
  },
@@ -9,13 +9,14 @@ const path_1 = tslib_1.__importDefault(require("path"));
9
9
  */
10
10
  function patchDefaultSharedLoader(content) {
11
11
  if (content.includes('include-defaults')) {
12
- // If MFClient already applied then skip patch
12
+ // If already patched, return
13
13
  return content;
14
14
  }
15
15
  // avoid absolute paths as they break hashing when the root for the project is moved
16
16
  // @see https://webpack.js.org/contribute/writing-a-loader/#absolute-paths
17
17
  const pathIncludeDefaults = path_1.default.relative(this.context, path_1.default.resolve(__dirname, '../include-defaults.js'));
18
18
  return [
19
+ '',
19
20
  `require(${JSON.stringify(pathIncludeDefaults)});`,
20
21
  content
21
22
  ].join("\n");
@@ -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,8CAA8C;QAC9C,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,WAAW,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI;QAClD,OAAO;KACR,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACd,CAAC;AApBD,2CAoBC"}
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,mBAAmB,CAAC,IAAI;QAClD,OAAO;KACR,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAEd,CAAC;AAtBD,2CAsBC"}
@@ -52,18 +52,8 @@ 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
- //patch next
56
- compiler.options.module.rules.push({
57
- test: /next[\\/]dist/,
58
- loader: path_1.default.resolve(__dirname, '../loaders/patchDefaultSharedLoader'),
59
- });
60
55
  }
61
56
  else {
62
- //patch next
63
- compiler.options.module.rules.push({
64
- test: /next[\\/]dist[\\/]client/,
65
- loader: path_1.default.resolve(__dirname, '../loaders/patchDefaultSharedLoader'),
66
- });
67
57
  if (this._extraOptions.automaticPageStitching) {
68
58
  compiler.options.module.rules.push({
69
59
  test: /next[\\/]dist[\\/]client[\\/]page-loader\.js$/,
@@ -82,6 +72,15 @@ class NextFederationPlugin {
82
72
  name: this._options.name,
83
73
  };
84
74
  }
75
+ //patch next
76
+ compiler.options.module.rules.push({
77
+ test(req) {
78
+ return (req.includes('/pages/') || req.includes('/app/') && (req.includes('.js') || req.includes('.ts') || req.includes('.mjs')));
79
+ },
80
+ include: compiler.context,
81
+ exclude: /node_modules/,
82
+ loader: path_1.default.resolve(__dirname, '../loaders/patchDefaultSharedLoader'),
83
+ });
85
84
  //todo runtime variable creation needs to be applied for server as well. this is just for client
86
85
  // TODO: this needs to be refactored into something more comprehensive. this is just a quick fix
87
86
  new webpack.DefinePlugin({
@@ -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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"}