@module-federation/nextjs-mf 6.7.2-rc.1 → 7.0.1

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,228 @@
2
2
 
3
3
  This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
4
4
 
5
+ ## [7.0.1](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-7.0.0...nextjs-mf-7.0.1) (2023-07-05)
6
+
7
+ ### Dependency Updates
8
+
9
+ * `node` updated to version `1.0.1`
10
+ * `node` updated to version `1.0.1`
11
+ * `node` updated to version `1.0.1`
12
+
13
+ ### Bug Fixes
14
+
15
+ * **nextjs-mf:** update broken documentation ([#1103](https://github.com/module-federation/nextjs-mf/issues/1103)) ([f3659b4](https://github.com/module-federation/nextjs-mf/commit/f3659b4f2dec9f37256fc2d87d2799f5d1923df6))
16
+
17
+
18
+
19
+ # [7.0.0](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.7.1...nextjs-mf-7.0.0) (2023-07-01)
20
+
21
+ ### Dependency Updates
22
+
23
+ * `utils` updated to version `2.0.0`
24
+ * `node` updated to version `1.0.0`
25
+ * `utils` updated to version `2.0.0`
26
+ * `utils` updated to version `2.0.0`
27
+ * `node` updated to version `1.0.0`
28
+ * `node` updated to version `1.0.0`
29
+
30
+ ### Features
31
+
32
+ * Next Federation 7 ([#726](https://github.com/module-federation/nextjs-mf/issues/726)) ([d50ca1e](https://github.com/module-federation/nextjs-mf/commit/d50ca1e4636c4e0a402190f6e9c3f69ed9ec8eac)), closes [#851](https://github.com/module-federation/nextjs-mf/issues/851) [#864](https://github.com/module-federation/nextjs-mf/issues/864) [#835](https://github.com/module-federation/nextjs-mf/issues/835) [#851](https://github.com/module-federation/nextjs-mf/issues/851) [#864](https://github.com/module-federation/nextjs-mf/issues/864) [#871](https://github.com/module-federation/nextjs-mf/issues/871) [#851](https://github.com/module-federation/nextjs-mf/issues/851) [#864](https://github.com/module-federation/nextjs-mf/issues/864) [#872](https://github.com/module-federation/nextjs-mf/issues/872) [#875](https://github.com/module-federation/nextjs-mf/issues/875) [#884](https://github.com/module-federation/nextjs-mf/issues/884) [#887](https://github.com/module-federation/nextjs-mf/issues/887) [#893](https://github.com/module-federation/nextjs-mf/issues/893) [#885](https://github.com/module-federation/nextjs-mf/issues/885) [#899](https://github.com/module-federation/nextjs-mf/issues/899) [#904](https://github.com/module-federation/nextjs-mf/issues/904) [#932](https://github.com/module-federation/nextjs-mf/issues/932) [#936](https://github.com/module-federation/nextjs-mf/issues/936) [#959](https://github.com/module-federation/nextjs-mf/issues/959) [#960](https://github.com/module-federation/nextjs-mf/issues/960) [#969](https://github.com/module-federation/nextjs-mf/issues/969) [#971](https://github.com/module-federation/nextjs-mf/issues/971) [#974](https://github.com/module-federation/nextjs-mf/issues/974) [#984](https://github.com/module-federation/nextjs-mf/issues/984) [#986](https://github.com/module-federation/nextjs-mf/issues/986) [#1015](https://github.com/module-federation/nextjs-mf/issues/1015) [#1086](https://github.com/module-federation/nextjs-mf/issues/1086) [#1084](https://github.com/module-federation/nextjs-mf/issues/1084)
33
+
34
+
35
+ ### BREAKING CHANGES
36
+
37
+ * automaticAsyncBoundary option has been removed
38
+
39
+ * fix: exclude specific pages from page map automatically
40
+
41
+ * refactor: conslidate codebase
42
+
43
+ * fix: improve hot reload share recovery
44
+
45
+ * refactor: remove server jsonp template
46
+
47
+ * chore: remove dead code from runtime modules
48
+
49
+ * fix: clean up jsonp getCustomJsonpCode
50
+
51
+ getting chunk loading global from compiler output options
52
+
53
+ * feat: adding cleanInitArrays runtime helper
54
+
55
+ * chore: remove share scope hoist and module hoisting system
56
+
57
+ * chore: cleanup code
58
+
59
+ * chore: remove dead code from add module runtime plugin
60
+
61
+ likely can remove whole plugin in future
62
+
63
+ * chore: remove logs from delegate modules
64
+
65
+ * chore: remove old utils
66
+
67
+ * fix: add warning on auto page stitch
68
+
69
+ * fix: remove commented out code from InvertedContainerPlugin.ts
70
+
71
+ * chore: improve logging to see if its local load or remote load
72
+
73
+ * chore: clean up old custom promises factories
74
+
75
+ * fix: remove container proxy code
76
+
77
+ * fix: remove container proxy code
78
+ * automaticAsyncBoundary option has been removed
79
+
80
+ * fix: exclude specific pages from page map automatically
81
+
82
+ * refactor: conslidate codebase
83
+
84
+ * fix: improve hot reload share recovery
85
+
86
+ * refactor: remove server jsonp template
87
+
88
+ * chore: remove dead code from runtime modules
89
+
90
+ * fix: clean up jsonp getCustomJsonpCode
91
+
92
+ getting chunk loading global from compiler output options
93
+
94
+ * feat: adding cleanInitArrays runtime helper
95
+
96
+ * chore: remove share scope hoist and module hoisting system
97
+
98
+ * chore: cleanup code
99
+
100
+ * chore: remove dead code from add module runtime plugin
101
+
102
+ likely can remove whole plugin in future
103
+
104
+ * chore: remove logs from delegate modules
105
+
106
+ * chore: remove old utils
107
+
108
+ * fix: add warning on auto page stitch
109
+
110
+ * fix: remove commented out code from InvertedContainerPlugin.ts
111
+
112
+ * chore: improve logging to see if its local load or remote load
113
+
114
+ * chore: clean up old custom promises factories
115
+
116
+ * fix: remove container proxy code
117
+
118
+ * fix: remove container proxy code
119
+
120
+ * chore: fix project.json
121
+
122
+ * debugging
123
+
124
+ * fix: resolve backmerge issues with build
125
+
126
+ * Merge branch 'kill_child_compilers' into fix_backmerge_issues
127
+
128
+ # Conflicts:
129
+ # package-lock.json
130
+ # package.json
131
+ # packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
132
+ # packages/nextjs-mf/src/plugins/container/InvertedContainerPlugin.ts
133
+ # packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts
134
+
135
+ * feat: enable eager sharing
136
+
137
+ * refactor: improve module hooks for eager loading and search
138
+
139
+ * refactor: cleanup custom jsonp and make es5
140
+
141
+ * refactor: cleanup inverted container code
142
+
143
+ * refactor: cleanup inverted container code
144
+ * automaticAsyncBoundary option has been removed
145
+
146
+ * fix: exclude specific pages from page map automatically
147
+
148
+ * refactor: conslidate codebase
149
+
150
+ * fix: improve hot reload share recovery
151
+
152
+ * refactor: remove server jsonp template
153
+
154
+ * chore: remove dead code from runtime modules
155
+
156
+ * fix: clean up jsonp getCustomJsonpCode
157
+
158
+ getting chunk loading global from compiler output options
159
+
160
+ * feat: adding cleanInitArrays runtime helper
161
+
162
+ * chore: remove share scope hoist and module hoisting system
163
+
164
+ * chore: cleanup code
165
+
166
+ * chore: remove dead code from add module runtime plugin
167
+
168
+ likely can remove whole plugin in future
169
+
170
+ * chore: remove logs from delegate modules
171
+
172
+ * chore: remove old utils
173
+
174
+ * fix: add warning on auto page stitch
175
+
176
+ * fix: remove commented out code from InvertedContainerPlugin.ts
177
+
178
+ * chore: improve logging to see if its local load or remote load
179
+
180
+ * chore: clean up old custom promises factories
181
+
182
+ * fix: remove container proxy code
183
+
184
+ * fix: remove container proxy code
185
+
186
+ * fix: resolve backmerge issues with build
187
+
188
+ * Merge branch 'kill_child_compilers' into fix_backmerge_issues
189
+
190
+ # Conflicts:
191
+ # package-lock.json
192
+ # package.json
193
+ # packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
194
+ # packages/nextjs-mf/src/plugins/container/InvertedContainerPlugin.ts
195
+ # packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts
196
+
197
+ * feat: enable eager sharing
198
+
199
+ * refactor: improve module hooks for eager loading and search
200
+
201
+ * refactor: cleanup custom jsonp and make es5
202
+
203
+ * refactor: cleanup inverted container code
204
+
205
+ * refactor: cleanup inverted container code
206
+
207
+ * ci: fix install step with npm and NX
208
+
209
+ * test: remove tests for now
210
+
211
+ * chore(utils): release version 1.7.3-beta.0
212
+
213
+ * chore(utils): release version 1.7.3
214
+
215
+ * chore(node): release version 0.14.4-beta.0
216
+
217
+ * chore(node): release version 0.14.4
218
+
219
+ * chore(nextjs-mf): release version 6.4.1-beta.4
220
+
221
+ * fix: remove debugging runtime variable
222
+
223
+ * chore(nextjs-mf): release version 6.4.1-beta.5
224
+
225
+
226
+
5
227
  ## [6.7.2-rc.1](https://github.com/module-federation/nextjs-mf/compare/nextjs-mf-6.7.2-rc.0...nextjs-mf-6.7.2-rc.1) (2023-07-01)
6
228
 
7
229
 
package/README.md CHANGED
@@ -28,9 +28,6 @@ You do not need to share these packages, sharing next internals yourself will ca
28
28
  <details>
29
29
  <summary> See DEFAULT_SHARE_SCOPE:</summary>
30
30
 
31
- <details>
32
- <summary> See DEFAULT_SHARE_SCOPE:</summary>
33
-
34
31
  ```ts
35
32
  export const DEFAULT_SHARE_SCOPE: SharedObject = {
36
33
  'next/dynamic': {
@@ -113,7 +110,7 @@ const SampleComponent = lazy(() => import('next2/sampleComponent'));
113
110
 
114
111
  To avoid hydration errors, use `React.lazy` instead of `next/dynamic` for lazy loading federated components.
115
112
 
116
- #### See the implementation here: https://github.com/module-federation/module-federation-examples/tree/master/nextjs/home/pages
113
+ #### See the implementation here: https://github.com/module-federation/module-federation-examples/tree/master/nextjs-v13/home/pages
117
114
 
118
115
  With async boundary installed at the page level. You can then do the following
119
116
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@module-federation/nextjs-mf",
3
- "version": "6.7.2-rc.1",
3
+ "version": "7.0.1",
4
4
  "license": "MIT",
5
5
  "main": "src/index.js",
6
6
  "types": "src/index.d.ts",
@@ -21,8 +21,8 @@
21
21
  "fast-glob": "^3.2.11",
22
22
  "node-fetch": "2.6.9",
23
23
  "webpack-sources": "^3.2.3",
24
- "@module-federation/node": "0.16.3-rc.1",
25
- "@module-federation/utilities": "1.9.2-rc.1"
24
+ "@module-federation/node": "1.0.1",
25
+ "@module-federation/utilities": "2.0.0"
26
26
  },
27
27
  "peerDependencies": {
28
28
  "next": "^12 || ^13",
@@ -75,7 +75,7 @@ class NextFederationPlugin {
75
75
  runtime: false,
76
76
  exposes: {
77
77
  //something must be exposed in order to generate a remote entry, which is needed to kickstart runtime
78
- './noop': require.resolve('../../federation-noop.ts'),
78
+ './noop': require.resolve('../../federation-noop'),
79
79
  ...(this._extraOptions.exposePages
80
80
  ? (0, nextPageMapLoader_1.exposeNextjsPages)(compiler.options.context)
81
81
  : {}),
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts"],"names":[],"mappings":"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"}