@softarc/native-federation 1.0.2 → 1.1.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/README.md +33 -2
- package/package.json +2 -2
- package/src/lib/config/configuration-context.d.ts +5 -0
- package/src/lib/config/configuration-context.js +13 -0
- package/src/lib/config/configuration-context.js.map +1 -0
- package/src/lib/config/share-utils.d.ts +2 -2
- package/src/lib/config/share-utils.js +54 -22
- package/src/lib/config/share-utils.js.map +1 -1
- package/src/lib/config/with-native-federation.js +1 -1
- package/src/lib/config/with-native-federation.js.map +1 -1
- package/src/lib/core/bundle-exposed.js.map +1 -1
- package/src/lib/core/bundle-shared.js.map +1 -1
- package/src/lib/core/federation-builder.js +4 -0
- package/src/lib/core/federation-builder.js.map +1 -1
- package/src/lib/utils/normalize.d.ts +1 -1
- package/src/lib/utils/normalize.js +12 -2
- package/src/lib/utils/normalize.js.map +1 -1
- package/src/lib/utils/package-info.d.ts +11 -0
- package/src/lib/utils/package-info.js +96 -9
- package/src/lib/utils/package-info.js.map +1 -1
package/README.md
CHANGED
|
@@ -91,9 +91,8 @@ const tsConfig = 'tsconfig.json';
|
|
|
91
91
|
const outputPath = `dist/${projectName}`;
|
|
92
92
|
|
|
93
93
|
/*
|
|
94
|
-
|
|
94
|
+
* Step 1: Initialize Native Federation
|
|
95
95
|
*/
|
|
96
|
-
|
|
97
96
|
await federationBuilder.init({
|
|
98
97
|
options: {
|
|
99
98
|
workspaceRoot: path.join(__dirname, '..'),
|
|
@@ -324,6 +323,38 @@ The script with the type `esms-options` configures the polyfill. This library wa
|
|
|
324
323
|
|
|
325
324
|
To make the polyfill to load your EcmaScript modules (bundles) in shim mode, assign the type `module-shim`.
|
|
326
325
|
|
|
326
|
+
## React and Other CommonJS Libs
|
|
327
|
+
|
|
328
|
+
Native Federation uses Web Standards like EcmaScript Modules. Most libs and frameworks support them meanwhile. Unfortunately, React still uses CommonJS (und UMD). We do our best to convert these libs to EcmaScript Modules. In the case of React there are some challenges due to the dynamic way the React bundles use the ``exports`` object.
|
|
329
|
+
|
|
330
|
+
As the community is moving to EcmaScrpt Modules, we expect that these issues will vanish over time. In between, we provide some solutions for dealing with CommonJS-based libraries using ``exports`` in a dynamic way.
|
|
331
|
+
|
|
332
|
+
One of them is ``fileReplacemnts``:
|
|
333
|
+
|
|
334
|
+
```javascript
|
|
335
|
+
import { reactReplacements } from '@softarc/native-federation-esbuild/src/lib/react-replacements';
|
|
336
|
+
import { createEsBuildAdapter } from '@softarc/native-federation-esbuild';
|
|
337
|
+
|
|
338
|
+
[...]
|
|
339
|
+
|
|
340
|
+
createEsBuildAdapter({
|
|
341
|
+
plugins: [],
|
|
342
|
+
fileReplacements: reactReplacements.prod
|
|
343
|
+
})
|
|
344
|
+
```
|
|
345
|
+
|
|
346
|
+
Please note that the adapter comes with ``fileReplacements`` settings for React for both, ``dev`` mode and ``prod`` mode. For similar libraries you can add your own replacements. Also, using the ``compensateExports`` property, you can activate some additional logic for such libraries to make sure the exports are not lost
|
|
347
|
+
|
|
348
|
+
```javascript
|
|
349
|
+
createEsBuildAdapter({
|
|
350
|
+
plugins: [],
|
|
351
|
+
fileReplacements: reactReplacements.prod,
|
|
352
|
+
compensateExports: [new RegExp('/my-lib/')]
|
|
353
|
+
})
|
|
354
|
+
```
|
|
355
|
+
|
|
356
|
+
The default value for ``compensateExports`` is ``[new RegExp('/react/')]``.
|
|
357
|
+
|
|
327
358
|
## More: Blog Articles
|
|
328
359
|
|
|
329
360
|
Find out more about our work including Micro Frontends and Module Federation but also about alternatives to these approaches in our [blog](https://www.angulararchitects.io/en/aktuelles/the-microfrontend-revolution-part-2-module-federation-with-angular/).
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@softarc/native-federation",
|
|
3
|
-
"version": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"json5": "^2.2.0",
|
|
7
7
|
"npmlog": "^6.0.2",
|
|
8
|
-
"@softarc/native-federation-runtime": "1.0
|
|
8
|
+
"@softarc/native-federation-runtime": "1.1.0"
|
|
9
9
|
},
|
|
10
10
|
"main": "./src/index.js",
|
|
11
11
|
"typings": "./src/index.d.ts"
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getConfigContext = exports.useWorkspace = void 0;
|
|
4
|
+
let _context = {};
|
|
5
|
+
function useWorkspace(workspaceRoot) {
|
|
6
|
+
_context = Object.assign(Object.assign({}, _context), { workspaceRoot });
|
|
7
|
+
}
|
|
8
|
+
exports.useWorkspace = useWorkspace;
|
|
9
|
+
function getConfigContext() {
|
|
10
|
+
return _context;
|
|
11
|
+
}
|
|
12
|
+
exports.getConfigContext = getConfigContext;
|
|
13
|
+
//# sourceMappingURL=configuration-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration-context.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/config/configuration-context.ts"],"names":[],"mappings":";;;AAIA,IAAI,QAAQ,GAAyB,EAAE,CAAC;AAExC,SAAgB,YAAY,CAAC,aAAqB;IAChD,QAAQ,mCAAO,QAAQ,KAAE,aAAa,GAAC,CAAC;AAC1C,CAAC;AAFD,oCAEC;AAED,SAAgB,gBAAgB;IAC9B,OAAO,QAAQ,CAAC;AAClB,CAAC;AAFD,4CAEC"}
|
|
@@ -10,7 +10,7 @@ declare type CustomSharedConfig = SharedConfig & {
|
|
|
10
10
|
declare type ConfigObject = Record<string, CustomSharedConfig>;
|
|
11
11
|
declare type Config = (string | ConfigObject)[] | ConfigObject;
|
|
12
12
|
export declare function findRootTsConfigJson(): string;
|
|
13
|
-
export declare function shareAll(config?: CustomSharedConfig, skip?: SkipList,
|
|
13
|
+
export declare function shareAll(config?: CustomSharedConfig, skip?: SkipList, projectPath?: string): Config | null;
|
|
14
14
|
export declare function setInferVersion(infer: boolean): void;
|
|
15
|
-
export declare function share(shareObjects: Config,
|
|
15
|
+
export declare function share(shareObjects: Config, projectPath?: string): Config;
|
|
16
16
|
export {};
|
|
@@ -5,6 +5,9 @@ const path = require("path");
|
|
|
5
5
|
const fs = require("fs");
|
|
6
6
|
const process_1 = require("process");
|
|
7
7
|
const default_skip_list_1 = require("../core/default-skip-list");
|
|
8
|
+
const package_info_1 = require("../utils/package-info");
|
|
9
|
+
const configuration_context_1 = require("./configuration-context");
|
|
10
|
+
const logger_1 = require("../utils/logger");
|
|
8
11
|
let inferVersion = false;
|
|
9
12
|
exports.DEFAULT_SECONARIES_SKIP_LIST = [
|
|
10
13
|
'@angular/router/upgrade',
|
|
@@ -42,7 +45,17 @@ function readVersionMap(packagePath) {
|
|
|
42
45
|
const versions = Object.assign({}, json['dependencies']);
|
|
43
46
|
return versions;
|
|
44
47
|
}
|
|
45
|
-
function lookupVersion(key,
|
|
48
|
+
function lookupVersion(key, workspaceRoot) {
|
|
49
|
+
const versionMaps = (0, package_info_1.getVersionMaps)(workspaceRoot, workspaceRoot);
|
|
50
|
+
for (const versionMap of versionMaps) {
|
|
51
|
+
const version = lookupVersionInMap(key, versionMap);
|
|
52
|
+
if (version) {
|
|
53
|
+
return version;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
throw new Error(`Shared Dependency ${key} has requiredVersion:'auto'. However, this dependency is not found in your package.json`);
|
|
57
|
+
}
|
|
58
|
+
function lookupVersionInMap(key, versions) {
|
|
46
59
|
const parts = key.split('/');
|
|
47
60
|
if (parts.length >= 2 && parts[0].startsWith('@')) {
|
|
48
61
|
key = parts[0] + '/' + parts[1];
|
|
@@ -54,7 +67,7 @@ function lookupVersion(key, versions) {
|
|
|
54
67
|
key = '@angular-architects/module-federation';
|
|
55
68
|
}
|
|
56
69
|
if (!versions[key]) {
|
|
57
|
-
|
|
70
|
+
return null;
|
|
58
71
|
}
|
|
59
72
|
return versions[key];
|
|
60
73
|
}
|
|
@@ -83,7 +96,7 @@ function findSecondaries(libPath, excludes, shareObject) {
|
|
|
83
96
|
_findSecondaries(libPath, excludes, shareObject, acc);
|
|
84
97
|
return acc;
|
|
85
98
|
}
|
|
86
|
-
function getSecondaries(includeSecondaries,
|
|
99
|
+
function getSecondaries(includeSecondaries, libPath, key, shareObject) {
|
|
87
100
|
let exclude = [...exports.DEFAULT_SECONARIES_SKIP_LIST];
|
|
88
101
|
if (typeof includeSecondaries === 'object') {
|
|
89
102
|
if (Array.isArray(includeSecondaries.skip)) {
|
|
@@ -93,7 +106,7 @@ function getSecondaries(includeSecondaries, packagePath, key, shareObject) {
|
|
|
93
106
|
exclude = [includeSecondaries.skip];
|
|
94
107
|
}
|
|
95
108
|
}
|
|
96
|
-
const libPath = path.join(path.dirname(packagePath), 'node_modules', key);
|
|
109
|
+
// const libPath = path.join(path.dirname(packagePath), 'node_modules', key);
|
|
97
110
|
if (!fs.existsSync(libPath)) {
|
|
98
111
|
return {};
|
|
99
112
|
}
|
|
@@ -133,33 +146,46 @@ function readConfiguredSecondaries(parent, libPath, exclude, shareObject) {
|
|
|
133
146
|
}
|
|
134
147
|
return result;
|
|
135
148
|
}
|
|
136
|
-
function shareAll(config = {}, skip = default_skip_list_1.DEFAULT_SKIP_LIST,
|
|
137
|
-
|
|
138
|
-
|
|
149
|
+
function shareAll(config = {}, skip = default_skip_list_1.DEFAULT_SKIP_LIST, projectPath = '') {
|
|
150
|
+
var _a;
|
|
151
|
+
let workspacePath = undefined;
|
|
152
|
+
if (!projectPath) {
|
|
153
|
+
projectPath = (0, process_1.cwd)();
|
|
154
|
+
}
|
|
155
|
+
workspacePath = (_a = (0, configuration_context_1.getConfigContext)().workspaceRoot) !== null && _a !== void 0 ? _a : '';
|
|
156
|
+
if (!workspacePath) {
|
|
157
|
+
workspacePath = projectPath;
|
|
139
158
|
}
|
|
140
|
-
const
|
|
141
|
-
const versions = readVersionMap(packagePath);
|
|
159
|
+
const versionMaps = (0, package_info_1.getVersionMaps)(projectPath, workspacePath);
|
|
142
160
|
const share = {};
|
|
143
|
-
const
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
161
|
+
for (const versions of versionMaps) {
|
|
162
|
+
const preparedSkipList = (0, default_skip_list_1.prepareSkipList)(skip);
|
|
163
|
+
for (const key in versions) {
|
|
164
|
+
if ((0, default_skip_list_1.isInSkipList)(key, preparedSkipList)) {
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
const inferVersion = (!config.requiredVersion || config.requiredVersion === 'auto');
|
|
168
|
+
const requiredVersion = inferVersion ?
|
|
169
|
+
versions[key] :
|
|
170
|
+
config.requiredVersion;
|
|
171
|
+
if (!share[key]) {
|
|
172
|
+
share[key] = Object.assign(Object.assign({}, config), { requiredVersion });
|
|
173
|
+
}
|
|
147
174
|
}
|
|
148
|
-
share[key] = Object.assign({}, config);
|
|
149
175
|
}
|
|
150
|
-
return module.exports.share(share,
|
|
176
|
+
return module.exports.share(share, projectPath);
|
|
151
177
|
}
|
|
152
178
|
exports.shareAll = shareAll;
|
|
153
179
|
function setInferVersion(infer) {
|
|
154
180
|
inferVersion = infer;
|
|
155
181
|
}
|
|
156
182
|
exports.setInferVersion = setInferVersion;
|
|
157
|
-
function share(shareObjects,
|
|
158
|
-
if (!
|
|
159
|
-
|
|
183
|
+
function share(shareObjects, projectPath = '') {
|
|
184
|
+
if (!projectPath) {
|
|
185
|
+
projectPath = (0, process_1.cwd)();
|
|
160
186
|
}
|
|
161
|
-
const packagePath = findPackageJson(
|
|
162
|
-
const versions = readVersionMap(packagePath);
|
|
187
|
+
const packagePath = findPackageJson(projectPath);
|
|
188
|
+
// const versions = readVersionMap(packagePath);
|
|
163
189
|
const result = {};
|
|
164
190
|
let includeSecondaries;
|
|
165
191
|
for (const key in shareObjects) {
|
|
@@ -167,7 +193,7 @@ function share(shareObjects, packageJsonPath = '') {
|
|
|
167
193
|
const shareObject = shareObjects[key];
|
|
168
194
|
if (shareObject.requiredVersion === 'auto' ||
|
|
169
195
|
(inferVersion && typeof shareObject.requiredVersion === 'undefined')) {
|
|
170
|
-
const version = lookupVersion(key,
|
|
196
|
+
const version = lookupVersion(key, projectPath);
|
|
171
197
|
shareObject.requiredVersion = version;
|
|
172
198
|
shareObject.version = version.replace(/^\D*/, '');
|
|
173
199
|
}
|
|
@@ -180,7 +206,13 @@ function share(shareObjects, packageJsonPath = '') {
|
|
|
180
206
|
}
|
|
181
207
|
result[key] = shareObject;
|
|
182
208
|
if (includeSecondaries) {
|
|
183
|
-
const
|
|
209
|
+
const libPackageJson = (0, package_info_1.findDepPackageJson)(key, path.dirname(packagePath));
|
|
210
|
+
if (!libPackageJson) {
|
|
211
|
+
logger_1.logger.error('Could not find folder containing dep ' + key);
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
const libPath = path.dirname(libPackageJson);
|
|
215
|
+
const secondaries = getSecondaries(includeSecondaries, libPath, key, shareObject);
|
|
184
216
|
if (secondaries) {
|
|
185
217
|
addSecondaries(secondaries, result);
|
|
186
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share-utils.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/config/share-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAC9B,yBAA0B;AAC1B,qCAA8B;AAE9B,iEAMmC;
|
|
1
|
+
{"version":3,"file":"share-utils.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/config/share-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,7 +37,7 @@ function normalizeShared(config, skip) {
|
|
|
37
37
|
includeSecondaries: shared[cur].includeSecondaries,
|
|
38
38
|
} }));
|
|
39
39
|
}, {});
|
|
40
|
-
result =
|
|
40
|
+
//result = share(result) as Record<string, NormalizedSharedConfig>;
|
|
41
41
|
}
|
|
42
42
|
result = Object.keys(result)
|
|
43
43
|
.filter((key) => !(0, default_skip_list_1.isInSkipList)(key, skip))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-native-federation.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/config/with-native-federation.ts"],"names":[],"mappings":";;;AAAA,wDAAmE;AACnE,+CAAsE;AAMtE,iEAImC;AACnC,4CAAyC;AAEzC,SAAgB,oBAAoB,CAClC,MAAwB;;IAExB,MAAM,IAAI,GAAG,IAAA,mCAAe,EAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE;QACvB,OAAO,EAAE,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE;QAC7B,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC;QACrC,cAAc,EAAE,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC;KACtD,CAAC;AACJ,CAAC;AAXD,oDAWC;AAED,SAAS,eAAe,CACtB,MAAwB,EACxB,IAAsB;IAEtB,IAAI,MAAM,GAA2C,EAAE,CAAC;IAExD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAE7B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,IAAA,sBAAQ,EAAC;YAChB,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,MAAM;SACxB,CAA2C,CAAC;KAC9C;SAAM;QACL,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;YAAC,OAAA,iCACT,GAAG,KACN,CAAC,GAAG,CAAC,EAAE;oBACL,eAAe,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,eAAe,mCAAI,MAAM;oBACtD,SAAS,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,mCAAI,KAAK;oBACzC,aAAa,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,mCAAI,KAAK;oBACjD,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO;oBAC5B,kBAAkB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,kBAAkB;iBACnD,IACD,CAAA;SAAA,EACF,EAAE,CACH,CAAC;QAEF,
|
|
1
|
+
{"version":3,"file":"with-native-federation.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/config/with-native-federation.ts"],"names":[],"mappings":";;;AAAA,wDAAmE;AACnE,+CAAsE;AAMtE,iEAImC;AACnC,4CAAyC;AAEzC,SAAgB,oBAAoB,CAClC,MAAwB;;IAExB,MAAM,IAAI,GAAG,IAAA,mCAAe,EAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,CAAC,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE;QACvB,OAAO,EAAE,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE;QAC7B,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC;QACrC,cAAc,EAAE,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC;KACtD,CAAC;AACJ,CAAC;AAXD,oDAWC;AAED,SAAS,eAAe,CACtB,MAAwB,EACxB,IAAsB;IAEtB,IAAI,MAAM,GAA2C,EAAE,CAAC;IAExD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAE7B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,GAAG,IAAA,sBAAQ,EAAC;YAChB,SAAS,EAAE,IAAI;YACf,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,MAAM;SACxB,CAA2C,CAAC;KAC9C;SAAM;QACL,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;YAAC,OAAA,iCACT,GAAG,KACN,CAAC,GAAG,CAAC,EAAE;oBACL,eAAe,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,eAAe,mCAAI,MAAM;oBACtD,SAAS,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,mCAAI,KAAK;oBACzC,aAAa,EAAE,MAAA,MAAM,CAAC,GAAG,CAAC,CAAC,aAAa,mCAAI,KAAK;oBACjD,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO;oBAC5B,kBAAkB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,kBAAkB;iBACnD,IACD,CAAA;SAAA,EACF,EAAE,CACH,CAAC;QAEF,mEAAmE;KACpE;IAED,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACzB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAA,gCAAY,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;SACzC,MAAM,CACL,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,iCACT,GAAG,KACN,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,IAClB,EACF,EAAE,CACH,CAAC;IAEJ,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,uBAAuB,CAC9B,MAAwB,EACxB,IAAsB;IAEtB,MAAM,gBAAgB,GAAG,IAAA,kCAAoB,GAAE,CAAC;IAEhD,MAAM,KAAK,GAAG,IAAA,6BAAc,EAAC;QAC3B,gBAAgB;QAChB,cAAc,EAAE,MAAM,CAAC,cAAc;KACtC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,gCAAY,EAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAC1D,CAAC;IAEF,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE;QAC1C,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;KACtE;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-exposed.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-exposed.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+CAAyB;AAEzB,sDAA8C;AAE9C,kDAA8C;AAE9C,4CAAyC;AACzC,kDAA+C;AAE/C,SAAsB,aAAa,CACjC,MAAkC,EAClC,OAA0B,EAC1B,SAAmB;;QAEnB,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE;YAChC,MAAM,WAAW,GAAG,GAAG,GAAG,KAAK,CAAC;YAChC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAEvC,MAAM,SAAS,GAAG,IAAA,qBAAS,EACzB,IAAI,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"bundle-exposed.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-exposed.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+CAAyB;AAEzB,sDAA8C;AAE9C,kDAA8C;AAE9C,4CAAyC;AACzC,kDAA+C;AAE/C,SAAsB,aAAa,CACjC,MAAkC,EAClC,OAA0B,EAC1B,SAAmB;;QAEnB,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE;YAChC,MAAM,WAAW,GAAG,GAAG,GAAG,KAAK,CAAC;YAChC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAC/D,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAEvC,MAAM,SAAS,GAAG,IAAA,qBAAS,EACzB,IAAI,CAAC,IAAI,CACP,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CACvB,CAAC;YAEF,eAAM,CAAC,IAAI,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;YAErD,IAAI;gBACF,MAAM,IAAA,oBAAM,EAAC;oBACX,UAAU;oBACV,YAAY,EAAE,OAAO,CAAC,QAAQ;oBAC9B,QAAQ,EAAE,SAAS;oBACnB,OAAO,EAAE,WAAW;oBACpB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,WAAW,EAAE,MAAM,CAAC,cAAc;oBAClC,IAAI,EAAE,SAAS;iBAChB,CAAC,CAAC;gBAEH,IAAI,gBAAgB,GAAG,WAAW,CAAC;gBACnC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;oBAClB,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,WAAW,CAAC,CAAC;oBACnC,gBAAgB,GAAG,GAAG,GAAG,IAAI,IAAI,KAAK,CAAC;oBACvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,OAAO,CAAC,UAAU,EAClB,gBAAgB,CACjB,CAAC;oBACF,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;iBAC/C;gBAED,MAAM,CAAC,IAAI,CAAC;oBACV,GAAG;oBACH,WAAW,EAAE,gBAAgB;oBAC7B,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG;wBACf,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC;4BACE,UAAU,EAAE,SAAS;yBACtB;iBACN,CAAC,CAAC;aACJ;YAAC,OAAO,CAAC,EAAE;gBACV,eAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,UAAU,CAAC,CAAC;gBAC5D,eAAM,CAAC,MAAM,CACX,iEAAiE,CAClE,CAAC;gBACF,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AA5DD,sCA4DC;AAED,SAAgB,eAAe,CAC7B,MAAkC,EAClC,OAA0B;IAE1B,MAAM,MAAM,GAAuB,EAAE,CAAC;IAEtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE;QAChC,MAAM,SAAS,GAAG,IAAA,qBAAS,EACzB,IAAI,CAAC,IAAI,CACP,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CACvB,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC;YACV,GAAG;YACH,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG;gBACf,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,UAAU,EAAE,SAAS;iBACtB;SACN,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,0CAyBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-shared.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-shared.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+CAAyB;AAEzB,sDAA8C;AAC9C,wDAAoE;AAGpE,4EAAqE;AACrE,4CAAyC;
|
|
1
|
+
{"version":3,"file":"bundle-shared.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.federationBuilder = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const configuration_context_1 = require("../config/configuration-context");
|
|
5
6
|
const build_adapter_1 = require("./build-adapter");
|
|
6
7
|
const build_for_federation_1 = require("./build-for-federation");
|
|
7
8
|
const get_externals_1 = require("./get-externals");
|
|
@@ -10,10 +11,13 @@ let externals = [];
|
|
|
10
11
|
let config;
|
|
11
12
|
let fedOptions;
|
|
12
13
|
function init(params) {
|
|
14
|
+
var _a;
|
|
13
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
16
|
(0, build_adapter_1.setBuildAdapter)(params.adapter);
|
|
15
17
|
fedOptions = params.options;
|
|
18
|
+
(0, configuration_context_1.useWorkspace)(params.options.workspaceRoot);
|
|
16
19
|
config = yield (0, load_federation_config_1.loadFederationConfig)(fedOptions);
|
|
20
|
+
params.options.workspaceRoot = (_a = (0, configuration_context_1.getConfigContext)().workspaceRoot) !== null && _a !== void 0 ? _a : params.options.workspaceRoot;
|
|
17
21
|
externals = (0, get_externals_1.getExternals)(config);
|
|
18
22
|
});
|
|
19
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federation-builder.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/federation-builder.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"federation-builder.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/federation-builder.ts"],"names":[],"mappings":";;;;AAAA,2EAAiF;AAEjF,mDAAgE;AAChE,iEAAgF;AAEhF,mDAA+C;AAC/C,qEAAgE;AAOhE,IAAI,SAAS,GAAa,EAAE,CAAC;AAC7B,IAAI,MAAkC,CAAC;AACvC,IAAI,UAA6B,CAAC;AAElC,SAAe,IAAI,CAAC,MAAyB;;;QAC3C,IAAA,+BAAe,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAC5B,IAAA,oCAAY,EAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,MAAM,GAAG,MAAM,IAAA,6CAAoB,EAAC,UAAU,CAAC,CAAC;QAChD,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,MAAA,IAAA,wCAAgB,GAAE,CAAC,aAAa,mCAAI,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC;QAChG,SAAS,GAAG,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC;;CAClC;AAED,SAAe,KAAK,CAAC,WAAW,GAAG,yCAAkB;;QACnD,MAAM,IAAA,yCAAkB,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;IACvE,CAAC;CAAA;AAEY,QAAA,iBAAiB,GAAG;IAC/B,IAAI;IACJ,KAAK;IACL,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,MAAM;QACR,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function normalize(path: string): string;
|
|
1
|
+
export declare function normalize(path: string, trailingSlash?: boolean): string;
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalize = void 0;
|
|
4
|
-
function normalize(path) {
|
|
5
|
-
|
|
4
|
+
function normalize(path, trailingSlash) {
|
|
5
|
+
let cand = path.replace(/\\/g, '/');
|
|
6
|
+
if (typeof trailingSlash === 'undefined') {
|
|
7
|
+
return cand;
|
|
8
|
+
}
|
|
9
|
+
while (cand.endsWith('/')) {
|
|
10
|
+
cand = cand.substring(0, cand.length - 1);
|
|
11
|
+
}
|
|
12
|
+
if (trailingSlash) {
|
|
13
|
+
return cand + '/';
|
|
14
|
+
}
|
|
15
|
+
return cand;
|
|
6
16
|
}
|
|
7
17
|
exports.normalize = normalize;
|
|
8
18
|
//# sourceMappingURL=normalize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/normalize.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS,CAAC,IAAY;
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/normalize.ts"],"names":[],"mappings":";;;AAAA,SAAgB,SAAS,CAAC,IAAY,EAAE,aAAuB;IAC7D,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEpC,IAAI,OAAO,aAAa,KAAK,WAAW,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACzB,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;KACzC;IAED,IAAI,aAAa,EAAE;QACjB,OAAO,IAAI,GAAG,GAAG,CAAA;KAClB;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAhBD,8BAgBC"}
|
|
@@ -8,4 +8,15 @@ export interface PartialPackageJson {
|
|
|
8
8
|
module: string;
|
|
9
9
|
main: string;
|
|
10
10
|
}
|
|
11
|
+
export declare type VersionMap = Record<string, string>;
|
|
12
|
+
export declare type PackageJsonInfo = {
|
|
13
|
+
content: any;
|
|
14
|
+
directory: string;
|
|
15
|
+
};
|
|
16
|
+
export declare function findPackageJsonFiles(project: string, workspace: string): string[];
|
|
17
|
+
export declare function expandFolders(child: string, parent: string): string[];
|
|
11
18
|
export declare function getPackageInfo(packageName: string, workspaceRoot: string): PackageInfo | null;
|
|
19
|
+
export declare function getVersionMaps(project: string, workspace: string): VersionMap[];
|
|
20
|
+
export declare function getPackageJsonFiles(project: string, workspace: string): PackageJsonInfo[];
|
|
21
|
+
export declare function findDepPackageJson(packageName: string, projectRoot: string): string | null;
|
|
22
|
+
export declare function _getPackageInfo(packageName: string, directory: string): PackageInfo | null;
|
|
@@ -1,22 +1,109 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getPackageInfo = void 0;
|
|
3
|
+
exports._getPackageInfo = exports.findDepPackageJson = exports.getPackageJsonFiles = exports.getVersionMaps = exports.getPackageInfo = exports.expandFolders = exports.findPackageJsonFiles = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
|
+
const normalize_1 = require("./normalize");
|
|
9
|
+
const packageCache = {};
|
|
10
|
+
function findPackageJsonFiles(project, workspace) {
|
|
11
|
+
return expandFolders(project, workspace)
|
|
12
|
+
.map(f => path.join(f, 'package.json'))
|
|
13
|
+
.filter(f => fs.existsSync(f));
|
|
14
|
+
}
|
|
15
|
+
exports.findPackageJsonFiles = findPackageJsonFiles;
|
|
16
|
+
function expandFolders(child, parent) {
|
|
17
|
+
const result = [];
|
|
18
|
+
parent = (0, normalize_1.normalize)(parent, true);
|
|
19
|
+
child = (0, normalize_1.normalize)(child, true);
|
|
20
|
+
if (!child.startsWith(parent)) {
|
|
21
|
+
throw new Error(`Workspace folder ${path} needs to be a parent of the project folder ${child}`);
|
|
22
|
+
}
|
|
23
|
+
let current = child;
|
|
24
|
+
while (current !== parent) {
|
|
25
|
+
result.push(current);
|
|
26
|
+
const cand = (0, normalize_1.normalize)(path.dirname(current), true);
|
|
27
|
+
if (cand === current) {
|
|
28
|
+
break;
|
|
29
|
+
}
|
|
30
|
+
;
|
|
31
|
+
current = cand;
|
|
32
|
+
}
|
|
33
|
+
result.push(parent);
|
|
34
|
+
return result;
|
|
35
|
+
}
|
|
36
|
+
exports.expandFolders = expandFolders;
|
|
8
37
|
function getPackageInfo(packageName, workspaceRoot) {
|
|
9
|
-
|
|
10
|
-
const
|
|
38
|
+
workspaceRoot = (0, normalize_1.normalize)(workspaceRoot, true);
|
|
39
|
+
const packageJsonInfos = getPackageJsonFiles(workspaceRoot, workspaceRoot);
|
|
40
|
+
for (const info of packageJsonInfos) {
|
|
41
|
+
const cand = _getPackageInfo(packageName, info.directory);
|
|
42
|
+
if (cand) {
|
|
43
|
+
return cand;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
logger_1.logger.warn('No meta data found for shared lib ' + packageName);
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
49
|
+
exports.getPackageInfo = getPackageInfo;
|
|
50
|
+
function getVersionMapCacheKey(project, workspace) {
|
|
51
|
+
return `${project}**${workspace}`;
|
|
52
|
+
}
|
|
53
|
+
function getVersionMaps(project, workspace) {
|
|
54
|
+
return getPackageJsonFiles(project, workspace)
|
|
55
|
+
.map(json => (Object.assign({}, json.content['dependencies'])));
|
|
56
|
+
}
|
|
57
|
+
exports.getVersionMaps = getVersionMaps;
|
|
58
|
+
function getPackageJsonFiles(project, workspace) {
|
|
59
|
+
const cacheKey = getVersionMapCacheKey(project, workspace);
|
|
60
|
+
let maps = packageCache[cacheKey];
|
|
61
|
+
if (maps) {
|
|
62
|
+
return maps;
|
|
63
|
+
}
|
|
64
|
+
maps = findPackageJsonFiles(project, workspace)
|
|
65
|
+
.map(f => {
|
|
66
|
+
const content = JSON.parse(fs.readFileSync(f, 'utf-8'));
|
|
67
|
+
const directory = (0, normalize_1.normalize)(path.dirname(f), true);
|
|
68
|
+
const result = {
|
|
69
|
+
content, directory
|
|
70
|
+
};
|
|
71
|
+
return result;
|
|
72
|
+
});
|
|
73
|
+
packageCache[cacheKey] = maps;
|
|
74
|
+
return maps;
|
|
75
|
+
}
|
|
76
|
+
exports.getPackageJsonFiles = getPackageJsonFiles;
|
|
77
|
+
function findDepPackageJson(packageName, projectRoot) {
|
|
11
78
|
const mainPkgName = getPkgFolder(packageName);
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
79
|
+
let mainPkgPath = path.join(projectRoot, 'node_modules', mainPkgName);
|
|
80
|
+
let mainPkgJsonPath = path.join(mainPkgPath, 'package.json');
|
|
81
|
+
let directory = projectRoot;
|
|
82
|
+
while (path.dirname(directory) !== directory) {
|
|
83
|
+
if (fs.existsSync(mainPkgJsonPath)) {
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
directory = (0, normalize_1.normalize)(path.dirname(directory), true);
|
|
87
|
+
mainPkgPath = path.join(directory, 'node_modules', mainPkgName);
|
|
88
|
+
mainPkgJsonPath = path.join(mainPkgPath, 'package.json');
|
|
89
|
+
}
|
|
90
|
+
if (!fs.existsSync(mainPkgJsonPath)) {
|
|
15
91
|
// TODO: Add logger
|
|
16
92
|
// context.logger.warn('No package.json found for ' + packageName);
|
|
17
|
-
logger_1.logger.
|
|
93
|
+
logger_1.logger.verbose('No package.json found for ' + packageName + ' in ' + mainPkgPath);
|
|
18
94
|
return null;
|
|
19
95
|
}
|
|
96
|
+
return mainPkgJsonPath;
|
|
97
|
+
}
|
|
98
|
+
exports.findDepPackageJson = findDepPackageJson;
|
|
99
|
+
function _getPackageInfo(packageName, directory) {
|
|
100
|
+
var _a, _b, _c, _d, _e;
|
|
101
|
+
const mainPkgName = getPkgFolder(packageName);
|
|
102
|
+
const mainPkgJsonPath = findDepPackageJson(packageName, directory);
|
|
103
|
+
if (!mainPkgJsonPath) {
|
|
104
|
+
return null;
|
|
105
|
+
}
|
|
106
|
+
const mainPkgPath = path.dirname(mainPkgJsonPath);
|
|
20
107
|
const mainPkgJson = readJson(mainPkgJsonPath);
|
|
21
108
|
const version = mainPkgJson['version'];
|
|
22
109
|
const esm = mainPkgJson['type'] === 'module';
|
|
@@ -80,7 +167,7 @@ function getPackageInfo(packageName, workspaceRoot) {
|
|
|
80
167
|
esm: true,
|
|
81
168
|
};
|
|
82
169
|
}
|
|
83
|
-
const secondaryPgkPath = path.join(
|
|
170
|
+
const secondaryPgkPath = path.join(mainPkgPath, relSecondaryPath);
|
|
84
171
|
const secondaryPgkJsonPath = path.join(secondaryPgkPath, 'package.json');
|
|
85
172
|
let secondaryPgkJson = null;
|
|
86
173
|
if (fs.existsSync(secondaryPgkJsonPath)) {
|
|
@@ -125,7 +212,7 @@ function getPackageInfo(packageName, workspaceRoot) {
|
|
|
125
212
|
logger_1.logger.warn("If you don't need this package, skip it in your federation.config.js or consider moving it into depDependencies in your package.json");
|
|
126
213
|
return null;
|
|
127
214
|
}
|
|
128
|
-
exports.
|
|
215
|
+
exports._getPackageInfo = _getPackageInfo;
|
|
129
216
|
function readJson(mainPkgJsonPath) {
|
|
130
217
|
return JSON.parse(fs.readFileSync(mainPkgJsonPath, 'utf-8'));
|
|
131
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-info.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/package-info.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"package-info.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/package-info.ts"],"names":[],"mappings":"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"}
|