@softarc/native-federation 3.3.6 → 3.4.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 +2 -8
- package/package.json +3 -3
- package/src/build.d.ts +2 -0
- package/src/build.js +4 -1
- package/src/build.js.map +1 -1
- package/src/lib/config/share-utils.d.ts +1 -1
- package/src/lib/config/share-utils.js +31 -19
- package/src/lib/config/share-utils.js.map +1 -1
- package/src/lib/config/with-native-federation.js.map +1 -1
- 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.d.ts +1 -0
- package/src/lib/core/build-for-federation.js +57 -23
- package/src/lib/core/build-for-federation.js.map +1 -1
- package/src/lib/core/bundle-caching.d.ts +19 -0
- package/src/lib/core/bundle-caching.js +75 -0
- package/src/lib/core/bundle-caching.js.map +1 -0
- package/src/lib/core/bundle-exposed-and-mappings.d.ts +1 -1
- package/src/lib/core/bundle-exposed-and-mappings.js +12 -2
- package/src/lib/core/bundle-exposed-and-mappings.js.map +1 -1
- package/src/lib/core/bundle-shared.d.ts +4 -1
- package/src/lib/core/bundle-shared.js +28 -45
- package/src/lib/core/bundle-shared.js.map +1 -1
- package/src/lib/core/default-server-deps-list.js.map +1 -1
- package/src/lib/core/default-skip-list.d.ts +0 -1
- package/src/lib/core/default-skip-list.js +1 -2
- package/src/lib/core/default-skip-list.js.map +1 -1
- package/src/lib/core/federation-options.d.ts +1 -0
- package/src/lib/core/remove-unused-deps.js +3 -2
- package/src/lib/core/remove-unused-deps.js.map +1 -1
- package/src/lib/utils/errors.d.ts +3 -0
- package/src/lib/utils/errors.js +12 -0
- package/src/lib/utils/errors.js.map +1 -0
- package/src/lib/utils/logger.d.ts +1 -0
- package/src/lib/utils/logger.js +13 -0
- package/src/lib/utils/logger.js.map +1 -1
- package/src/lib/utils/normalize.d.ts +1 -0
- package/src/lib/utils/normalize.js +5 -0
- package/src/lib/utils/normalize.js.map +1 -1
- package/src/lib/utils/package-info.js +23 -13
- package/src/lib/utils/package-info.js.map +1 -1
- package/src/lib/utils/rebuild-queue.d.ts +6 -0
- package/src/lib/utils/rebuild-queue.js +53 -0
- package/src/lib/utils/rebuild-queue.js.map +1 -0
- package/src/lib/utils/resolve-wildcard-keys.js +17 -13
- package/src/lib/utils/resolve-wildcard-keys.js.map +1 -1
- package/src/lib/utils/copy-src-map-if-exists.d.ts +0 -1
- package/src/lib/utils/copy-src-map-if-exists.js +0 -13
- package/src/lib/utils/copy-src-map-if-exists.js.map +0 -1
|
@@ -10,8 +10,12 @@ const build_result_map_1 = require("../utils/build-result-map");
|
|
|
10
10
|
const build_utils_1 = require("../utils/build-utils");
|
|
11
11
|
const logger_1 = require("../utils/logger");
|
|
12
12
|
const normalize_1 = require("../utils/normalize");
|
|
13
|
-
|
|
13
|
+
const errors_1 = require("../utils/errors");
|
|
14
|
+
function bundleExposedAndMappings(config, fedOptions, externals, signal) {
|
|
14
15
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
|
|
17
|
+
throw new errors_1.AbortedError('[bundle-exposed-and-mappings] Aborted before bundling');
|
|
18
|
+
}
|
|
15
19
|
const shared = config.sharedMappings.map((sm) => {
|
|
16
20
|
const entryPoint = sm.path;
|
|
17
21
|
const tmp = sm.key.replace(/[^A-Za-z0-9]/g, '_');
|
|
@@ -39,10 +43,16 @@ function bundleExposedAndMappings(config, fedOptions, externals) {
|
|
|
39
43
|
kind: 'mapping-or-exposed',
|
|
40
44
|
hash,
|
|
41
45
|
optimizedMappings: config.features.ignoreUnusedDeps,
|
|
46
|
+
signal,
|
|
42
47
|
});
|
|
48
|
+
if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
|
|
49
|
+
throw new errors_1.AbortedError('[bundle-exposed-and-mappings] Aborted after bundle');
|
|
50
|
+
}
|
|
43
51
|
}
|
|
44
52
|
catch (error) {
|
|
45
|
-
|
|
53
|
+
if (!(error instanceof errors_1.AbortedError)) {
|
|
54
|
+
logger_1.logger.error('Error building federation artefacts');
|
|
55
|
+
}
|
|
46
56
|
throw error;
|
|
47
57
|
}
|
|
48
58
|
const resultMap = (0, build_result_map_1.createBuildResultMap)(result, hash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-exposed-and-mappings.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-exposed-and-mappings.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bundle-exposed-and-mappings.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-exposed-and-mappings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import { NormalizedFederationConfig, NormalizedSharedConfig } from '../config/federation-config';
|
|
2
2
|
import { SharedInfo } from '@softarc/native-federation-runtime';
|
|
3
3
|
import { FederationOptions } from './federation-options';
|
|
4
|
-
export declare function bundleShared(sharedBundles: Record<string, NormalizedSharedConfig>, config: NormalizedFederationConfig, fedOptions: FederationOptions, externals: string[], platform
|
|
4
|
+
export declare function bundleShared(sharedBundles: Record<string, NormalizedSharedConfig>, config: NormalizedFederationConfig, fedOptions: FederationOptions, externals: string[], platform: "browser" | "node" | undefined, cacheOptions: {
|
|
5
|
+
pathToCache: string;
|
|
6
|
+
bundleName: string;
|
|
7
|
+
}): Promise<Array<SharedInfo>>;
|
|
@@ -6,26 +6,35 @@ const path = tslib_1.__importStar(require("path"));
|
|
|
6
6
|
const fs = tslib_1.__importStar(require("fs"));
|
|
7
7
|
const build_utils_1 = require("../utils/build-utils");
|
|
8
8
|
const package_info_1 = require("../utils/package-info");
|
|
9
|
-
const copy_src_map_if_exists_1 = require("../utils/copy-src-map-if-exists");
|
|
10
9
|
const logger_1 = require("../utils/logger");
|
|
11
10
|
const crypto_1 = tslib_1.__importDefault(require("crypto"));
|
|
12
11
|
const default_external_list_1 = require("./default-external-list");
|
|
13
12
|
const rewrite_chunk_imports_1 = require("../utils/rewrite-chunk-imports");
|
|
13
|
+
const bundle_caching_1 = require("./bundle-caching");
|
|
14
14
|
function bundleShared(sharedBundles_1, config_1, fedOptions_1, externals_1) {
|
|
15
|
-
return tslib_1.__awaiter(this, arguments, void 0, function* (sharedBundles, config, fedOptions, externals, platform = 'browser') {
|
|
15
|
+
return tslib_1.__awaiter(this, arguments, void 0, function* (sharedBundles, config, fedOptions, externals, platform = 'browser', cacheOptions) {
|
|
16
|
+
const checksum = (0, bundle_caching_1.getChecksum)(sharedBundles);
|
|
16
17
|
const folder = fedOptions.packageJson
|
|
17
18
|
? path.dirname(fedOptions.packageJson)
|
|
18
19
|
: fedOptions.workspaceRoot;
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
const bundleCache = (0, bundle_caching_1.cacheEntry)(cacheOptions.pathToCache, (0, bundle_caching_1.getFilename)(cacheOptions.bundleName));
|
|
21
|
+
if (fedOptions === null || fedOptions === void 0 ? void 0 : fedOptions.cacheExternalArtifacts) {
|
|
22
|
+
const cacheMetadata = bundleCache.getMetadata(checksum);
|
|
23
|
+
if (cacheMetadata) {
|
|
24
|
+
logger_1.logger.debug(`Checksum of ${cacheOptions.bundleName} matched, Skipped artifact bundling`);
|
|
25
|
+
bundleCache.copyFiles(path.join(fedOptions.workspaceRoot, fedOptions.outputPath));
|
|
26
|
+
return cacheMetadata.externals;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
bundleCache.clear();
|
|
30
|
+
const inferredPackageInfos = Object.keys(sharedBundles)
|
|
22
31
|
.filter((packageName) => !sharedBundles[packageName].packageInfo)
|
|
23
32
|
.map((packageName) => (0, package_info_1.getPackageInfo)(packageName, folder))
|
|
24
33
|
.filter((pi) => !!pi);
|
|
25
34
|
const configuredPackageInfos = Object.keys(sharedBundles)
|
|
26
35
|
.filter((packageName) => !!sharedBundles[packageName].packageInfo)
|
|
27
36
|
.map((packageName) => (Object.assign({ packageName }, sharedBundles[packageName].packageInfo)));
|
|
28
|
-
const packageInfos = [...
|
|
37
|
+
const packageInfos = [...inferredPackageInfos, ...configuredPackageInfos];
|
|
29
38
|
const configState = 'BUNDLER_CHUNKS' + // TODO: Replace this with lib version
|
|
30
39
|
fs.readFileSync(path.join(__dirname, '../../../package.json')) +
|
|
31
40
|
JSON.stringify(config);
|
|
@@ -35,8 +44,8 @@ function bundleShared(sharedBundles_1, config_1, fedOptions_1, externals_1) {
|
|
|
35
44
|
return { fileName: pi.entryPoint, outName };
|
|
36
45
|
});
|
|
37
46
|
const fullOutputPath = path.join(fedOptions.workspaceRoot, fedOptions.outputPath);
|
|
38
|
-
const
|
|
39
|
-
const entryPoints = allEntryPoints.filter((ep) => !fs.existsSync(path.join(
|
|
47
|
+
const expectedResults = allEntryPoints.map((ep) => path.join(fullOutputPath, ep.outName));
|
|
48
|
+
const entryPoints = allEntryPoints.filter((ep) => !fs.existsSync(path.join(cacheOptions.pathToCache, ep.outName)));
|
|
40
49
|
if (entryPoints.length > 0) {
|
|
41
50
|
logger_1.logger.info('Preparing shared npm packages for the platform ' + platform);
|
|
42
51
|
logger_1.logger.notice('This only needs to be done once, as results are cached');
|
|
@@ -54,7 +63,7 @@ function bundleShared(sharedBundles_1, config_1, fedOptions_1, externals_1) {
|
|
|
54
63
|
entryPoints,
|
|
55
64
|
tsConfigPath: fedOptions.tsConfig,
|
|
56
65
|
external: [...additionalExternals, ...externals],
|
|
57
|
-
outdir:
|
|
66
|
+
outdir: cacheOptions.pathToCache,
|
|
58
67
|
mappedPaths: config.sharedMappings,
|
|
59
68
|
dev: fedOptions.dev,
|
|
60
69
|
kind: 'shared-package',
|
|
@@ -63,8 +72,7 @@ function bundleShared(sharedBundles_1, config_1, fedOptions_1, externals_1) {
|
|
|
63
72
|
optimizedMappings: config.features.ignoreUnusedDeps,
|
|
64
73
|
});
|
|
65
74
|
const cachedFiles = bundleResult.map((br) => path.basename(br.fileName));
|
|
66
|
-
rewriteImports(cachedFiles,
|
|
67
|
-
copyCacheToOutput(cachedFiles, cachePath, fullOutputPath);
|
|
75
|
+
rewriteImports(cachedFiles, cacheOptions.pathToCache);
|
|
68
76
|
}
|
|
69
77
|
catch (e) {
|
|
70
78
|
logger_1.logger.error('Error bundling shared npm package ');
|
|
@@ -86,22 +94,18 @@ function bundleShared(sharedBundles_1, config_1, fedOptions_1, externals_1) {
|
|
|
86
94
|
logger_1.logger.verbose(e);
|
|
87
95
|
throw e;
|
|
88
96
|
}
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
const cachedResult = JSON.parse(fs.readFileSync(resultCacheFile, 'utf-8'));
|
|
92
|
-
const cachedFiles = cachedResult.map((cr) => cr.outFileName);
|
|
93
|
-
// Chunks are overwritten by the bundler, so we need to reprocess them
|
|
94
|
-
rewriteImports(cachedFiles, cachePath);
|
|
95
|
-
copyCacheToOutput(cachedFiles, cachePath, fullOutputPath);
|
|
96
|
-
return cachedResult;
|
|
97
|
-
}
|
|
98
|
-
const outFileNames = [...exptedResults];
|
|
99
|
-
const result = buildResult(packageInfos, sharedBundles, outFileNames, fedOptions);
|
|
97
|
+
const outFileNames = [...expectedResults];
|
|
98
|
+
const result = buildResult(packageInfos, sharedBundles, outFileNames);
|
|
100
99
|
// TODO: Decide whether/when to add .map files
|
|
101
100
|
const chunks = bundleResult.filter((br) => !br.fileName.endsWith('.map') &&
|
|
102
101
|
!result.find((r) => r.outFileName === path.basename(br.fileName)));
|
|
103
102
|
addChunksToResult(chunks, result, fedOptions.dev);
|
|
104
|
-
|
|
103
|
+
bundleCache.persist({
|
|
104
|
+
checksum,
|
|
105
|
+
externals: result,
|
|
106
|
+
files: bundleResult.map((r) => { var _a; return (_a = r.fileName.split('/').pop()) !== null && _a !== void 0 ? _a : r.fileName; }),
|
|
107
|
+
});
|
|
108
|
+
bundleCache.copyFiles(path.join(fedOptions.workspaceRoot, fedOptions.outputPath));
|
|
105
109
|
return result;
|
|
106
110
|
});
|
|
107
111
|
}
|
|
@@ -112,14 +116,6 @@ function rewriteImports(cachedFiles, cachePath) {
|
|
|
112
116
|
(0, rewrite_chunk_imports_1.rewriteChunkImports)(sourceFilePath);
|
|
113
117
|
}
|
|
114
118
|
}
|
|
115
|
-
function copyCacheToOutput(cachedFiles, cachePath, fullOutputPath) {
|
|
116
|
-
for (const fileName of cachedFiles) {
|
|
117
|
-
const cachedFile = path.join(cachePath, fileName);
|
|
118
|
-
const distFileName = path.join(fullOutputPath, fileName);
|
|
119
|
-
copyFileIfExists(cachedFile, distFileName);
|
|
120
|
-
(0, copy_src_map_if_exists_1.copySrcMapIfExists)(cachedFile, distFileName);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
119
|
function createOutName(pi, configState, fedOptions, encName) {
|
|
124
120
|
const hashBase = pi.version + '_' + pi.entryPoint + '_' + configState;
|
|
125
121
|
const hash = calcHash(hashBase);
|
|
@@ -128,14 +124,7 @@ function createOutName(pi, configState, fedOptions, encName) {
|
|
|
128
124
|
: `${encName}.${hash}.js`;
|
|
129
125
|
return outName;
|
|
130
126
|
}
|
|
131
|
-
function
|
|
132
|
-
const resultCacheState = configState + JSON.stringify(sharedBundles);
|
|
133
|
-
const resultHash = calcHash(resultCacheState);
|
|
134
|
-
const dev = fedOptions.dev ? '-dev' : '';
|
|
135
|
-
const resultCacheFile = path.join(cachePath, 'result-' + resultHash + '-' + platform + dev + '.json');
|
|
136
|
-
return resultCacheFile;
|
|
137
|
-
}
|
|
138
|
-
function buildResult(packageInfos, sharedBundles, outFileNames, fedOptions) {
|
|
127
|
+
function buildResult(packageInfos, sharedBundles, outFileNames) {
|
|
139
128
|
return packageInfos.map((pi) => {
|
|
140
129
|
const shared = sharedBundles[pi.packageName];
|
|
141
130
|
return {
|
|
@@ -191,10 +180,4 @@ function calcHash(hashBase) {
|
|
|
191
180
|
.substring(0, 10);
|
|
192
181
|
return hash;
|
|
193
182
|
}
|
|
194
|
-
function copyFileIfExists(cachedFile, fullOutputPath) {
|
|
195
|
-
fs.mkdirSync(path.dirname(fullOutputPath), { recursive: true });
|
|
196
|
-
if (fs.existsSync(cachedFile)) {
|
|
197
|
-
fs.copyFileSync(cachedFile, fullOutputPath);
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
183
|
//# sourceMappingURL=bundle-shared.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-shared.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/bundle-shared.ts"],"names":[],"mappings":";;AAqBA,
|
|
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-server-deps-list.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/default-server-deps-list.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"default-server-deps-list.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/default-server-deps-list.ts"],"names":[],"mappings":";;;AAAa,QAAA,wBAAwB,GAAa;IAChD,0BAA0B;IAC1B,+BAA+B;IAC/B,cAAc;CACf,CAAC;AAEW,QAAA,uBAAuB,GAAG,IAAI,GAAG,CAAC,gCAAwB,CAAC,CAAC"}
|
|
@@ -2,7 +2,6 @@ export type SkipFn = (name: string) => boolean;
|
|
|
2
2
|
export type SkipListEntry = string | RegExp | SkipFn;
|
|
3
3
|
export type SkipList = SkipListEntry[];
|
|
4
4
|
export declare const DEFAULT_SKIP_LIST: SkipList;
|
|
5
|
-
export declare const PREPARED_DEFAULT_SKIP_LIST: PreparedSkipList;
|
|
6
5
|
export type PreparedSkipList = {
|
|
7
6
|
strings: Set<string>;
|
|
8
7
|
functions: SkipFn[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DEFAULT_SKIP_LIST = void 0;
|
|
4
4
|
exports.prepareSkipList = prepareSkipList;
|
|
5
5
|
exports.isInSkipList = isInSkipList;
|
|
6
6
|
exports.DEFAULT_SKIP_LIST = [
|
|
@@ -28,7 +28,6 @@ exports.DEFAULT_SKIP_LIST = [
|
|
|
28
28
|
'express',
|
|
29
29
|
// (pkg) => pkg.startsWith('@angular/common/locales'),
|
|
30
30
|
];
|
|
31
|
-
exports.PREPARED_DEFAULT_SKIP_LIST = prepareSkipList(exports.DEFAULT_SKIP_LIST);
|
|
32
31
|
function prepareSkipList(skipList) {
|
|
33
32
|
return {
|
|
34
33
|
strings: new Set(skipList.filter((e) => typeof e === 'string')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-skip-list.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/default-skip-list.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"default-skip-list.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/default-skip-list.ts"],"names":[],"mappings":";;;AAoCA,0CAQC;AAED,oCAiBC;AA3DY,QAAA,iBAAiB,GAAa;IACzC,oCAAoC;IACpC,4BAA4B;IAC5B,iCAAiC;IACjC,iCAAiC;IACjC,oCAAoC;IACpC,uCAAuC;IACvC,+CAA+C;IAC/C,iBAAiB;IACjB,SAAS;IACT,QAAQ;IACR,mBAAmB;IACnB,wBAAwB;IACxB,yBAAyB;IACzB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC;IACxC,8BAA8B;IAC9B,mCAAmC;IACnC,kBAAkB;IAClB,oBAAoB;IACpB,eAAe;IACf,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC;IACtE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;IAClC,SAAS;IACT,sDAAsD;CACvD,CAAC;AAQF,SAAgB,eAAe,CAAC,QAAkB;IAChD,OAAO;QACL,OAAO,EAAE,IAAI,GAAG,CACd,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAa,CAC1D;QACD,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,UAAU,CAAa;QACtE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAa;KACnE,CAAC;AACJ,CAAC;AAED,SAAgB,YAAY,CAC1B,KAAa,EACb,QAA0B;IAE1B,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -8,6 +8,7 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
|
|
|
8
8
|
const process_1 = require("process");
|
|
9
9
|
const package_info_1 = require("../utils/package-info");
|
|
10
10
|
const get_external_imports_1 = require("../utils/get-external-imports");
|
|
11
|
+
const normalize_1 = require("../utils/normalize");
|
|
11
12
|
function removeUnusedDeps(config, main, workspaceRoot) {
|
|
12
13
|
const fileInfos = (0, sheriff_core_1.getProjectData)(main, (0, process_1.cwd)(), {
|
|
13
14
|
includeExternalLibraries: true,
|
|
@@ -72,9 +73,9 @@ function addTransientDeps(packages, workspaceRoot) {
|
|
|
72
73
|
return packagesAndPeers;
|
|
73
74
|
}
|
|
74
75
|
function getExternalImports(pInfo, workspaceRoot) {
|
|
75
|
-
const encodedPackageName =
|
|
76
|
+
const encodedPackageName = (0, normalize_1.normalizePackageName)(pInfo.packageName);
|
|
76
77
|
const cacheFileName = `${encodedPackageName}-${pInfo.version}.deps.json`;
|
|
77
|
-
const cachePath = path_1.default.join(workspaceRoot, 'node_modules/.cache/native-federation');
|
|
78
|
+
const cachePath = path_1.default.join(workspaceRoot, 'node_modules/.cache/native-federation/_externals-metadata');
|
|
78
79
|
const cacheFilePath = path_1.default.join(cachePath, cacheFileName);
|
|
79
80
|
const cacheHit = fs_1.default.existsSync(cacheFilePath);
|
|
80
81
|
let peerDeps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-unused-deps.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/remove-unused-deps.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"remove-unused-deps.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/core/remove-unused-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AbortedError = void 0;
|
|
4
|
+
class AbortedError extends Error {
|
|
5
|
+
constructor(message) {
|
|
6
|
+
super(message);
|
|
7
|
+
this.name = 'AbortedError';
|
|
8
|
+
Object.setPrototypeOf(this, AbortedError.prototype);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.AbortedError = AbortedError;
|
|
12
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/errors.ts"],"names":[],"mappings":";;;AAAA,MAAa,YAAa,SAAQ,KAAK;IACrC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;CACF;AAND,oCAMC"}
|
package/src/lib/utils/logger.js
CHANGED
|
@@ -12,6 +12,19 @@ exports.logger = {
|
|
|
12
12
|
info: (msg) => console.log(chalk_1.default.bgGreen.ansi256(15)(' INFO '), msg),
|
|
13
13
|
verbose: (msg) => verbose && console.log(chalk_1.default.bgGreen.ansi256(15)(' DBG! '), msg),
|
|
14
14
|
debug: (msg) => verbose && console.log(chalk_1.default.bgGreen.ansi256(15)(' DBG! '), msg),
|
|
15
|
+
measure: (start, milestone) => {
|
|
16
|
+
if (!verbose)
|
|
17
|
+
return;
|
|
18
|
+
const [totalSeconds, nanoseconds] = process.hrtime(start);
|
|
19
|
+
const minutes = Math.floor(totalSeconds / 60);
|
|
20
|
+
const seconds = totalSeconds % 60;
|
|
21
|
+
const milliseconds = nanoseconds / 1000000;
|
|
22
|
+
const msFormatted = milliseconds.toFixed(3);
|
|
23
|
+
const timeStr = `${minutes.toString().padStart(2, '0')}:${seconds
|
|
24
|
+
.toString()
|
|
25
|
+
.padStart(2, '0')}:${msFormatted.padStart(7, '0')}ms`;
|
|
26
|
+
console.log(chalk_1.default.bgGreen.ansi256(15)(' DBG! '), `${timeStr} - ${milestone}`);
|
|
27
|
+
},
|
|
15
28
|
};
|
|
16
29
|
const setLogLevel = (level) => {
|
|
17
30
|
verbose = level === 'verbose';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/logger.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;AAEvD,0DAA0B;AAE1B,IAAI,OAAO,GAAG,KAAK,CAAC;AAEP,QAAA,MAAM,GAAG;IACpB,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAC3E,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAC1E,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAC5E,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACzE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CACpB,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAClE,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAClB,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/logger.ts"],"names":[],"mappings":";AAAA,uDAAuD;;;;AAEvD,0DAA0B;AAE1B,IAAI,OAAO,GAAG,KAAK,CAAC;AAEP,QAAA,MAAM,GAAG;IACpB,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAC3E,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAC1E,MAAM,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAC5E,IAAI,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACzE,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CACpB,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAClE,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAClB,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;IAClE,OAAO,EAAE,CAAC,KAAuB,EAAE,SAAiB,EAAE,EAAE;QACtD,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,YAAY,GAAG,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,WAAW,GAAG,OAAO,CAAC;QAE3C,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,OAAO;aAC9D,QAAQ,EAAE;aACV,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC;QAExD,OAAO,CAAC,GAAG,CACT,eAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EACnC,GAAG,OAAO,MAAM,SAAS,EAAE,CAC5B,CAAC;IACJ,CAAC;CACF,CAAC;AAEK,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,EAAE;IAC3C,OAAO,GAAG,KAAK,KAAK,SAAS,CAAC;AAChC,CAAC,CAAC;AAFW,QAAA,WAAW,eAEtB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.normalize = normalize;
|
|
4
|
+
exports.normalizePackageName = normalizePackageName;
|
|
4
5
|
function normalize(path, trailingSlash) {
|
|
5
6
|
let cand = path.replace(/\\/g, '/');
|
|
6
7
|
if (typeof trailingSlash === 'undefined') {
|
|
@@ -14,4 +15,8 @@ function normalize(path, trailingSlash) {
|
|
|
14
15
|
}
|
|
15
16
|
return cand;
|
|
16
17
|
}
|
|
18
|
+
function normalizePackageName(fileName) {
|
|
19
|
+
const sanitized = fileName.replace(/[^A-Za-z0-9]/g, '_');
|
|
20
|
+
return sanitized.startsWith('_') ? sanitized.slice(1) : sanitized;
|
|
21
|
+
}
|
|
17
22
|
//# 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,8BAgBC;
|
|
1
|
+
{"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/normalize.ts"],"names":[],"mappings":";;AAAA,8BAgBC;AAED,oDAGC;AArBD,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,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAgB;IACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IACzD,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC"}
|
|
@@ -95,7 +95,7 @@ function findDepPackageJson(packageName, projectRoot) {
|
|
|
95
95
|
return mainPkgJsonPath;
|
|
96
96
|
}
|
|
97
97
|
function _getPackageInfo(packageName, directory) {
|
|
98
|
-
var _a, _b, _c
|
|
98
|
+
var _a, _b, _c;
|
|
99
99
|
const mainPkgName = getPkgFolder(packageName);
|
|
100
100
|
const mainPkgJsonPath = findDepPackageJson(packageName, directory);
|
|
101
101
|
if (!mainPkgJsonPath) {
|
|
@@ -111,23 +111,33 @@ function _getPackageInfo(packageName, directory) {
|
|
|
111
111
|
logger_1.logger.warn('No version found for ' + packageName);
|
|
112
112
|
return null;
|
|
113
113
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
114
|
+
const pathToSecondary = path.relative(mainPkgName, packageName);
|
|
115
|
+
const relSecondaryPath = !pathToSecondary
|
|
116
|
+
? '.'
|
|
117
|
+
: './' + pathToSecondary.replace(/\\/g, '/');
|
|
118
|
+
let secondaryEntryPoint = (_a = mainPkgJson === null || mainPkgJson === void 0 ? void 0 : mainPkgJson.exports) === null || _a === void 0 ? void 0 : _a[relSecondaryPath];
|
|
119
|
+
// wildcard
|
|
120
|
+
if (!secondaryEntryPoint) {
|
|
121
|
+
const wildcardEntry = Object.keys((_b = mainPkgJson === null || mainPkgJson === void 0 ? void 0 : mainPkgJson.exports) !== null && _b !== void 0 ? _b : []).find((e) => e.startsWith('./*'));
|
|
122
|
+
if (wildcardEntry) {
|
|
123
|
+
secondaryEntryPoint = (_c = mainPkgJson === null || mainPkgJson === void 0 ? void 0 : mainPkgJson.exports) === null || _c === void 0 ? void 0 : _c[wildcardEntry];
|
|
124
|
+
if (typeof secondaryEntryPoint === 'string')
|
|
125
|
+
secondaryEntryPoint = secondaryEntryPoint.replace('*', pathToSecondary);
|
|
126
|
+
if (typeof secondaryEntryPoint === 'object')
|
|
127
|
+
Object.keys(secondaryEntryPoint).forEach(function (key) {
|
|
128
|
+
secondaryEntryPoint[key] = secondaryEntryPoint[key].replace('*', pathToSecondary);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
120
131
|
}
|
|
121
|
-
|
|
122
|
-
if (typeof cand === 'string') {
|
|
132
|
+
if (typeof secondaryEntryPoint === 'string') {
|
|
123
133
|
return {
|
|
124
|
-
entryPoint: path.join(mainPkgPath,
|
|
134
|
+
entryPoint: path.join(mainPkgPath, secondaryEntryPoint),
|
|
125
135
|
packageName,
|
|
126
136
|
version,
|
|
127
137
|
esm,
|
|
128
138
|
};
|
|
129
139
|
}
|
|
130
|
-
cand =
|
|
140
|
+
let cand = secondaryEntryPoint === null || secondaryEntryPoint === void 0 ? void 0 : secondaryEntryPoint.import;
|
|
131
141
|
if (typeof cand === 'object') {
|
|
132
142
|
if (cand.module) {
|
|
133
143
|
cand = cand.module;
|
|
@@ -164,7 +174,7 @@ function _getPackageInfo(packageName, directory) {
|
|
|
164
174
|
esm,
|
|
165
175
|
};
|
|
166
176
|
}
|
|
167
|
-
cand =
|
|
177
|
+
cand = secondaryEntryPoint === null || secondaryEntryPoint === void 0 ? void 0 : secondaryEntryPoint.module;
|
|
168
178
|
if (typeof cand === 'object') {
|
|
169
179
|
if (cand.module) {
|
|
170
180
|
cand = cand.module;
|
|
@@ -187,7 +197,7 @@ function _getPackageInfo(packageName, directory) {
|
|
|
187
197
|
esm,
|
|
188
198
|
};
|
|
189
199
|
}
|
|
190
|
-
cand =
|
|
200
|
+
cand = secondaryEntryPoint === null || secondaryEntryPoint === void 0 ? void 0 : secondaryEntryPoint.default;
|
|
191
201
|
if (cand) {
|
|
192
202
|
if (typeof cand === 'object') {
|
|
193
203
|
if (cand.module) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-info.js","sourceRoot":"","sources":["../../../../../../libs/native-federation-core/src/lib/utils/package-info.ts"],"names":[],"mappings":";;AA0BA,oDAOC;AAED,sCAwBC;AAED,wCAiBC;AAMD,wCAOC;AAED,kDAwBC;AAED,gDAgCC;AAED,
|
|
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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"}
|