@module-federation/nextjs-mf 5.12.12 → 6.0.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 CHANGED
@@ -2,6 +2,62 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ # [6.0.0](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.14...nextjs-mf-6.0.0) (2022-12-29)
6
+
7
+ ### Dependency Updates
8
+
9
+ * `node` updated to version `0.9.10`
10
+ * `utils` updated to version `1.0.4`
11
+
12
+ ### Features
13
+
14
+ * change module sharing strategy ([#469](https://github.com/module-federation/nextjs-mf/issues/469)) ([5fecf86](https://github.com/module-federation/nextjs-mf/commit/5fecf867f34b20e2c7cea3909a1f306d46d92bf3))
15
+
16
+
17
+ ### BREAKING CHANGES
18
+
19
+ * Previously, we used to "rekey" all shared packages used in a host in order to prevent eager consumption issues. However, this caused unforeseen issues when trying to share a singleton package, as the package would end up being bundled multiple times per page.
20
+
21
+ As a result, we have had to stop rekeying shared modules in userland and only do so on internal Next packages themselves.
22
+
23
+ If you need to dangerously share a package using the old method, you can do so by using the following code:
24
+
25
+ const shared = {
26
+ fakeLodash: {
27
+ import: "lodash",
28
+ shareKey: "lodash",
29
+ }
30
+ }
31
+
32
+ Please note that this method is now considered dangerous and should be used with caution.
33
+
34
+ * update build release
35
+
36
+ * update build release
37
+
38
+
39
+
40
+ ## [5.12.14](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.13...nextjs-mf-5.12.14) (2022-12-27)
41
+
42
+ ### Dependency Updates
43
+
44
+ * `node` updated to version `0.9.9`
45
+ * `utils` updated to version `1.0.3`
46
+
47
+
48
+ ## [5.12.13](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.12...nextjs-mf-5.12.13) (2022-12-27)
49
+
50
+ ### Dependency Updates
51
+
52
+ * `node` updated to version `0.9.8`
53
+ * `utils` updated to version `1.0.2`
54
+
55
+ ### Bug Fixes
56
+
57
+ * **nextjs-mf:** fix client-side compilation ([#453](https://github.com/module-federation/nextjs-mf/issues/453)) ([d97d764](https://github.com/module-federation/nextjs-mf/commit/d97d764ded8d3cb1b5e04829eaf226f0c5a3baa3))
58
+
59
+
60
+
5
61
  ## [5.12.12](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-5.12.11...nextjs-mf-5.12.12) (2022-12-20)
6
62
 
7
63
 
package/README.md CHANGED
@@ -47,6 +47,10 @@ const DEFAULT_SHARE_SCOPE = {
47
47
  requiredVersion: false,
48
48
  singleton: true,
49
49
  },
50
+ 'styled-jsx/style': {
51
+ requiredVersion: false,
52
+ singleton: true,
53
+ },
50
54
  'next/link': {
51
55
  requiredVersion: false,
52
56
  singleton: true,
@@ -124,6 +128,25 @@ new NextFederationPlugin({
124
128
  - `automaticAsyncBoundary` – adds automatic async boundary for all federated modules. It's required for sync imports to work.
125
129
  - `skipSharingNextInternals` – disables sharing of next internals. You can use it if you want to share next internals yourself or want to use this plugin on non next applications
126
130
 
131
+ ### BREAKING CHANGE ABOUT SHARED MODULES:
132
+
133
+ Previously, we used to "rekey" all shared packages used in a host in order to prevent eager consumption issues. However, this caused unforeseen issues when trying to share a singleton package, as the package would end up being bundled multiple times per page.
134
+
135
+ As a result, we have had to stop rekeying shared modules in userland and only do so on internal Next packages themselves.
136
+
137
+ If you need to dangerously share a package using the old method, you can do so by using the following code:
138
+
139
+ ```js
140
+ const shared = {
141
+ fakeLodash: {
142
+ import: "lodash",
143
+ shareKey: "lodash",
144
+ }
145
+ }
146
+ ```
147
+
148
+ Please note that this method is now considered dangerous and should be used with caution.
149
+
127
150
  ## Demo
128
151
 
129
152
  You can see it in action here: https://github.com/module-federation/module-federation-examples/pull/2147
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/nextjs-mf",
3
- "version": "5.12.12",
3
+ "version": "6.0.0",
4
4
  "license": "MIT",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
@@ -19,16 +19,18 @@
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.7",
23
- "@module-federation/utilities": "1.0.1",
24
- "@swc/core": "^1.3.3",
25
- "tslib": "^2.3.0"
22
+ "@module-federation/node": "0.9.10",
23
+ "@module-federation/utilities": "1.0.4",
24
+ "node-fetch": "2.6.7",
25
+ "encoding": "0.1.13",
26
+ "styled-jsx": "5.1.0",
27
+ "@swc/core": "1.3.3",
28
+ "tslib": "2.4.0"
26
29
  },
27
30
  "peerDependencies": {
28
31
  "webpack": "^5.40.0",
29
32
  "next": "^12 || ^13",
30
33
  "react": "^17 || ^18",
31
34
  "react-dom": "^17 || ^18"
32
- },
33
- "typings": "./src/index.d.ts"
35
+ }
34
36
  }
package/src/internal.js CHANGED
@@ -54,10 +54,10 @@ exports.DEFAULT_SHARE_SCOPE = {
54
54
  // put host in-front of any shared module key, so "hostreact"
55
55
  const reKeyHostShared = (options = {}) => {
56
56
  const shared = {
57
- ...options,
57
+ // ...options, causes multiple copies of a package to be loaded into a graph, dangerous for singletons
58
58
  ...exports.DEFAULT_SHARE_SCOPE,
59
59
  };
60
- return Object.entries(shared).reduce((acc, item) => {
60
+ const reKeyedInternalModules = Object.entries(shared).reduce((acc, item) => {
61
61
  const [itemKey, shareOptions] = item;
62
62
  const shareKey = `host${item.shareKey || itemKey}`;
63
63
  acc[shareKey] = shareOptions;
@@ -72,6 +72,10 @@ const reKeyHostShared = (options = {}) => {
72
72
  }
73
73
  return acc;
74
74
  }, {});
75
+ return {
76
+ ...options,
77
+ ...reKeyedInternalModules
78
+ };
75
79
  };
76
80
  exports.reKeyHostShared = reKeyHostShared;
77
81
  // browser template to convert remote into promise new promise and use require.loadChunk to load the chunk
@@ -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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"}
@@ -33,7 +33,7 @@ class DevHmrFixInvalidPongPlugin {
33
33
  return;
34
34
  }
35
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) {
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) {
37
37
  if (window.mf_client && window.mf_client.isFederatedPathname(window.location.pathname)) return;
38
38
  `.replaceAll('\n', '\\n'));
39
39
  const updatedAsset = new webpack.sources.RawSource(newSource);
@@ -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,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"}
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,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"}
@@ -21,7 +21,7 @@ class RemoveRRRuntimePlugin {
21
21
  }
22
22
  const asset = compilation.getAsset(filename);
23
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');
24
+ const newSource = (asset?.source.source()).replace(/RefreshHelpers/g, 'NoExist');
25
25
  const updatedAsset = new webpack.sources.RawSource(newSource);
26
26
  if (asset) {
27
27
  compilation.updateAsset(filename, updatedAsset);
@@ -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,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"}
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,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAa,CAAA,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"}