@module-federation/utilities 3.0.2 → 3.0.3-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 +106 -103
- package/README.md +20 -5
- package/package.json +11 -8
- package/src/plugins/DelegateModulesPlugin.js +12 -14
- package/src/plugins/DelegateModulesPlugin.js.map +1 -1
- package/src/utils/common.js +6 -2
- package/src/utils/common.js.map +1 -1
- package/src/utils/getRuntimeRemotes.js.map +1 -1
- package/src/utils/importRemote.d.ts +2 -1
- package/src/utils/importRemote.js +13 -5
- package/src/utils/importRemote.js.map +1 -1
- package/src/utils/pure.js +3 -1
- package/src/utils/pure.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,223 +2,226 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
-
## [3.0.
|
|
5
|
+
## [3.0.3-0](https://github.com/module-federation/nextjs-mf/compare/utils-3.0.2...utils-3.0.3-0) (2023-10-03)
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
## [3.0.2
|
|
9
|
+
## [3.0.2](https://github.com/module-federation/nextjs-mf/compare/utils-3.0.2-beta.0...utils-3.0.2) (2023-09-14)
|
|
10
10
|
|
|
11
|
+
## [3.0.2-beta.0](https://github.com/module-federation/nextjs-mf/compare/utils-3.0.1...utils-3.0.2-beta.0) (2023-09-14)
|
|
11
12
|
|
|
12
13
|
### Features
|
|
13
14
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
- **utilities:** update DelegateModulesPlugin and tests (#node_auto_public_path) ([df8bb79](https://github.com/module-federation/nextjs-mf/commit/df8bb791c3fedef299cb15960546ff5ad9c665ef))
|
|
17
16
|
|
|
18
17
|
## [3.0.1](https://github.com/module-federation/nextjs-mf/compare/utils-3.0.0...utils-3.0.1) (2023-09-13)
|
|
19
18
|
|
|
20
|
-
|
|
21
|
-
|
|
22
19
|
# [3.0.0](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.7...utils-3.0.0) (2023-09-09)
|
|
23
20
|
|
|
24
|
-
|
|
25
21
|
### Features
|
|
26
22
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
23
|
+
- Add tests and update tsconfig in utilities package ([8b0351d](https://github.com/module-federation/nextjs-mf/commit/8b0351dcd2818922580fb2dac1d95b7556240cb9))
|
|
24
|
+
- core package for module federation ([#1093](https://github.com/module-federation/nextjs-mf/issues/1093)) ([d460400](https://github.com/module-federation/nextjs-mf/commit/d46040053e9b627321b5fe8e05556c5bb727c238)), 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) [#1234](https://github.com/module-federation/nextjs-mf/issues/1234) [#1235](https://github.com/module-federation/nextjs-mf/issues/1235)
|
|
30
25
|
|
|
31
26
|
### BREAKING CHANGES
|
|
32
27
|
|
|
33
|
-
|
|
28
|
+
- automaticAsyncBoundary option has been removed
|
|
34
29
|
|
|
35
|
-
|
|
30
|
+
- fix: exclude specific pages from page map automatically
|
|
36
31
|
|
|
37
|
-
|
|
32
|
+
- refactor: conslidate codebase
|
|
38
33
|
|
|
39
|
-
|
|
34
|
+
- fix: improve hot reload share recovery
|
|
40
35
|
|
|
41
|
-
|
|
36
|
+
- refactor: remove server jsonp template
|
|
42
37
|
|
|
43
|
-
|
|
38
|
+
- chore: remove dead code from runtime modules
|
|
44
39
|
|
|
45
|
-
|
|
40
|
+
- fix: clean up jsonp getCustomJsonpCode
|
|
46
41
|
|
|
47
42
|
getting chunk loading global from compiler output options
|
|
48
43
|
|
|
49
|
-
|
|
44
|
+
- feat: adding cleanInitArrays runtime helper
|
|
50
45
|
|
|
51
|
-
|
|
46
|
+
- chore: remove share scope hoist and module hoisting system
|
|
52
47
|
|
|
53
|
-
|
|
48
|
+
- chore: cleanup code
|
|
54
49
|
|
|
55
|
-
|
|
50
|
+
- chore: remove dead code from add module runtime plugin
|
|
56
51
|
|
|
57
52
|
likely can remove whole plugin in future
|
|
58
53
|
|
|
59
|
-
|
|
54
|
+
- chore: remove logs from delegate modules
|
|
60
55
|
|
|
61
|
-
|
|
56
|
+
- chore: remove old utils
|
|
62
57
|
|
|
63
|
-
|
|
58
|
+
- fix: add warning on auto page stitch
|
|
64
59
|
|
|
65
|
-
|
|
60
|
+
- fix: remove commented out code from InvertedContainerPlugin.ts
|
|
66
61
|
|
|
67
|
-
|
|
62
|
+
- chore: improve logging to see if its local load or remote load
|
|
68
63
|
|
|
69
|
-
|
|
64
|
+
- chore: clean up old custom promises factories
|
|
70
65
|
|
|
71
|
-
|
|
66
|
+
- fix: remove container proxy code
|
|
72
67
|
|
|
73
|
-
|
|
74
|
-
|
|
68
|
+
- fix: remove container proxy code
|
|
69
|
+
- automaticAsyncBoundary option has been removed
|
|
75
70
|
|
|
76
|
-
|
|
71
|
+
- fix: exclude specific pages from page map automatically
|
|
77
72
|
|
|
78
|
-
|
|
73
|
+
- refactor: conslidate codebase
|
|
79
74
|
|
|
80
|
-
|
|
75
|
+
- fix: improve hot reload share recovery
|
|
81
76
|
|
|
82
|
-
|
|
77
|
+
- refactor: remove server jsonp template
|
|
83
78
|
|
|
84
|
-
|
|
79
|
+
- chore: remove dead code from runtime modules
|
|
85
80
|
|
|
86
|
-
|
|
81
|
+
- fix: clean up jsonp getCustomJsonpCode
|
|
87
82
|
|
|
88
83
|
getting chunk loading global from compiler output options
|
|
89
84
|
|
|
90
|
-
|
|
85
|
+
- feat: adding cleanInitArrays runtime helper
|
|
91
86
|
|
|
92
|
-
|
|
87
|
+
- chore: remove share scope hoist and module hoisting system
|
|
93
88
|
|
|
94
|
-
|
|
89
|
+
- chore: cleanup code
|
|
95
90
|
|
|
96
|
-
|
|
91
|
+
- chore: remove dead code from add module runtime plugin
|
|
97
92
|
|
|
98
93
|
likely can remove whole plugin in future
|
|
99
94
|
|
|
100
|
-
|
|
95
|
+
- chore: remove logs from delegate modules
|
|
101
96
|
|
|
102
|
-
|
|
97
|
+
- chore: remove old utils
|
|
103
98
|
|
|
104
|
-
|
|
99
|
+
- fix: add warning on auto page stitch
|
|
105
100
|
|
|
106
|
-
|
|
101
|
+
- fix: remove commented out code from InvertedContainerPlugin.ts
|
|
107
102
|
|
|
108
|
-
|
|
103
|
+
- chore: improve logging to see if its local load or remote load
|
|
109
104
|
|
|
110
|
-
|
|
105
|
+
- chore: clean up old custom promises factories
|
|
111
106
|
|
|
112
|
-
|
|
107
|
+
- fix: remove container proxy code
|
|
113
108
|
|
|
114
|
-
|
|
109
|
+
- fix: remove container proxy code
|
|
115
110
|
|
|
116
|
-
|
|
111
|
+
- chore: fix project.json
|
|
117
112
|
|
|
118
|
-
|
|
113
|
+
- debugging
|
|
119
114
|
|
|
120
|
-
|
|
115
|
+
- fix: resolve backmerge issues with build
|
|
121
116
|
|
|
122
|
-
|
|
117
|
+
- Merge branch 'kill_child_compilers' into fix_backmerge_issues
|
|
123
118
|
|
|
124
119
|
# Conflicts:
|
|
125
|
-
# package-lock.json
|
|
126
|
-
# package.json
|
|
127
|
-
# packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
|
|
128
|
-
# packages/nextjs-mf/src/plugins/container/InvertedContainerPlugin.ts
|
|
129
|
-
# packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts
|
|
130
120
|
|
|
131
|
-
|
|
121
|
+
# package-lock.json
|
|
122
|
+
|
|
123
|
+
# package.json
|
|
124
|
+
|
|
125
|
+
# packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
|
|
126
|
+
|
|
127
|
+
# packages/nextjs-mf/src/plugins/container/InvertedContainerPlugin.ts
|
|
128
|
+
|
|
129
|
+
# packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts
|
|
130
|
+
|
|
131
|
+
- feat: enable eager sharing
|
|
132
132
|
|
|
133
|
-
|
|
133
|
+
- refactor: improve module hooks for eager loading and search
|
|
134
134
|
|
|
135
|
-
|
|
135
|
+
- refactor: cleanup custom jsonp and make es5
|
|
136
136
|
|
|
137
|
-
|
|
137
|
+
- refactor: cleanup inverted container code
|
|
138
138
|
|
|
139
|
-
|
|
140
|
-
|
|
139
|
+
- refactor: cleanup inverted container code
|
|
140
|
+
- automaticAsyncBoundary option has been removed
|
|
141
141
|
|
|
142
|
-
|
|
142
|
+
- fix: exclude specific pages from page map automatically
|
|
143
143
|
|
|
144
|
-
|
|
144
|
+
- refactor: conslidate codebase
|
|
145
145
|
|
|
146
|
-
|
|
146
|
+
- fix: improve hot reload share recovery
|
|
147
147
|
|
|
148
|
-
|
|
148
|
+
- refactor: remove server jsonp template
|
|
149
149
|
|
|
150
|
-
|
|
150
|
+
- chore: remove dead code from runtime modules
|
|
151
151
|
|
|
152
|
-
|
|
152
|
+
- fix: clean up jsonp getCustomJsonpCode
|
|
153
153
|
|
|
154
154
|
getting chunk loading global from compiler output options
|
|
155
155
|
|
|
156
|
-
|
|
156
|
+
- feat: adding cleanInitArrays runtime helper
|
|
157
157
|
|
|
158
|
-
|
|
158
|
+
- chore: remove share scope hoist and module hoisting system
|
|
159
159
|
|
|
160
|
-
|
|
160
|
+
- chore: cleanup code
|
|
161
161
|
|
|
162
|
-
|
|
162
|
+
- chore: remove dead code from add module runtime plugin
|
|
163
163
|
|
|
164
164
|
likely can remove whole plugin in future
|
|
165
165
|
|
|
166
|
-
|
|
166
|
+
- chore: remove logs from delegate modules
|
|
167
167
|
|
|
168
|
-
|
|
168
|
+
- chore: remove old utils
|
|
169
169
|
|
|
170
|
-
|
|
170
|
+
- fix: add warning on auto page stitch
|
|
171
171
|
|
|
172
|
-
|
|
172
|
+
- fix: remove commented out code from InvertedContainerPlugin.ts
|
|
173
173
|
|
|
174
|
-
|
|
174
|
+
- chore: improve logging to see if its local load or remote load
|
|
175
175
|
|
|
176
|
-
|
|
176
|
+
- chore: clean up old custom promises factories
|
|
177
177
|
|
|
178
|
-
|
|
178
|
+
- fix: remove container proxy code
|
|
179
179
|
|
|
180
|
-
|
|
180
|
+
- fix: remove container proxy code
|
|
181
181
|
|
|
182
|
-
|
|
182
|
+
- fix: resolve backmerge issues with build
|
|
183
183
|
|
|
184
|
-
|
|
184
|
+
- Merge branch 'kill_child_compilers' into fix_backmerge_issues
|
|
185
185
|
|
|
186
186
|
# Conflicts:
|
|
187
|
-
# package-lock.json
|
|
188
|
-
# package.json
|
|
189
|
-
# packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
|
|
190
|
-
# packages/nextjs-mf/src/plugins/container/InvertedContainerPlugin.ts
|
|
191
|
-
# packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts
|
|
192
187
|
|
|
193
|
-
|
|
188
|
+
# package-lock.json
|
|
194
189
|
|
|
195
|
-
|
|
190
|
+
# package.json
|
|
196
191
|
|
|
197
|
-
|
|
192
|
+
# packages/nextjs-mf/src/plugins/NextFederationPlugin/index.ts
|
|
198
193
|
|
|
199
|
-
|
|
194
|
+
# packages/nextjs-mf/src/plugins/container/InvertedContainerPlugin.ts
|
|
200
195
|
|
|
201
|
-
|
|
196
|
+
# packages/nextjs-mf/src/plugins/container/InvertedContainerRuntimeModule.ts
|
|
202
197
|
|
|
203
|
-
|
|
198
|
+
- feat: enable eager sharing
|
|
204
199
|
|
|
205
|
-
|
|
200
|
+
- refactor: improve module hooks for eager loading and search
|
|
206
201
|
|
|
207
|
-
|
|
202
|
+
- refactor: cleanup custom jsonp and make es5
|
|
208
203
|
|
|
209
|
-
|
|
204
|
+
- refactor: cleanup inverted container code
|
|
210
205
|
|
|
211
|
-
|
|
206
|
+
- refactor: cleanup inverted container code
|
|
212
207
|
|
|
213
|
-
|
|
208
|
+
- ci: fix install step with npm and NX
|
|
214
209
|
|
|
215
|
-
|
|
210
|
+
- test: remove tests for now
|
|
216
211
|
|
|
217
|
-
|
|
212
|
+
- chore(utils): release version 1.7.3-beta.0
|
|
218
213
|
|
|
219
|
-
|
|
214
|
+
- chore(utils): release version 1.7.3
|
|
220
215
|
|
|
216
|
+
- chore(node): release version 0.14.4-beta.0
|
|
221
217
|
|
|
218
|
+
- chore(node): release version 0.14.4
|
|
219
|
+
|
|
220
|
+
- chore(nextjs-mf): release version 6.4.1-beta.4
|
|
221
|
+
|
|
222
|
+
- fix: remove debugging runtime variable
|
|
223
|
+
|
|
224
|
+
- chore(nextjs-mf): release version 6.4.1-beta.5
|
|
222
225
|
|
|
223
226
|
## [2.0.7](https://github.com/module-federation/nextjs-mf/compare/utils-2.0.6...utils-2.0.7) (2023-08-14)
|
|
224
227
|
|
package/README.md
CHANGED
|
@@ -50,7 +50,9 @@ Usage looks something like this:
|
|
|
50
50
|
```js
|
|
51
51
|
import { importRemote } from '@module-federation/utilities';
|
|
52
52
|
|
|
53
|
+
// --
|
|
53
54
|
// If it's a regular js module:
|
|
55
|
+
// --
|
|
54
56
|
importRemote({
|
|
55
57
|
url: 'http://localhost:3001',
|
|
56
58
|
scope: 'Foo',
|
|
@@ -59,13 +61,26 @@ importRemote({
|
|
|
59
61
|
(
|
|
60
62
|
{
|
|
61
63
|
/* list of Bar exports */
|
|
62
|
-
}
|
|
64
|
+
},
|
|
63
65
|
) => {
|
|
64
66
|
// Use Bar exports
|
|
65
|
-
}
|
|
67
|
+
},
|
|
66
68
|
);
|
|
67
69
|
|
|
70
|
+
// --
|
|
71
|
+
// If it's a ESM module (this is currently the default for NX):
|
|
72
|
+
// --
|
|
73
|
+
const Bar = lazy(() => importRemote({ url: 'http://localhost:3001', scope: 'Foo', module: 'Bar', esm: true }));
|
|
74
|
+
|
|
75
|
+
return (
|
|
76
|
+
<Suspense fallback={<div>Loading Bar...</div>}>
|
|
77
|
+
<Bar />
|
|
78
|
+
</Suspense>
|
|
79
|
+
);
|
|
80
|
+
|
|
81
|
+
// --
|
|
68
82
|
// If Bar is a React component you can use it with lazy and Suspense just like a dynamic import:
|
|
83
|
+
// --
|
|
69
84
|
const Bar = lazy(() => importRemote({ url: 'http://localhost:3001', scope: 'Foo', module: 'Bar' }));
|
|
70
85
|
|
|
71
86
|
return (
|
|
@@ -87,10 +102,10 @@ importRemote({
|
|
|
87
102
|
(
|
|
88
103
|
{
|
|
89
104
|
/* list of Bar exports */
|
|
90
|
-
}
|
|
105
|
+
},
|
|
91
106
|
) => {
|
|
92
107
|
// Use Bar exports
|
|
93
|
-
}
|
|
108
|
+
},
|
|
94
109
|
);
|
|
95
110
|
|
|
96
111
|
// If Bar is a React component you can use it with lazy and Suspense just like a dynamic import:
|
|
@@ -99,7 +114,7 @@ const Bar = lazy(() =>
|
|
|
99
114
|
url: () => MyAsyncMethod('remote_name'),
|
|
100
115
|
scope: 'Foo',
|
|
101
116
|
module: 'Bar',
|
|
102
|
-
})
|
|
117
|
+
}),
|
|
103
118
|
);
|
|
104
119
|
|
|
105
120
|
return (
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@module-federation/utilities",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.3-0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"types": "src/index.d.ts",
|
|
@@ -10,24 +10,27 @@
|
|
|
10
10
|
},
|
|
11
11
|
"repository": "https://github.com/module-federation/universe/tree/main/packages/utilities",
|
|
12
12
|
"devDependencies": {
|
|
13
|
-
"
|
|
14
|
-
"
|
|
13
|
+
"next": "13.5.3",
|
|
14
|
+
"react": "18.2.0"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"webpack": "^5.40.0",
|
|
18
17
|
"next": "^12 || ^13",
|
|
18
|
+
"react": "^16 || ^17 || ^18",
|
|
19
19
|
"react-dom": "^16 || ^17 || ^18",
|
|
20
|
-
"
|
|
20
|
+
"webpack": "^5.40.0"
|
|
21
21
|
},
|
|
22
22
|
"peerDependenciesMeta": {
|
|
23
|
-
"
|
|
23
|
+
"next": {
|
|
24
24
|
"optional": true
|
|
25
25
|
},
|
|
26
|
-
"react
|
|
26
|
+
"react": {
|
|
27
27
|
"optional": true
|
|
28
28
|
},
|
|
29
|
-
"
|
|
29
|
+
"react-dom": {
|
|
30
30
|
"optional": true
|
|
31
31
|
}
|
|
32
|
+
},
|
|
33
|
+
"dependencies": {
|
|
34
|
+
"webpack-sources": "3.2.3"
|
|
32
35
|
}
|
|
33
36
|
}
|
|
@@ -15,7 +15,7 @@ class DelegateModulesPlugin {
|
|
|
15
15
|
}
|
|
16
16
|
addDelegatesToChunks(compilation, chunks) {
|
|
17
17
|
for (const chunk of chunks) {
|
|
18
|
-
this._delegateModules.forEach(module => {
|
|
18
|
+
this._delegateModules.forEach((module) => {
|
|
19
19
|
this.addModuleAndDependenciesToChunk(module, chunk, compilation);
|
|
20
20
|
});
|
|
21
21
|
}
|
|
@@ -25,40 +25,38 @@ class DelegateModulesPlugin {
|
|
|
25
25
|
if (this.options.debug) {
|
|
26
26
|
console.log('adding ', module.identifier(), ' to chunk', chunk.name);
|
|
27
27
|
}
|
|
28
|
-
if (module.buildMeta) {
|
|
29
|
-
module.buildMeta['eager'] = true;
|
|
30
|
-
}
|
|
31
28
|
compilation.chunkGraph.connectChunkAndModule(chunk, module);
|
|
32
29
|
}
|
|
33
|
-
module.dependencies.forEach(dependency => {
|
|
34
|
-
const dependencyModule = compilation.moduleGraph.getModule(dependency);
|
|
35
|
-
if (dependencyModule &&
|
|
36
|
-
!compilation.chunkGraph.isModuleInChunk(dependencyModule, chunk)) {
|
|
37
|
-
this.addModuleAndDependenciesToChunk(dependencyModule, chunk, compilation);
|
|
38
|
-
}
|
|
39
|
-
});
|
|
40
30
|
}
|
|
41
31
|
removeDelegatesNonRuntimeChunks(compilation, chunks) {
|
|
42
32
|
for (const chunk of chunks) {
|
|
43
33
|
if (!chunk.hasRuntime()) {
|
|
44
34
|
this.options.debug &&
|
|
45
35
|
console.log('non-runtime chunk:', chunk.debugId, chunk.id, chunk.name);
|
|
46
|
-
this._delegateModules
|
|
36
|
+
for (const [id, module] of this._delegateModules) {
|
|
47
37
|
compilation.chunkGraph.disconnectChunkAndModule(chunk, module);
|
|
48
|
-
}
|
|
38
|
+
}
|
|
49
39
|
}
|
|
50
40
|
}
|
|
51
41
|
}
|
|
52
42
|
apply(compiler) {
|
|
53
43
|
compiler.hooks.thisCompilation.tap('DelegateModulesPlugin', (compilation) => {
|
|
54
44
|
compilation.hooks.finishModules.tapAsync('DelegateModulesPlugin', (modules, callback) => {
|
|
45
|
+
var _a;
|
|
55
46
|
const { remotes } = this.options;
|
|
56
47
|
const knownDelegates = new Set(remotes
|
|
57
48
|
? Object.values(remotes).map((remote) => remote.replace('internal ', ''))
|
|
58
49
|
: []);
|
|
59
50
|
for (const module of modules) {
|
|
60
51
|
const normalModule = module;
|
|
61
|
-
if (normalModule
|
|
52
|
+
if (normalModule) {
|
|
53
|
+
const mid = normalModule.identifier();
|
|
54
|
+
if ((_a = normalModule === null || normalModule === void 0 ? void 0 : normalModule.userRequest) === null || _a === void 0 ? void 0 : _a.startsWith('webpack/container/reference')) {
|
|
55
|
+
this._delegateModules.set(mid, normalModule);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
if (normalModule.resource &&
|
|
59
|
+
knownDelegates.has(normalModule.resource)) {
|
|
62
60
|
this._delegateModules.set(normalModule.resource, normalModule);
|
|
63
61
|
}
|
|
64
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelegateModulesPlugin.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/plugins/DelegateModulesPlugin.ts"],"names":[],"mappings":";;AAEA,MAAM,qBAAqB;IAIzB,YAAY,OAAgD;QAC1D,IAAI,CAAC,OAAO,mBAAK,KAAK,EAAE,KAAK,IAAK,OAAO,CAAE,CAAC;QAC5C,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,cAAc,CAAC,MAAuB,EAAE,IAAY;QAClD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;gBACvB,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,oBAAoB,CAC1B,WAAwB,EACxB,MAAuB;QAEvB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"DelegateModulesPlugin.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/plugins/DelegateModulesPlugin.ts"],"names":[],"mappings":"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"}
|
package/src/utils/common.js
CHANGED
|
@@ -33,7 +33,9 @@ const createDelegatedModule = (delegate, params) => {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
Object.entries(params).forEach(([key, value]) => processParam(key, value));
|
|
36
|
-
return queries.length === 0
|
|
36
|
+
return queries.length === 0
|
|
37
|
+
? `internal ${delegate}`
|
|
38
|
+
: `internal ${delegate}?${queries.join('&')}`;
|
|
37
39
|
};
|
|
38
40
|
exports.createDelegatedModule = createDelegatedModule;
|
|
39
41
|
const createContainerSharingScope = (asyncContainer) => {
|
|
@@ -113,7 +115,9 @@ const getContainer = (remoteContainer) => __awaiter(void 0, void 0, void 0, func
|
|
|
113
115
|
if (!remoteContainer) {
|
|
114
116
|
throw Error(`Remote container options is empty`);
|
|
115
117
|
}
|
|
116
|
-
const containerScope = typeof window !== 'undefined'
|
|
118
|
+
const containerScope = typeof window !== 'undefined'
|
|
119
|
+
? window
|
|
120
|
+
: globalThis.__remote_scope__;
|
|
117
121
|
let containerKey;
|
|
118
122
|
if (typeof remoteContainer === 'string') {
|
|
119
123
|
containerKey = remoteContainer;
|
package/src/utils/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/common.ts"],"names":[],"mappings":";AAAA,sDAAsD;;;;;;;;;;;;AAWtD,iCAAoC;AAEpC;;;;;;GAMG;AACI,MAAM,qBAAqB,GAAG,CACnC,QAAgB,EAChB,MAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,KAAU,EAAE,EAAE;QAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACxB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1D;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;YACtD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;SAC3E;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;SACzE;IACH,CAAC,CAAC;IACF,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3E,OAAO,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getRuntimeRemotes.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/getRuntimeRemotes.ts"],"names":[],"mappings":";;;AACA,iCAAyD;AAElD,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAI;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAU,CAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"getRuntimeRemotes.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/getRuntimeRemotes.ts"],"names":[],"mappings":";;;AACA,iCAAyD;AAElD,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAI;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAU,CAAC,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,IAAI;YAC1D,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;YAC1B,gEAAgE;YAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;gBACjE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;aACtC;YACD,oEAAoE;iBAC/D,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gBACpC,aAAa;gBACb,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;aACtC;YACD,oCAAoC;iBAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBACnE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnE,IAAI,KAAK,EAAE;oBACT,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC9D,IAAI,YAAY,EAAE;wBAChB,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAA,0BAAmB,EAAC,YAAY,CAAC,CAAC;wBACxD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;qBAC5B;iBACF;aACF;YACD,oCAAoC;iBAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAClC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAA,0BAAmB,EAAC,KAAK,CAAC,CAAC;gBACjD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;aAC5B;YACD,8CAA8C;iBACzC;gBACH,YAAY;gBACZ,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACrD,MAAM,IAAI,KAAK,CACb,mDAAmD,GAAG,GAAG,CAC1D,CAAC;aACH;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAuB,CAAC,CAAC;KAC7B;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;KAC3D;IAED,OAAO,EAAuB,CAAC;AACjC,CAAC,CAAC;AA5CW,QAAA,iBAAiB,qBA4C5B"}
|
|
@@ -18,6 +18,7 @@ export interface ImportRemoteOptions {
|
|
|
18
18
|
module: string;
|
|
19
19
|
remoteEntryFileName?: string;
|
|
20
20
|
bustRemoteEntryCache?: boolean;
|
|
21
|
+
esm?: boolean;
|
|
21
22
|
}
|
|
22
23
|
/**
|
|
23
24
|
* Function to import remote
|
|
@@ -26,5 +27,5 @@ export interface ImportRemoteOptions {
|
|
|
26
27
|
* @param {ImportRemoteOptions} options - The options for importing the remote
|
|
27
28
|
* @returns {Promise<T>} A promise that resolves with the imported module
|
|
28
29
|
*/
|
|
29
|
-
export declare const importRemote: <T>({ url, scope, module, remoteEntryFileName, bustRemoteEntryCache, }: ImportRemoteOptions) => Promise<T>;
|
|
30
|
+
export declare const importRemote: <T>({ url, scope, module, remoteEntryFileName, bustRemoteEntryCache, esm, }: ImportRemoteOptions) => Promise<T>;
|
|
30
31
|
export {};
|
|
@@ -39,6 +39,13 @@ const loadRemote = (url, scope, bustRemoteEntryCache) => new Promise((resolve, r
|
|
|
39
39
|
reject(error);
|
|
40
40
|
}, scope);
|
|
41
41
|
});
|
|
42
|
+
const loadEsmRemote = (url, scope) => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
|
+
const module = yield import(/* webpackIgnore: true */ url);
|
|
44
|
+
if (!module) {
|
|
45
|
+
throw new Error(`Unable to load requested remote from ${url} with scope ${scope}`);
|
|
46
|
+
}
|
|
47
|
+
window[scope] = Object.assign(Object.assign({}, module), { __initializing: false, __initialized: false });
|
|
48
|
+
});
|
|
42
49
|
/**
|
|
43
50
|
* Function to initialize sharing
|
|
44
51
|
* @async
|
|
@@ -77,7 +84,7 @@ const initContainer = (containerScope) => __awaiter(void 0, void 0, void 0, func
|
|
|
77
84
|
* @param {ImportRemoteOptions} options - The options for importing the remote
|
|
78
85
|
* @returns {Promise<T>} A promise that resolves with the imported module
|
|
79
86
|
*/
|
|
80
|
-
const importRemote = ({ url, scope, module, remoteEntryFileName = REMOTE_ENTRY_FILE, bustRemoteEntryCache = true, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
|
+
const importRemote = ({ url, scope, module, remoteEntryFileName = REMOTE_ENTRY_FILE, bustRemoteEntryCache = true, esm = false, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
81
88
|
const remoteScope = scope;
|
|
82
89
|
if (!window[remoteScope]) {
|
|
83
90
|
let remoteUrl = '';
|
|
@@ -87,11 +94,12 @@ const importRemote = ({ url, scope, module, remoteEntryFileName = REMOTE_ENTRY_F
|
|
|
87
94
|
else {
|
|
88
95
|
remoteUrl = yield url();
|
|
89
96
|
}
|
|
97
|
+
const remoteUrlWithEntryFile = `${remoteUrl}/${remoteEntryFileName}`;
|
|
98
|
+
const asyncContainer = !esm
|
|
99
|
+
? loadRemote(remoteUrlWithEntryFile, scope, bustRemoteEntryCache)
|
|
100
|
+
: loadEsmRemote(remoteUrlWithEntryFile, scope);
|
|
90
101
|
// Load the remote and initialize the share scope if it's empty
|
|
91
|
-
yield Promise.all([
|
|
92
|
-
loadRemote(`${remoteUrl}/${remoteEntryFileName}`, scope, bustRemoteEntryCache),
|
|
93
|
-
initSharing(),
|
|
94
|
-
]);
|
|
102
|
+
yield Promise.all([asyncContainer, initSharing()]);
|
|
95
103
|
if (!window[remoteScope]) {
|
|
96
104
|
throw new Error(`Remote loaded successfully but ${scope} could not be found! Verify that the name is correct in the Webpack configuration!`);
|
|
97
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importRemote.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/importRemote.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"importRemote.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/importRemote.ts"],"names":[],"mappings":"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"}
|
package/src/utils/pure.js
CHANGED
|
@@ -15,7 +15,9 @@ const loadScript = (keyOrRuntimeRemoteItem) => {
|
|
|
15
15
|
const runtimeRemotes = (0, exports.getRuntimeRemotes)();
|
|
16
16
|
// 1) Load remote container if needed
|
|
17
17
|
let asyncContainer;
|
|
18
|
-
const reference = typeof keyOrRuntimeRemoteItem === 'string'
|
|
18
|
+
const reference = typeof keyOrRuntimeRemoteItem === 'string'
|
|
19
|
+
? runtimeRemotes[keyOrRuntimeRemoteItem]
|
|
20
|
+
: keyOrRuntimeRemoteItem;
|
|
19
21
|
if (reference.asyncContainer) {
|
|
20
22
|
asyncContainer =
|
|
21
23
|
typeof reference.asyncContainer.then === 'function'
|
package/src/utils/pure.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pure.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/pure.ts"],"names":[],"mappings":";;;AAQA,MAAM,IAAI,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACnE,QAAA,UAAU,GAAG,IAAkB,CAAC;AAEtC,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAoB,EAAE;IAC5E,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,KAAK,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,YAAY,GAAG,CAAC,CAAC;KACtD;IACD,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,MAAM,UAAU,GAAG,CAAC,sBAA8C,EAAE,EAAE;IAC3E,MAAM,cAAc,GAAG,IAAA,yBAAiB,GAAE,CAAC;IAE3C,qCAAqC;IACrC,IAAI,cAA+C,CAAC;IACpD,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"pure.js","sourceRoot":"","sources":["../../../../../packages/utilities/src/utils/pure.ts"],"names":[],"mappings":"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"}
|