@softarc/native-federation 1.0.0-beta.2 → 1.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/package.json +2 -2
- package/src/lib/core/build-adapter.d.ts +1 -0
- package/src/lib/core/build-adapter.js.map +1 -1
- package/src/lib/core/build-for-federation.js +7 -7
- package/src/lib/core/build-for-federation.js.map +1 -1
- package/src/lib/core/bundle-exposed.js +10 -5
- package/src/lib/core/bundle-exposed.js.map +1 -1
- package/src/lib/core/bundle-shared-mappings.js +10 -6
- package/src/lib/core/bundle-shared-mappings.js.map +1 -1
- package/src/lib/core/bundle-shared.js +15 -5
- package/src/lib/core/bundle-shared.js.map +1 -1
- package/src/lib/core/federation-builder.d.ts +1 -2
- package/src/lib/core/federation-builder.js +1 -1
- package/src/lib/core/federation-builder.js.map +1 -1
- package/src/lib/core/federation-options.d.ts +1 -0
- package/src/lib/utils/package-info.js +11 -0
- package/src/lib/utils/package-info.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@softarc/native-federation",
|
|
3
|
-
"version": "1.0.0
|
|
3
|
+
"version": "1.0.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.0
|
|
8
|
+
"@softarc/native-federation-runtime": "1.0.0"
|
|
9
9
|
},
|
|
10
10
|
"main": "./src/index.js",
|
|
11
11
|
"typings": "./src/index.d.ts"
|
|
@@ -7,6 +7,7 @@ export interface BuildAdapterOptions {
|
|
|
7
7
|
mappedPaths: MappedPath[];
|
|
8
8
|
packageName?: string;
|
|
9
9
|
esm?: boolean;
|
|
10
|
+
watch?: boolean;
|
|
10
11
|
kind: 'shared-package' | 'shared-mapping' | 'exposed';
|
|
11
12
|
}
|
|
12
13
|
export declare type BuildAdapter = (options: BuildAdapterOptions) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-adapter.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/build-adapter.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AAGzC,IAAI,aAAa,GAAiB,GAAS,EAAE;IAC3C,mBAAmB;IACnB,eAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAC7C,CAAC,CAAA,CAAC;
|
|
1
|
+
{"version":3,"file":"build-adapter.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/build-adapter.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AAGzC,IAAI,aAAa,GAAiB,GAAS,EAAE;IAC3C,mBAAmB;IACnB,eAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;AAC7C,CAAC,CAAA,CAAC;AAgBF,SAAgB,eAAe,CAAC,YAA0B;IACxD,aAAa,GAAG,YAAY,CAAC;AAC/B,CAAC;AAFD,0CAEC;AAED,SAAgB,eAAe;IAC7B,OAAO,aAAa,CAAC;AACvB,CAAC;AAFD,0CAEC"}
|
|
@@ -9,17 +9,17 @@ const bundle_shared_mappings_1 = require("./bundle-shared-mappings");
|
|
|
9
9
|
const bundle_exposed_1 = require("./bundle-exposed");
|
|
10
10
|
exports.defaultBuildParams = {
|
|
11
11
|
skipExposed: false,
|
|
12
|
-
skipMappings: false
|
|
12
|
+
skipMappings: false,
|
|
13
13
|
};
|
|
14
14
|
function buildForFederation(config, fedOptions, externals, buildParams = exports.defaultBuildParams) {
|
|
15
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
-
const exposedInfo = buildParams.skipExposed
|
|
17
|
-
(0, bundle_exposed_1.describeExposed)(config, fedOptions)
|
|
18
|
-
yield (0, bundle_exposed_1.bundleExposed)(config, fedOptions, externals);
|
|
16
|
+
const exposedInfo = buildParams.skipExposed
|
|
17
|
+
? (0, bundle_exposed_1.describeExposed)(config, fedOptions)
|
|
18
|
+
: yield (0, bundle_exposed_1.bundleExposed)(config, fedOptions, externals);
|
|
19
19
|
const sharedPackageInfo = yield (0, bundle_shared_1.bundleShared)(config, fedOptions, externals);
|
|
20
|
-
const sharedMappingInfo = buildParams.skipMappings
|
|
21
|
-
(0, bundle_shared_mappings_1.describeSharedMappings)(config, fedOptions)
|
|
22
|
-
yield (0, bundle_shared_mappings_1.bundleSharedMappings)(config, fedOptions, externals);
|
|
20
|
+
const sharedMappingInfo = buildParams.skipMappings
|
|
21
|
+
? (0, bundle_shared_mappings_1.describeSharedMappings)(config, fedOptions)
|
|
22
|
+
: yield (0, bundle_shared_mappings_1.bundleSharedMappings)(config, fedOptions, externals);
|
|
23
23
|
const sharedInfo = [...sharedPackageInfo, ...sharedMappingInfo];
|
|
24
24
|
const federationInfo = {
|
|
25
25
|
name: config.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-for-federation.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/build-for-federation.ts"],"names":[],"mappings":";;;;AAGA,yDAAoD;AACpD,mEAA8D;AAC9D,mDAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"build-for-federation.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/build-for-federation.ts"],"names":[],"mappings":";;;;AAGA,yDAAoD;AACpD,mEAA8D;AAC9D,mDAA+C;AAC/C,qEAGkC;AAClC,qDAAkE;AAOrD,QAAA,kBAAkB,GAAgB;IAC7C,WAAW,EAAE,KAAK;IAClB,YAAY,EAAE,KAAK;CACpB,CAAC;AAEF,SAAsB,kBAAkB,CACtC,MAAkC,EAClC,UAA6B,EAC7B,SAAmB,EACnB,WAAW,GAAG,0BAAkB;;QAEhC,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW;YACzC,CAAC,CAAC,IAAA,gCAAe,EAAC,MAAM,EAAE,UAAU,CAAC;YACrC,CAAC,CAAC,MAAM,IAAA,8BAAa,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAEvD,MAAM,iBAAiB,GAAG,MAAM,IAAA,4BAAY,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAE5E,MAAM,iBAAiB,GAAG,WAAW,CAAC,YAAY;YAChD,CAAC,CAAC,IAAA,+CAAsB,EAAC,MAAM,EAAE,UAAU,CAAC;YAC5C,CAAC,CAAC,MAAM,IAAA,6CAAoB,EAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAE9D,MAAM,UAAU,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,iBAAiB,CAAC,CAAC;QAEhE,MAAM,cAAc,GAAmB;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,WAAW;SACrB,CAAC;QAEF,IAAA,2CAAmB,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAChD,IAAA,iCAAc,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzC,CAAC;CAAA;AA1BD,gDA0BC"}
|
|
@@ -23,16 +23,20 @@ function bundleExposed(config, options, externals) {
|
|
|
23
23
|
tsConfigPath: options.tsConfig,
|
|
24
24
|
external: externals,
|
|
25
25
|
outfile: outFilePath,
|
|
26
|
+
watch: options.watch,
|
|
26
27
|
mappedPaths: config.sharedMappings,
|
|
27
28
|
kind: 'exposed',
|
|
28
29
|
});
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
let finalOutFileName = outFileName;
|
|
31
|
+
if (!options.watch) {
|
|
32
|
+
const hash = (0, hash_file_1.hashFile)(outFilePath);
|
|
33
|
+
finalOutFileName = `${key}-${hash}.js`;
|
|
34
|
+
const hashedOutFilePath = path.join(options.outputPath, finalOutFileName);
|
|
35
|
+
fs.renameSync(outFilePath, hashedOutFilePath);
|
|
36
|
+
}
|
|
33
37
|
result.push({
|
|
34
38
|
key,
|
|
35
|
-
outFileName:
|
|
39
|
+
outFileName: finalOutFileName,
|
|
36
40
|
dev: !options.dev
|
|
37
41
|
? undefined
|
|
38
42
|
: {
|
|
@@ -42,6 +46,7 @@ function bundleExposed(config, options, externals) {
|
|
|
42
46
|
}
|
|
43
47
|
catch (e) {
|
|
44
48
|
logger_1.logger.error('Error bundling exposed module ' + entryPoint);
|
|
49
|
+
logger_1.logger.notice('Please check the `exposes` section in your federation.config.js');
|
|
45
50
|
logger_1.logger.error(e);
|
|
46
51
|
}
|
|
47
52
|
}
|
|
@@ -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,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CACtD,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,WAAW,EAAE,MAAM,CAAC,cAAc;oBAClC,IAAI,EAAE,SAAS;iBAChB,CAAC,CAAC;gBAEH,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,WAAW,CAAC,CAAC;
|
|
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,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CACtD,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;AA1DD,sCA0DC;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,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CACtD,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;AAvBD,0CAuBC"}
|
|
@@ -24,15 +24,19 @@ function bundleSharedMappings(config, fedOptions, externals) {
|
|
|
24
24
|
external: externals,
|
|
25
25
|
outfile: outFilePath,
|
|
26
26
|
mappedPaths: [],
|
|
27
|
+
watch: fedOptions.watch,
|
|
27
28
|
kind: 'shared-mapping',
|
|
28
29
|
});
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
let finalOutFileName = outFileName;
|
|
31
|
+
if (!fedOptions.watch) {
|
|
32
|
+
const hash = (0, hash_file_1.hashFile)(outFilePath);
|
|
33
|
+
finalOutFileName = `${key}-${hash}.js`;
|
|
34
|
+
const hashedOutFilePath = path.join(fedOptions.outputPath, finalOutFileName);
|
|
35
|
+
fs.renameSync(outFilePath, hashedOutFilePath);
|
|
36
|
+
}
|
|
33
37
|
result.push({
|
|
34
38
|
packageName: m.key,
|
|
35
|
-
outFileName:
|
|
39
|
+
outFileName: finalOutFileName,
|
|
36
40
|
requiredVersion: '',
|
|
37
41
|
singleton: true,
|
|
38
42
|
strictVersion: false,
|
|
@@ -45,8 +49,8 @@ function bundleSharedMappings(config, fedOptions, externals) {
|
|
|
45
49
|
});
|
|
46
50
|
}
|
|
47
51
|
catch (e) {
|
|
48
|
-
// TODO: add logger
|
|
49
52
|
logger_1.logger.error('Error bundling shared mapping ' + m.key);
|
|
53
|
+
logger_1.logger.notice(`Please check this shared mapping in the 'path' section or your tsconfig.(app|base).json`);
|
|
50
54
|
logger_1.logger.notice(`If you don't need this mapping to shared, you can skip it in your federation.config.js`);
|
|
51
55
|
logger_1.logger.error(e);
|
|
52
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-shared-mappings.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-shared-mappings.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+CAAyB;AAEzB,sDAA8C;AAE9C,kDAA8C;AAE9C,4CAAyC;AACzC,kDAA+C;AAE/C,SAAsB,oBAAoB,CACxC,MAAkC,EAClC,UAA6B,EAC7B,SAAmB;;;QAEnB,MAAM,MAAM,GAAsB,EAAE,CAAC;QAErC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,cAAc,EAAE;YACrC,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAChD,MAAM,WAAW,GAAG,GAAG,GAAG,KAAK,CAAC;YAChC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAElE,eAAM,CAAC,IAAI,CAAC,0BAA0B,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAEhD,IAAI;gBACF,MAAM,IAAA,oBAAM,EAAC;oBACX,UAAU,EAAE,CAAC,CAAC,IAAI;oBAClB,YAAY,EAAE,MAAA,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,mCAAI,UAAU,CAAC,QAAQ;oBACzD,QAAQ,EAAE,SAAS;oBACnB,OAAO,EAAE,WAAW;oBACpB,WAAW,EAAE,EAAE;oBACf,IAAI,EAAE,gBAAgB;iBACvB,CAAC,CAAC;gBAEH,MAAM,IAAI,GAAG,IAAA,oBAAQ,EAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle-shared-mappings.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-shared-mappings.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const build_utils_1 = require("../utils/build-utils");
|
|
|
8
8
|
const package_info_1 = require("../utils/package-info");
|
|
9
9
|
const copy_src_map_if_exists_1 = require("../utils/copy-src-map-if-exists");
|
|
10
10
|
const logger_1 = require("../utils/logger");
|
|
11
|
-
const hash_file_1 = require("../utils/hash-file");
|
|
12
11
|
const normalize_1 = require("../utils/normalize");
|
|
13
12
|
function bundleShared(config, fedOptions, externals) {
|
|
14
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -21,17 +20,28 @@ function bundleShared(config, fedOptions, externals) {
|
|
|
21
20
|
// logger.notice(
|
|
22
21
|
// 'Make sure, you skip all unneeded packages in your federation.config.js!'
|
|
23
22
|
// );
|
|
24
|
-
const federationConfigPath = path.join(
|
|
25
|
-
|
|
23
|
+
// const federationConfigPath = path.join(
|
|
24
|
+
// fedOptions.workspaceRoot,
|
|
25
|
+
// fedOptions.federationConfig
|
|
26
|
+
// );
|
|
27
|
+
//const hash = hashFile(federationConfigPath);
|
|
28
|
+
let first = true;
|
|
26
29
|
for (const pi of packageInfos) {
|
|
27
30
|
// logger.info('Bundling shared package ' + pi.packageName);
|
|
28
31
|
const encName = pi.packageName.replace(/[^A-Za-z0-9]/g, '_');
|
|
29
32
|
const encVersion = pi.version.replace(/[^A-Za-z0-9]/g, '_');
|
|
30
|
-
const outFileName = `${encName}-${encVersion}-${hash}.js`;
|
|
33
|
+
// const outFileName = `${encName}-${encVersion}-${hash}.js`;
|
|
34
|
+
const outFileName = `${encName}-${encVersion}.js`;
|
|
31
35
|
const cachePath = path.join(fedOptions.workspaceRoot, 'node_modules/.cache/native-federation');
|
|
32
36
|
fs.mkdirSync(cachePath, { recursive: true });
|
|
33
37
|
const cachedFile = path.join(cachePath, outFileName);
|
|
34
38
|
if (!fs.existsSync(cachedFile)) {
|
|
39
|
+
if (first) {
|
|
40
|
+
logger_1.logger.notice('Preparing shared npm packages');
|
|
41
|
+
logger_1.logger.notice('This only needs to be done once');
|
|
42
|
+
logger_1.logger.notice("Skip packages you don't want to share in your federation config");
|
|
43
|
+
}
|
|
44
|
+
first = false;
|
|
35
45
|
logger_1.logger.info('Preparing shared package ' + pi.packageName);
|
|
36
46
|
try {
|
|
37
47
|
yield (0, build_utils_1.bundle)({
|
|
@@ -46,7 +56,7 @@ function bundleShared(config, fedOptions, externals) {
|
|
|
46
56
|
});
|
|
47
57
|
}
|
|
48
58
|
catch (e) {
|
|
49
|
-
logger_1.logger.error('Error bundling ' + pi.packageName);
|
|
59
|
+
logger_1.logger.error('Error bundling npm package ' + pi.packageName);
|
|
50
60
|
if (e instanceof Error) {
|
|
51
61
|
logger_1.logger.error(e.message);
|
|
52
62
|
}
|
|
@@ -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":";;;;AAAA,mDAA6B;AAC7B,+CAAyB;AAEzB,sDAA8C;AAC9C,wDAAoE;AAGpE,4EAAqE;AACrE,4CAAyC;AAEzC,kDAA+C;AAE/C,SAAsB,YAAY,CAChC,MAAkC,EAClC,UAA6B,EAC7B,SAAmB;;QAEnB,MAAM,MAAM,GAAsB,EAAE,CAAC;QACrC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;YAC7C,mFAAmF;aAClF,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAA,6BAAc,EAAC,WAAW,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC;aAC3E,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAkB,CAAC;QAEzC,6EAA6E;QAC7E,iBAAiB;QACjB,8EAA8E;QAC9E,KAAK;QAEL,0CAA0C;QAC1C,8BAA8B;QAC9B,gCAAgC;QAChC,KAAK;QAEL,8CAA8C;QAE9C,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,MAAM,EAAE,IAAI,YAAY,EAAE;YAC7B,4DAA4D;YAE5D,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAC7D,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAE5D,6DAA6D;YAC7D,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,UAAU,KAAK,CAAC;YAElD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CACzB,UAAU,CAAC,aAAa,EACxB,uCAAuC,CACxC,CAAC;YAEF,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC9B,IAAI,KAAK,EAAE;oBACT,eAAM,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC;oBAC/C,eAAM,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC;oBACjD,eAAM,CAAC,MAAM,CACX,iEAAiE,CAClE,CAAC;iBACH;gBACD,KAAK,GAAG,KAAK,CAAC;gBAEd,eAAM,CAAC,IAAI,CAAC,2BAA2B,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;gBAE1D,IAAI;oBACF,MAAM,IAAA,oBAAM,EAAC;wBACX,UAAU,EAAE,EAAE,CAAC,UAAU;wBACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;wBACjC,QAAQ,EAAE,SAAS;wBACnB,OAAO,EAAE,UAAU;wBACnB,WAAW,EAAE,MAAM,CAAC,cAAc;wBAClC,WAAW,EAAE,EAAE,CAAC,WAAW;wBAC3B,GAAG,EAAE,EAAE,CAAC,GAAG;wBACX,IAAI,EAAE,gBAAgB;qBACvB,CAAC,CAAC;iBACJ;gBAAC,OAAO,CAAC,EAAE;oBACV,eAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;oBAC7D,IAAI,CAAC,YAAY,KAAK,EAAE;wBACtB,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;qBACzB;oBACD,eAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;oBAC1D,eAAM,CAAC,MAAM,CACX,uEAAuE,CACxE,CAAC;oBACF,eAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAClB,SAAS;iBACV;aACF;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;YAE7C,MAAM,CAAC,IAAI,CAAC;gBACV,WAAW,EAAE,EAAE,CAAC,WAAW;gBAC3B,WAAW,EAAE,WAAW;gBACxB,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,OAAO,EAAE,EAAE,CAAC,OAAO;gBACnB,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG;oBAClB,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC;wBACE,UAAU,EAAE,IAAA,qBAAS,EAAC,EAAE,CAAC,UAAU,CAAC;qBACrC;aACN,CAAC,CAAC;YAEH,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAC9B,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,UAAU,EACrB,WAAW,CACZ,CAAC;YAEF,gBAAgB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YAC7C,IAAA,2CAAkB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;SAChD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CAAA;AA1GD,oCA0GC;AAED,SAAS,gBAAgB,CAAC,UAAkB,EAAE,cAAsB;IAClE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhE,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC7B,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;KAC7C;AACH,CAAC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { NormalizedFederationConfig } from '../config/federation-config';
|
|
2
2
|
import { BuildAdapter } from './build-adapter';
|
|
3
|
-
import { BuildParams } from './build-for-federation';
|
|
4
3
|
import { FederationOptions } from './federation-options';
|
|
5
4
|
export interface BuildHelperParams {
|
|
6
5
|
options: FederationOptions;
|
|
7
6
|
adapter: BuildAdapter;
|
|
8
7
|
}
|
|
9
8
|
declare function init(params: BuildHelperParams): Promise<void>;
|
|
10
|
-
declare function build(buildParams?: BuildParams): Promise<void>;
|
|
9
|
+
declare function build(buildParams?: import("./build-for-federation").BuildParams): Promise<void>;
|
|
11
10
|
export declare const federationBuilder: {
|
|
12
11
|
init: typeof init;
|
|
13
12
|
build: typeof build;
|
|
@@ -19,7 +19,7 @@ function init(params) {
|
|
|
19
19
|
}
|
|
20
20
|
function build(buildParams = build_for_federation_1.defaultBuildParams) {
|
|
21
21
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
(0, build_for_federation_1.buildForFederation)(config, fedOptions, externals, buildParams);
|
|
22
|
+
yield (0, build_for_federation_1.buildForFederation)(config, fedOptions, externals, buildParams);
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
exports.federationBuilder = {
|
|
@@ -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":";;;;AACA,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,MAAM,GAAG,MAAM,IAAA,6CAAoB,EAAC,UAAU,CAAC,CAAC;QAChD,SAAS,GAAG,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CAAA;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"}
|
|
@@ -34,6 +34,17 @@ function getPackageInfo(packageName, workspaceRoot) {
|
|
|
34
34
|
relSecondaryPath = './' + relSecondaryPath.replace(/\\/g, '/');
|
|
35
35
|
}
|
|
36
36
|
let cand = (_b = (_a = mainPkgJson === null || mainPkgJson === void 0 ? void 0 : mainPkgJson.exports) === null || _a === void 0 ? void 0 : _a[relSecondaryPath]) === null || _b === void 0 ? void 0 : _b.import;
|
|
37
|
+
if (typeof cand === 'object') {
|
|
38
|
+
if (cand.module) {
|
|
39
|
+
cand = cand.module;
|
|
40
|
+
}
|
|
41
|
+
else if (cand.default) {
|
|
42
|
+
cand = cand.default;
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
cand = null;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
37
48
|
if (cand) {
|
|
38
49
|
return {
|
|
39
50
|
entryPoint: path.join(mainPkgPath, cand),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-info.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/package-info.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAC7B,qCAAkC;AAclC,SAAgB,cAAc,CAC5B,WAAmB,EACnB,aAAqB;;IAErB,MAAM,WAAW,GAAG,aAAa,CAAC;IAClC,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IACxE,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAE/D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;QAC/B,mBAAmB;QACnB,mEAAmE;QACnE,eAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,WAAW,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAE9C,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAW,CAAC;IACjD,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC;IAE7C,IAAI,CAAC,OAAO,EAAE;QACZ,mBAAmB;QACnB,8DAA8D;QAC9D,eAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,WAAW,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC;KACb;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IAC/D,IAAI,CAAC,gBAAgB,EAAE;QACrB,gBAAgB,GAAG,GAAG,CAAC;KACxB;SAAM;QACL,gBAAgB,GAAG,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KAChE;IAED,IAAI,IAAI,GAAG,MAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,0CAAG,gBAAgB,CAAC,0CAAE,MAAM,CAAC;
|
|
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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"}
|