@module-federation/runtime-core 0.0.0-feat-modern-3-0-20260113090730 → 0.0.0-feat-shared-treeshake-poc-20260114074114
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/dist/index.cjs.cjs +342 -144
- package/dist/index.cjs.cjs.map +1 -1
- package/dist/index.esm.js +342 -144
- package/dist/index.esm.js.map +1 -1
- package/dist/src/core.d.ts +5 -1
- package/dist/src/module/index.d.ts +2 -1
- package/dist/src/shared/index.d.ts +12 -3
- package/dist/src/type/config.d.ts +14 -1
- package/dist/src/utils/share.d.ts +27 -9
- package/package.json +3 -3
package/dist/index.cjs.cjs
CHANGED
|
@@ -201,7 +201,7 @@ function getGlobalFederationConstructor() {
|
|
|
201
201
|
function setGlobalFederationConstructor(FederationConstructor, isDebug = sdk.isDebugMode()) {
|
|
202
202
|
if (isDebug) {
|
|
203
203
|
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR__ = FederationConstructor;
|
|
204
|
-
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.0.0-feat-
|
|
204
|
+
CurrentGlobal.__FEDERATION__.__DEBUG_CONSTRUCTOR_VERSION__ = "0.0.0-feat-shared-treeshake-poc-20260114074114";
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
207
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
@@ -808,6 +808,9 @@ function formatShare(shareArgs, from, name, shareStrategy) {
|
|
|
808
808
|
throw new Error(`Can not get shared '${name}'!`);
|
|
809
809
|
});
|
|
810
810
|
}
|
|
811
|
+
if (shareArgs.shareConfig?.eager && shareArgs.treeShaking) {
|
|
812
|
+
throw new Error('Can not set "eager:true" and "treeShaking" at the same time!');
|
|
813
|
+
}
|
|
811
814
|
return {
|
|
812
815
|
deps: [],
|
|
813
816
|
useIn: [],
|
|
@@ -828,37 +831,67 @@ function formatShare(shareArgs, from, name, shareStrategy) {
|
|
|
828
831
|
? shareArgs.scope
|
|
829
832
|
: [shareArgs.scope ?? 'default'],
|
|
830
833
|
strategy: (shareArgs.strategy ?? shareStrategy) || 'version-first',
|
|
834
|
+
treeShaking: shareArgs.treeShaking
|
|
835
|
+
? {
|
|
836
|
+
...shareArgs.treeShaking,
|
|
837
|
+
mode: shareArgs.treeShaking.mode ?? 'server-calc',
|
|
838
|
+
status: shareArgs.treeShaking.status ?? 1 /* TreeShakingStatus.UNKNOWN */,
|
|
839
|
+
useIn: [],
|
|
840
|
+
}
|
|
841
|
+
: undefined,
|
|
831
842
|
};
|
|
832
843
|
}
|
|
833
|
-
function formatShareConfigs(
|
|
834
|
-
const shareArgs =
|
|
835
|
-
const from =
|
|
836
|
-
const
|
|
844
|
+
function formatShareConfigs(prevOptions, newOptions) {
|
|
845
|
+
const shareArgs = newOptions.shared || {};
|
|
846
|
+
const from = newOptions.name;
|
|
847
|
+
const newShareInfos = Object.keys(shareArgs).reduce((res, pkgName) => {
|
|
837
848
|
const arrayShareArgs = arrayOptions(shareArgs[pkgName]);
|
|
838
849
|
res[pkgName] = res[pkgName] || [];
|
|
839
850
|
arrayShareArgs.forEach((shareConfig) => {
|
|
840
|
-
res[pkgName].push(formatShare(shareConfig, from, pkgName,
|
|
851
|
+
res[pkgName].push(formatShare(shareConfig, from, pkgName, newOptions.shareStrategy));
|
|
841
852
|
});
|
|
842
853
|
return res;
|
|
843
854
|
}, {});
|
|
844
|
-
const
|
|
845
|
-
...
|
|
855
|
+
const allShareInfos = {
|
|
856
|
+
...prevOptions.shared,
|
|
846
857
|
};
|
|
847
|
-
Object.keys(
|
|
848
|
-
if (!
|
|
849
|
-
|
|
858
|
+
Object.keys(newShareInfos).forEach((shareKey) => {
|
|
859
|
+
if (!allShareInfos[shareKey]) {
|
|
860
|
+
allShareInfos[shareKey] = newShareInfos[shareKey];
|
|
850
861
|
}
|
|
851
862
|
else {
|
|
852
|
-
|
|
853
|
-
const isSameVersion =
|
|
863
|
+
newShareInfos[shareKey].forEach((newUserSharedOptions) => {
|
|
864
|
+
const isSameVersion = allShareInfos[shareKey].find((sharedVal) => sharedVal.version === newUserSharedOptions.version);
|
|
854
865
|
if (!isSameVersion) {
|
|
855
|
-
|
|
866
|
+
allShareInfos[shareKey].push(newUserSharedOptions);
|
|
856
867
|
}
|
|
857
868
|
});
|
|
858
869
|
}
|
|
859
870
|
});
|
|
860
|
-
return {
|
|
871
|
+
return { allShareInfos, newShareInfos };
|
|
861
872
|
}
|
|
873
|
+
function shouldUseTreeShaking(treeShaking, usedExports) {
|
|
874
|
+
if (!treeShaking) {
|
|
875
|
+
return false;
|
|
876
|
+
}
|
|
877
|
+
const { status, mode } = treeShaking;
|
|
878
|
+
if (status === 0 /* TreeShakingStatus.NO_USE */) {
|
|
879
|
+
return false;
|
|
880
|
+
}
|
|
881
|
+
if (status === 2 /* TreeShakingStatus.CALCULATED */) {
|
|
882
|
+
return true;
|
|
883
|
+
}
|
|
884
|
+
if (mode === 'runtime-infer') {
|
|
885
|
+
if (!usedExports) {
|
|
886
|
+
return true;
|
|
887
|
+
}
|
|
888
|
+
return isMatchUsedExports(treeShaking, usedExports);
|
|
889
|
+
}
|
|
890
|
+
return false;
|
|
891
|
+
}
|
|
892
|
+
/**
|
|
893
|
+
* compare version a and b, return true if a is less than b
|
|
894
|
+
*/
|
|
862
895
|
function versionLt(a, b) {
|
|
863
896
|
const transformInvalidVersion = (version) => {
|
|
864
897
|
const isNumberVersion = !Number.isNaN(Number(version));
|
|
@@ -904,19 +937,79 @@ const isLoaded = (shared) => {
|
|
|
904
937
|
const isLoading = (shared) => {
|
|
905
938
|
return Boolean(shared.loading);
|
|
906
939
|
};
|
|
907
|
-
|
|
940
|
+
const isMatchUsedExports = (treeShaking, usedExports) => {
|
|
941
|
+
if (!treeShaking || !usedExports) {
|
|
942
|
+
return false;
|
|
943
|
+
}
|
|
944
|
+
const { usedExports: treeShakingUsedExports } = treeShaking;
|
|
945
|
+
if (!treeShakingUsedExports) {
|
|
946
|
+
return false;
|
|
947
|
+
}
|
|
948
|
+
if (usedExports.every((e) => treeShakingUsedExports.includes(e))) {
|
|
949
|
+
return true;
|
|
950
|
+
}
|
|
951
|
+
return false;
|
|
952
|
+
};
|
|
953
|
+
function findSingletonVersionOrderByVersion(shareScopeMap, scope, pkgName, treeShaking) {
|
|
908
954
|
const versions = shareScopeMap[scope][pkgName];
|
|
955
|
+
let version = '';
|
|
956
|
+
let useTreesShaking = shouldUseTreeShaking(treeShaking);
|
|
957
|
+
// return false means use prev version
|
|
909
958
|
const callback = function (prev, cur) {
|
|
959
|
+
if (useTreesShaking) {
|
|
960
|
+
if (!versions[prev].treeShaking) {
|
|
961
|
+
return true;
|
|
962
|
+
}
|
|
963
|
+
if (!versions[cur].treeShaking) {
|
|
964
|
+
return false;
|
|
965
|
+
}
|
|
966
|
+
return !isLoaded(versions[prev].treeShaking) && versionLt(prev, cur);
|
|
967
|
+
}
|
|
910
968
|
return !isLoaded(versions[prev]) && versionLt(prev, cur);
|
|
911
969
|
};
|
|
912
|
-
|
|
970
|
+
if (useTreesShaking) {
|
|
971
|
+
version = findVersion(shareScopeMap[scope][pkgName], callback);
|
|
972
|
+
if (version) {
|
|
973
|
+
return {
|
|
974
|
+
version,
|
|
975
|
+
useTreesShaking,
|
|
976
|
+
};
|
|
977
|
+
}
|
|
978
|
+
useTreesShaking = false;
|
|
979
|
+
}
|
|
980
|
+
return {
|
|
981
|
+
version: findVersion(shareScopeMap[scope][pkgName], callback),
|
|
982
|
+
useTreesShaking,
|
|
983
|
+
};
|
|
913
984
|
}
|
|
914
|
-
|
|
985
|
+
const isLoadingOrLoaded = (shared) => {
|
|
986
|
+
return isLoaded(shared) || isLoading(shared);
|
|
987
|
+
};
|
|
988
|
+
function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName, treeShaking) {
|
|
915
989
|
const versions = shareScopeMap[scope][pkgName];
|
|
990
|
+
let version = '';
|
|
991
|
+
let useTreesShaking = shouldUseTreeShaking(treeShaking);
|
|
992
|
+
// return false means use prev version
|
|
916
993
|
const callback = function (prev, cur) {
|
|
917
|
-
|
|
918
|
-
|
|
919
|
-
|
|
994
|
+
if (useTreesShaking) {
|
|
995
|
+
if (!versions[prev].treeShaking) {
|
|
996
|
+
return true;
|
|
997
|
+
}
|
|
998
|
+
if (!versions[cur].treeShaking) {
|
|
999
|
+
return false;
|
|
1000
|
+
}
|
|
1001
|
+
if (isLoadingOrLoaded(versions[cur].treeShaking)) {
|
|
1002
|
+
if (isLoadingOrLoaded(versions[prev].treeShaking)) {
|
|
1003
|
+
return Boolean(versionLt(prev, cur));
|
|
1004
|
+
}
|
|
1005
|
+
else {
|
|
1006
|
+
return true;
|
|
1007
|
+
}
|
|
1008
|
+
}
|
|
1009
|
+
if (isLoadingOrLoaded(versions[prev].treeShaking)) {
|
|
1010
|
+
return false;
|
|
1011
|
+
}
|
|
1012
|
+
}
|
|
920
1013
|
if (isLoadingOrLoaded(versions[cur])) {
|
|
921
1014
|
if (isLoadingOrLoaded(versions[prev])) {
|
|
922
1015
|
return Boolean(versionLt(prev, cur));
|
|
@@ -930,7 +1023,20 @@ function findSingletonVersionOrderByLoaded(shareScopeMap, scope, pkgName) {
|
|
|
930
1023
|
}
|
|
931
1024
|
return versionLt(prev, cur);
|
|
932
1025
|
};
|
|
933
|
-
|
|
1026
|
+
if (useTreesShaking) {
|
|
1027
|
+
version = findVersion(shareScopeMap[scope][pkgName], callback);
|
|
1028
|
+
if (version) {
|
|
1029
|
+
return {
|
|
1030
|
+
version,
|
|
1031
|
+
useTreesShaking,
|
|
1032
|
+
};
|
|
1033
|
+
}
|
|
1034
|
+
useTreesShaking = false;
|
|
1035
|
+
}
|
|
1036
|
+
return {
|
|
1037
|
+
version: findVersion(shareScopeMap[scope][pkgName], callback),
|
|
1038
|
+
useTreesShaking,
|
|
1039
|
+
};
|
|
934
1040
|
}
|
|
935
1041
|
function getFindShareFunction(strategy) {
|
|
936
1042
|
if (strategy === 'loaded-first') {
|
|
@@ -942,7 +1048,7 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
942
1048
|
if (!localShareScopeMap) {
|
|
943
1049
|
return;
|
|
944
1050
|
}
|
|
945
|
-
const { shareConfig, scope = DEFAULT_SCOPE, strategy } = shareInfo;
|
|
1051
|
+
const { shareConfig, scope = DEFAULT_SCOPE, strategy, treeShaking, } = shareInfo;
|
|
946
1052
|
const scopes = Array.isArray(scope) ? scope : [scope];
|
|
947
1053
|
for (const sc of scopes) {
|
|
948
1054
|
if (shareConfig &&
|
|
@@ -950,14 +1056,13 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
950
1056
|
localShareScopeMap[sc][pkgName]) {
|
|
951
1057
|
const { requiredVersion } = shareConfig;
|
|
952
1058
|
const findShareFunction = getFindShareFunction(strategy);
|
|
953
|
-
const maxOrSingletonVersion = findShareFunction(localShareScopeMap, sc, pkgName);
|
|
954
|
-
//@ts-ignore
|
|
1059
|
+
const { version: maxOrSingletonVersion, useTreesShaking } = findShareFunction(localShareScopeMap, sc, pkgName, treeShaking);
|
|
955
1060
|
const defaultResolver = () => {
|
|
1061
|
+
const shared = localShareScopeMap[sc][pkgName][maxOrSingletonVersion];
|
|
956
1062
|
if (shareConfig.singleton) {
|
|
957
1063
|
if (typeof requiredVersion === 'string' &&
|
|
958
1064
|
!satisfy(maxOrSingletonVersion, requiredVersion)) {
|
|
959
|
-
const msg = `Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion &&
|
|
960
|
-
localShareScopeMap[sc][pkgName][maxOrSingletonVersion].from} of shared singleton module ${pkgName} does not satisfy the requirement of ${shareInfo.from} which needs ${requiredVersion})`;
|
|
1065
|
+
const msg = `Version ${maxOrSingletonVersion} from ${maxOrSingletonVersion && shared.from} of shared singleton module ${pkgName} does not satisfy the requirement of ${shareInfo.from} which needs ${requiredVersion})`;
|
|
961
1066
|
if (shareConfig.strictVersion) {
|
|
962
1067
|
error(msg);
|
|
963
1068
|
}
|
|
@@ -965,21 +1070,48 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
965
1070
|
warn(msg);
|
|
966
1071
|
}
|
|
967
1072
|
}
|
|
968
|
-
return
|
|
1073
|
+
return {
|
|
1074
|
+
shared,
|
|
1075
|
+
useTreesShaking,
|
|
1076
|
+
};
|
|
969
1077
|
}
|
|
970
1078
|
else {
|
|
971
1079
|
if (requiredVersion === false || requiredVersion === '*') {
|
|
972
|
-
return
|
|
1080
|
+
return {
|
|
1081
|
+
shared,
|
|
1082
|
+
useTreesShaking,
|
|
1083
|
+
};
|
|
973
1084
|
}
|
|
974
1085
|
if (satisfy(maxOrSingletonVersion, requiredVersion)) {
|
|
975
|
-
return
|
|
1086
|
+
return {
|
|
1087
|
+
shared,
|
|
1088
|
+
useTreesShaking,
|
|
1089
|
+
};
|
|
1090
|
+
}
|
|
1091
|
+
const _usedTreeShaking = shouldUseTreeShaking(treeShaking);
|
|
1092
|
+
if (_usedTreeShaking) {
|
|
1093
|
+
for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])) {
|
|
1094
|
+
if (!shouldUseTreeShaking(versionValue.treeShaking, treeShaking?.usedExports)) {
|
|
1095
|
+
continue;
|
|
1096
|
+
}
|
|
1097
|
+
if (satisfy(versionKey, requiredVersion)) {
|
|
1098
|
+
return {
|
|
1099
|
+
shared: versionValue,
|
|
1100
|
+
useTreesShaking: _usedTreeShaking,
|
|
1101
|
+
};
|
|
1102
|
+
}
|
|
1103
|
+
}
|
|
976
1104
|
}
|
|
977
1105
|
for (const [versionKey, versionValue] of Object.entries(localShareScopeMap[sc][pkgName])) {
|
|
978
1106
|
if (satisfy(versionKey, requiredVersion)) {
|
|
979
|
-
return
|
|
1107
|
+
return {
|
|
1108
|
+
shared: versionValue,
|
|
1109
|
+
useTreesShaking: false,
|
|
1110
|
+
};
|
|
980
1111
|
}
|
|
981
1112
|
}
|
|
982
1113
|
}
|
|
1114
|
+
return;
|
|
983
1115
|
};
|
|
984
1116
|
const params = {
|
|
985
1117
|
shareScopeMap: localShareScopeMap,
|
|
@@ -987,6 +1119,7 @@ function getRegisteredShare(localShareScopeMap, pkgName, shareInfo, resolveShare
|
|
|
987
1119
|
pkgName,
|
|
988
1120
|
version: maxOrSingletonVersion,
|
|
989
1121
|
GlobalFederation: Global.__FEDERATION__,
|
|
1122
|
+
shareInfo,
|
|
990
1123
|
resolver: defaultResolver,
|
|
991
1124
|
};
|
|
992
1125
|
const resolveShared = resolveShare.emit(params) || params;
|
|
@@ -1008,13 +1141,47 @@ function getTargetSharedOptions(options) {
|
|
|
1008
1141
|
shareVersionMap[shared.version] = shared;
|
|
1009
1142
|
});
|
|
1010
1143
|
const callback = function (prev, cur) {
|
|
1011
|
-
return
|
|
1144
|
+
return (
|
|
1145
|
+
// TODO: consider multiple treeShaking shared scenes
|
|
1146
|
+
!isLoaded(shareVersionMap[prev]) && versionLt(prev, cur));
|
|
1012
1147
|
};
|
|
1013
1148
|
const maxVersion = findVersion(shareVersionMap, callback);
|
|
1014
1149
|
return shareVersionMap[maxVersion];
|
|
1015
1150
|
};
|
|
1016
1151
|
const resolver = extraOptions?.resolver ?? defaultResolver;
|
|
1017
|
-
|
|
1152
|
+
const isPlainObject = (val) => {
|
|
1153
|
+
return val !== null && typeof val === 'object' && !Array.isArray(val);
|
|
1154
|
+
};
|
|
1155
|
+
const merge = (...sources) => {
|
|
1156
|
+
const out = {};
|
|
1157
|
+
for (const src of sources) {
|
|
1158
|
+
if (!src)
|
|
1159
|
+
continue;
|
|
1160
|
+
for (const [key, value] of Object.entries(src)) {
|
|
1161
|
+
const prev = out[key];
|
|
1162
|
+
if (isPlainObject(prev) && isPlainObject(value)) {
|
|
1163
|
+
out[key] = merge(prev, value);
|
|
1164
|
+
}
|
|
1165
|
+
else if (value !== undefined) {
|
|
1166
|
+
out[key] = value;
|
|
1167
|
+
}
|
|
1168
|
+
}
|
|
1169
|
+
}
|
|
1170
|
+
return out;
|
|
1171
|
+
};
|
|
1172
|
+
return merge(resolver(shareInfos[pkgName]), extraOptions?.customShareInfo);
|
|
1173
|
+
}
|
|
1174
|
+
const addUseIn = (shared, from) => {
|
|
1175
|
+
if (!shared.useIn) {
|
|
1176
|
+
shared.useIn = [];
|
|
1177
|
+
}
|
|
1178
|
+
addUniqueItem(shared.useIn, from);
|
|
1179
|
+
};
|
|
1180
|
+
function directShare(shared, useTreesShaking) {
|
|
1181
|
+
if (useTreesShaking && shared.treeShaking) {
|
|
1182
|
+
return shared.treeShaking;
|
|
1183
|
+
}
|
|
1184
|
+
return shared;
|
|
1018
1185
|
}
|
|
1019
1186
|
|
|
1020
1187
|
function getBuilderId() {
|
|
@@ -1526,6 +1693,40 @@ var helpers = {
|
|
|
1526
1693
|
},
|
|
1527
1694
|
};
|
|
1528
1695
|
|
|
1696
|
+
function createRemoteEntryInitOptions(remoteInfo, hostShareScopeMap) {
|
|
1697
|
+
const localShareScopeMap = hostShareScopeMap;
|
|
1698
|
+
const shareScopeKeys = Array.isArray(remoteInfo.shareScope)
|
|
1699
|
+
? remoteInfo.shareScope
|
|
1700
|
+
: [remoteInfo.shareScope];
|
|
1701
|
+
if (!shareScopeKeys.length) {
|
|
1702
|
+
shareScopeKeys.push('default');
|
|
1703
|
+
}
|
|
1704
|
+
shareScopeKeys.forEach((shareScopeKey) => {
|
|
1705
|
+
if (!localShareScopeMap[shareScopeKey]) {
|
|
1706
|
+
localShareScopeMap[shareScopeKey] = {};
|
|
1707
|
+
}
|
|
1708
|
+
});
|
|
1709
|
+
const remoteEntryInitOptions = {
|
|
1710
|
+
version: remoteInfo.version || '',
|
|
1711
|
+
shareScopeKeys: Array.isArray(remoteInfo.shareScope)
|
|
1712
|
+
? shareScopeKeys
|
|
1713
|
+
: remoteInfo.shareScope || 'default',
|
|
1714
|
+
};
|
|
1715
|
+
// Help to find host instance
|
|
1716
|
+
Object.defineProperty(remoteEntryInitOptions, 'shareScopeMap', {
|
|
1717
|
+
value: localShareScopeMap,
|
|
1718
|
+
// remoteEntryInitOptions will be traversed and assigned during container init, ,so this attribute is not allowed to be traversed
|
|
1719
|
+
enumerable: false,
|
|
1720
|
+
});
|
|
1721
|
+
// TODO: compate legacy init params, should use shareScopeMap if exist
|
|
1722
|
+
const shareScope = localShareScopeMap[shareScopeKeys[0]];
|
|
1723
|
+
const initScope = [];
|
|
1724
|
+
return {
|
|
1725
|
+
remoteEntryInitOptions,
|
|
1726
|
+
shareScope,
|
|
1727
|
+
initScope,
|
|
1728
|
+
};
|
|
1729
|
+
}
|
|
1529
1730
|
class Module {
|
|
1530
1731
|
constructor({ remoteInfo, host, }) {
|
|
1531
1732
|
this.inited = false;
|
|
@@ -1551,33 +1752,7 @@ class Module {
|
|
|
1551
1752
|
// Get remoteEntry.js
|
|
1552
1753
|
const remoteEntryExports = await this.getEntry();
|
|
1553
1754
|
if (!this.inited) {
|
|
1554
|
-
const
|
|
1555
|
-
const shareScopeKeys = Array.isArray(this.remoteInfo.shareScope)
|
|
1556
|
-
? this.remoteInfo.shareScope
|
|
1557
|
-
: [this.remoteInfo.shareScope];
|
|
1558
|
-
if (!shareScopeKeys.length) {
|
|
1559
|
-
shareScopeKeys.push('default');
|
|
1560
|
-
}
|
|
1561
|
-
shareScopeKeys.forEach((shareScopeKey) => {
|
|
1562
|
-
if (!localShareScopeMap[shareScopeKey]) {
|
|
1563
|
-
localShareScopeMap[shareScopeKey] = {};
|
|
1564
|
-
}
|
|
1565
|
-
});
|
|
1566
|
-
// TODO: compate legacy init params, should use shareScopeMap if exist
|
|
1567
|
-
const shareScope = localShareScopeMap[shareScopeKeys[0]];
|
|
1568
|
-
const initScope = [];
|
|
1569
|
-
const remoteEntryInitOptions = {
|
|
1570
|
-
version: this.remoteInfo.version || '',
|
|
1571
|
-
shareScopeKeys: Array.isArray(this.remoteInfo.shareScope)
|
|
1572
|
-
? shareScopeKeys
|
|
1573
|
-
: this.remoteInfo.shareScope || 'default',
|
|
1574
|
-
};
|
|
1575
|
-
// Help to find host instance
|
|
1576
|
-
Object.defineProperty(remoteEntryInitOptions, 'shareScopeMap', {
|
|
1577
|
-
value: localShareScopeMap,
|
|
1578
|
-
// remoteEntryInitOptions will be traversed and assigned during container init, ,so this attribute is not allowed to be traversed
|
|
1579
|
-
enumerable: false,
|
|
1580
|
-
});
|
|
1755
|
+
const { remoteEntryInitOptions, shareScope, initScope } = createRemoteEntryInitOptions(this.remoteInfo, this.host.shareScopeMap);
|
|
1581
1756
|
const initContainerOptions = await this.host.hooks.lifecycle.beforeInitContainer.emit({
|
|
1582
1757
|
shareScope,
|
|
1583
1758
|
// @ts-ignore shareScopeMap will be set by Object.defineProperty
|
|
@@ -1601,6 +1776,7 @@ class Module {
|
|
|
1601
1776
|
remoteSnapshot,
|
|
1602
1777
|
remoteEntryExports,
|
|
1603
1778
|
});
|
|
1779
|
+
this.inited = true;
|
|
1604
1780
|
}
|
|
1605
1781
|
return remoteEntryExports;
|
|
1606
1782
|
}
|
|
@@ -1609,7 +1785,6 @@ class Module {
|
|
|
1609
1785
|
const { loadFactory = true } = options || { loadFactory: true };
|
|
1610
1786
|
const remoteEntryExports = await this.init(id, remoteSnapshot);
|
|
1611
1787
|
this.lib = remoteEntryExports;
|
|
1612
|
-
this.inited = true;
|
|
1613
1788
|
let moduleFactory;
|
|
1614
1789
|
moduleFactory = await this.host.loaderHook.lifecycle.getModuleFactory.emit({
|
|
1615
1790
|
remoteEntryExports,
|
|
@@ -2063,7 +2238,7 @@ function generatePreloadAssets(origin, preloadOptions, remote, globalSnapshot, r
|
|
|
2063
2238
|
}, true, memo, remoteSnapshot);
|
|
2064
2239
|
if (remoteSnapshot.shared && remoteSnapshot.shared.length > 0) {
|
|
2065
2240
|
const collectSharedAssets = (shareInfo, snapshotShared) => {
|
|
2066
|
-
const registeredShared = getRegisteredShare(origin.shareScopeMap, snapshotShared.sharedName, shareInfo, origin.sharedHandler.hooks.lifecycle.resolveShare);
|
|
2241
|
+
const { shared: registeredShared } = getRegisteredShare(origin.shareScopeMap, snapshotShared.sharedName, shareInfo, origin.sharedHandler.hooks.lifecycle.resolveShare) || {};
|
|
2067
2242
|
// If the global share does not exist, or the lib function does not exist, it means that the shared has not been loaded yet and can be preloaded.
|
|
2068
2243
|
if (registeredShared && typeof registeredShared.lib === 'function') {
|
|
2069
2244
|
snapshotShared.assets.js.sync.forEach((asset) => {
|
|
@@ -2354,6 +2529,7 @@ class SnapshotHandler {
|
|
|
2354
2529
|
class SharedHandler {
|
|
2355
2530
|
constructor(host) {
|
|
2356
2531
|
this.hooks = new PluginSystem({
|
|
2532
|
+
beforeRegisterShare: new SyncWaterfallHook('beforeRegisterShare'),
|
|
2357
2533
|
afterResolve: new AsyncWaterfallHook('afterResolve'),
|
|
2358
2534
|
beforeLoadShare: new AsyncWaterfallHook('beforeLoadShare'),
|
|
2359
2535
|
// not used yet
|
|
@@ -2369,12 +2545,17 @@ class SharedHandler {
|
|
|
2369
2545
|
}
|
|
2370
2546
|
// register shared in shareScopeMap
|
|
2371
2547
|
registerShared(globalOptions, userOptions) {
|
|
2372
|
-
const {
|
|
2373
|
-
const sharedKeys = Object.keys(
|
|
2548
|
+
const { newShareInfos, allShareInfos } = formatShareConfigs(globalOptions, userOptions);
|
|
2549
|
+
const sharedKeys = Object.keys(newShareInfos);
|
|
2374
2550
|
sharedKeys.forEach((sharedKey) => {
|
|
2375
|
-
const sharedVals =
|
|
2551
|
+
const sharedVals = newShareInfos[sharedKey];
|
|
2376
2552
|
sharedVals.forEach((sharedVal) => {
|
|
2377
2553
|
sharedVal.scope.forEach((sc) => {
|
|
2554
|
+
this.hooks.lifecycle.beforeRegisterShare.emit({
|
|
2555
|
+
origin: this.host,
|
|
2556
|
+
pkgName: sharedKey,
|
|
2557
|
+
shared: sharedVal,
|
|
2558
|
+
});
|
|
2378
2559
|
const registeredShared = this.shareScopeMap[sc]?.[sharedKey];
|
|
2379
2560
|
if (!registeredShared) {
|
|
2380
2561
|
this.setShared({
|
|
@@ -2390,8 +2571,8 @@ class SharedHandler {
|
|
|
2390
2571
|
});
|
|
2391
2572
|
});
|
|
2392
2573
|
return {
|
|
2393
|
-
|
|
2394
|
-
|
|
2574
|
+
newShareInfos,
|
|
2575
|
+
allShareInfos,
|
|
2395
2576
|
};
|
|
2396
2577
|
}
|
|
2397
2578
|
async loadShare(pkgName, extraOptions) {
|
|
@@ -2422,61 +2603,61 @@ class SharedHandler {
|
|
|
2422
2603
|
const { shareInfo: shareOptionsRes } = loadShareRes;
|
|
2423
2604
|
// Assert that shareInfoRes exists, if not, throw an error
|
|
2424
2605
|
assert(shareOptionsRes, `Cannot find ${pkgName} Share in the ${host.options.name}. Please ensure that the ${pkgName} Share parameters have been injected`);
|
|
2425
|
-
|
|
2426
|
-
|
|
2427
|
-
|
|
2428
|
-
if (
|
|
2429
|
-
|
|
2430
|
-
|
|
2431
|
-
|
|
2432
|
-
|
|
2433
|
-
|
|
2434
|
-
|
|
2435
|
-
|
|
2436
|
-
|
|
2437
|
-
|
|
2438
|
-
|
|
2439
|
-
!registeredShared.loaded) {
|
|
2440
|
-
const factory = await registeredShared.loading;
|
|
2441
|
-
registeredShared.loaded = true;
|
|
2442
|
-
if (!registeredShared.lib) {
|
|
2443
|
-
registeredShared.lib = factory;
|
|
2444
|
-
}
|
|
2445
|
-
addUseIn(registeredShared);
|
|
2446
|
-
return factory;
|
|
2447
|
-
}
|
|
2448
|
-
else if (registeredShared) {
|
|
2449
|
-
const asyncLoadProcess = async () => {
|
|
2450
|
-
const factory = await registeredShared.get();
|
|
2451
|
-
addUseIn(registeredShared);
|
|
2452
|
-
registeredShared.loaded = true;
|
|
2453
|
-
registeredShared.lib = factory;
|
|
2606
|
+
const { shared: registeredShared, useTreesShaking } = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare) || {};
|
|
2607
|
+
if (registeredShared) {
|
|
2608
|
+
const targetShared = directShare(registeredShared, useTreesShaking);
|
|
2609
|
+
if (targetShared.lib) {
|
|
2610
|
+
addUseIn(targetShared, host.options.name);
|
|
2611
|
+
return targetShared.lib;
|
|
2612
|
+
}
|
|
2613
|
+
else if (targetShared.loading && !targetShared.loaded) {
|
|
2614
|
+
const factory = await targetShared.loading;
|
|
2615
|
+
targetShared.loaded = true;
|
|
2616
|
+
if (!targetShared.lib) {
|
|
2617
|
+
targetShared.lib = factory;
|
|
2618
|
+
}
|
|
2619
|
+
addUseIn(targetShared, host.options.name);
|
|
2454
2620
|
return factory;
|
|
2455
|
-
}
|
|
2456
|
-
|
|
2457
|
-
|
|
2458
|
-
|
|
2459
|
-
|
|
2460
|
-
|
|
2461
|
-
|
|
2462
|
-
|
|
2463
|
-
|
|
2464
|
-
|
|
2465
|
-
|
|
2621
|
+
}
|
|
2622
|
+
else {
|
|
2623
|
+
const asyncLoadProcess = async () => {
|
|
2624
|
+
const factory = await targetShared.get();
|
|
2625
|
+
addUseIn(targetShared, host.options.name);
|
|
2626
|
+
targetShared.loaded = true;
|
|
2627
|
+
targetShared.lib = factory;
|
|
2628
|
+
return factory;
|
|
2629
|
+
};
|
|
2630
|
+
const loading = asyncLoadProcess();
|
|
2631
|
+
this.setShared({
|
|
2632
|
+
pkgName,
|
|
2633
|
+
loaded: false,
|
|
2634
|
+
shared: registeredShared,
|
|
2635
|
+
from: host.options.name,
|
|
2636
|
+
lib: null,
|
|
2637
|
+
loading,
|
|
2638
|
+
treeShaking: useTreesShaking
|
|
2639
|
+
? targetShared
|
|
2640
|
+
: undefined,
|
|
2641
|
+
});
|
|
2642
|
+
return loading;
|
|
2643
|
+
}
|
|
2466
2644
|
}
|
|
2467
2645
|
else {
|
|
2468
2646
|
if (extraOptions?.customShareInfo) {
|
|
2469
2647
|
return false;
|
|
2470
2648
|
}
|
|
2649
|
+
const _useTreeShaking = shouldUseTreeShaking(shareOptionsRes.treeShaking);
|
|
2650
|
+
const targetShared = directShare(shareOptionsRes, _useTreeShaking);
|
|
2471
2651
|
const asyncLoadProcess = async () => {
|
|
2472
|
-
const factory = await
|
|
2473
|
-
|
|
2474
|
-
|
|
2475
|
-
addUseIn(
|
|
2476
|
-
const gShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare);
|
|
2652
|
+
const factory = await targetShared.get();
|
|
2653
|
+
targetShared.lib = factory;
|
|
2654
|
+
targetShared.loaded = true;
|
|
2655
|
+
addUseIn(targetShared, host.options.name);
|
|
2656
|
+
const { shared: gShared, useTreesShaking: gUseTreeShaking } = getRegisteredShare(this.shareScopeMap, pkgName, shareOptionsRes, this.hooks.lifecycle.resolveShare) || {};
|
|
2477
2657
|
if (gShared) {
|
|
2478
|
-
|
|
2479
|
-
|
|
2658
|
+
const targetGShared = directShare(gShared, gUseTreeShaking);
|
|
2659
|
+
targetGShared.lib = factory;
|
|
2660
|
+
targetGShared.loaded = true;
|
|
2480
2661
|
gShared.from = shareOptionsRes.from;
|
|
2481
2662
|
}
|
|
2482
2663
|
return factory;
|
|
@@ -2489,6 +2670,9 @@ class SharedHandler {
|
|
|
2489
2670
|
from: host.options.name,
|
|
2490
2671
|
lib: null,
|
|
2491
2672
|
loading,
|
|
2673
|
+
treeShaking: _useTreeShaking
|
|
2674
|
+
? targetShared
|
|
2675
|
+
: undefined,
|
|
2492
2676
|
});
|
|
2493
2677
|
return loading;
|
|
2494
2678
|
}
|
|
@@ -2528,15 +2712,17 @@ class SharedHandler {
|
|
|
2528
2712
|
const { version, eager } = shared;
|
|
2529
2713
|
scope[name] = scope[name] || {};
|
|
2530
2714
|
const versions = scope[name];
|
|
2531
|
-
const activeVersion = versions[version];
|
|
2715
|
+
const activeVersion = versions[version] && directShare(versions[version]);
|
|
2532
2716
|
const activeVersionEager = Boolean(activeVersion &&
|
|
2533
|
-
(
|
|
2717
|
+
(('eager' in activeVersion && activeVersion.eager) ||
|
|
2718
|
+
('shareConfig' in activeVersion &&
|
|
2719
|
+
activeVersion.shareConfig?.eager)));
|
|
2534
2720
|
if (!activeVersion ||
|
|
2535
2721
|
(activeVersion.strategy !== 'loaded-first' &&
|
|
2536
2722
|
!activeVersion.loaded &&
|
|
2537
2723
|
(Boolean(!eager) !== !activeVersionEager
|
|
2538
2724
|
? eager
|
|
2539
|
-
: hostName >
|
|
2725
|
+
: hostName > versions[version].from))) {
|
|
2540
2726
|
versions[version] = shared;
|
|
2541
2727
|
}
|
|
2542
2728
|
};
|
|
@@ -2544,7 +2730,24 @@ class SharedHandler {
|
|
|
2544
2730
|
const { module } = await host.remoteHandler.getRemoteModuleAndOptions({
|
|
2545
2731
|
id: key,
|
|
2546
2732
|
});
|
|
2547
|
-
|
|
2733
|
+
let remoteEntryExports = undefined;
|
|
2734
|
+
try {
|
|
2735
|
+
remoteEntryExports = await module.getEntry();
|
|
2736
|
+
}
|
|
2737
|
+
catch (error) {
|
|
2738
|
+
remoteEntryExports =
|
|
2739
|
+
(await host.remoteHandler.hooks.lifecycle.errorLoadRemote.emit({
|
|
2740
|
+
id: key,
|
|
2741
|
+
error,
|
|
2742
|
+
from: 'runtime',
|
|
2743
|
+
lifecycle: 'beforeLoadShare',
|
|
2744
|
+
origin: host,
|
|
2745
|
+
}));
|
|
2746
|
+
}
|
|
2747
|
+
finally {
|
|
2748
|
+
module.remoteEntryExports = remoteEntryExports;
|
|
2749
|
+
await module.init();
|
|
2750
|
+
}
|
|
2548
2751
|
};
|
|
2549
2752
|
Object.keys(host.options.shared).forEach((shareName) => {
|
|
2550
2753
|
const sharedArr = host.options.shared[shareName];
|
|
@@ -2581,16 +2784,10 @@ class SharedHandler {
|
|
|
2581
2784
|
this.initializeSharing(shareScope, { strategy: shareOptions.strategy });
|
|
2582
2785
|
});
|
|
2583
2786
|
}
|
|
2584
|
-
const registeredShared = getRegisteredShare(this.shareScopeMap, pkgName, shareOptions, this.hooks.lifecycle.resolveShare);
|
|
2585
|
-
const addUseIn = (shared) => {
|
|
2586
|
-
if (!shared.useIn) {
|
|
2587
|
-
shared.useIn = [];
|
|
2588
|
-
}
|
|
2589
|
-
addUniqueItem(shared.useIn, host.options.name);
|
|
2590
|
-
};
|
|
2787
|
+
const { shared: registeredShared, useTreesShaking } = getRegisteredShare(this.shareScopeMap, pkgName, shareOptions, this.hooks.lifecycle.resolveShare) || {};
|
|
2591
2788
|
if (registeredShared) {
|
|
2592
2789
|
if (typeof registeredShared.lib === 'function') {
|
|
2593
|
-
addUseIn(registeredShared);
|
|
2790
|
+
addUseIn(registeredShared, host.options.name);
|
|
2594
2791
|
if (!registeredShared.loaded) {
|
|
2595
2792
|
registeredShared.loaded = true;
|
|
2596
2793
|
if (registeredShared.from === host.options.name) {
|
|
@@ -2602,7 +2799,7 @@ class SharedHandler {
|
|
|
2602
2799
|
if (typeof registeredShared.get === 'function') {
|
|
2603
2800
|
const module = registeredShared.get();
|
|
2604
2801
|
if (!(module instanceof Promise)) {
|
|
2605
|
-
addUseIn(registeredShared);
|
|
2802
|
+
addUseIn(registeredShared, host.options.name);
|
|
2606
2803
|
this.setShared({
|
|
2607
2804
|
pkgName,
|
|
2608
2805
|
loaded: true,
|
|
@@ -2655,9 +2852,20 @@ class SharedHandler {
|
|
|
2655
2852
|
hostShareScopeMap: extraOptions.hostShareScopeMap,
|
|
2656
2853
|
});
|
|
2657
2854
|
}
|
|
2658
|
-
setShared({ pkgName, shared, from, lib, loading, loaded, get, }) {
|
|
2855
|
+
setShared({ pkgName, shared, from, lib, loading, loaded, get, treeShaking, }) {
|
|
2659
2856
|
const { version, scope = 'default', ...shareInfo } = shared;
|
|
2660
2857
|
const scopes = Array.isArray(scope) ? scope : [scope];
|
|
2858
|
+
const mergeAttrs = (shared) => {
|
|
2859
|
+
const merge = (s, key, val) => {
|
|
2860
|
+
if (val && !s[key]) {
|
|
2861
|
+
s[key] = val;
|
|
2862
|
+
}
|
|
2863
|
+
};
|
|
2864
|
+
const targetShared = (treeShaking ? shared.treeShaking : shared);
|
|
2865
|
+
merge(targetShared, 'loaded', loaded);
|
|
2866
|
+
merge(targetShared, 'loading', loading);
|
|
2867
|
+
merge(targetShared, 'get', get);
|
|
2868
|
+
};
|
|
2661
2869
|
scopes.forEach((sc) => {
|
|
2662
2870
|
if (!this.shareScopeMap[sc]) {
|
|
2663
2871
|
this.shareScopeMap[sc] = {};
|
|
@@ -2671,21 +2879,10 @@ class SharedHandler {
|
|
|
2671
2879
|
scope: [sc],
|
|
2672
2880
|
...shareInfo,
|
|
2673
2881
|
lib,
|
|
2674
|
-
loaded,
|
|
2675
|
-
loading,
|
|
2676
2882
|
};
|
|
2677
|
-
if (get) {
|
|
2678
|
-
this.shareScopeMap[sc][pkgName][version].get = get;
|
|
2679
|
-
}
|
|
2680
|
-
return;
|
|
2681
2883
|
}
|
|
2682
2884
|
const registeredShared = this.shareScopeMap[sc][pkgName][version];
|
|
2683
|
-
|
|
2684
|
-
registeredShared.loading = loading;
|
|
2685
|
-
}
|
|
2686
|
-
if (loaded && !registeredShared.loaded) {
|
|
2687
|
-
registeredShared.loaded = loaded;
|
|
2688
|
-
}
|
|
2885
|
+
mergeAttrs(registeredShared);
|
|
2689
2886
|
if (from && registeredShared.from !== from) {
|
|
2690
2887
|
registeredShared.from = from;
|
|
2691
2888
|
}
|
|
@@ -2713,6 +2910,7 @@ class RemoteHandler {
|
|
|
2713
2910
|
generatePreloadAssets: new AsyncHook('generatePreloadAssets'),
|
|
2714
2911
|
// not used yet
|
|
2715
2912
|
afterPreloadRemote: new AsyncHook(),
|
|
2913
|
+
// TODO: Move to loaderHook
|
|
2716
2914
|
loadEntry: new AsyncHook(),
|
|
2717
2915
|
});
|
|
2718
2916
|
this.host = host;
|
|
@@ -3061,7 +3259,7 @@ class ModuleFederation {
|
|
|
3061
3259
|
// maybe will change, temporarily for internal use only
|
|
3062
3260
|
initContainer: new AsyncWaterfallHook('initContainer'),
|
|
3063
3261
|
});
|
|
3064
|
-
this.version = "0.0.0-feat-
|
|
3262
|
+
this.version = "0.0.0-feat-shared-treeshake-poc-20260114074114";
|
|
3065
3263
|
this.moduleCache = new Map();
|
|
3066
3264
|
this.loaderHook = new PluginSystem({
|
|
3067
3265
|
// FIXME: may not be suitable , not open to the public yet
|
|
@@ -3142,7 +3340,7 @@ class ModuleFederation {
|
|
|
3142
3340
|
this.sharedHandler.initShareScopeMap(scopeName, shareScope, extraOptions);
|
|
3143
3341
|
}
|
|
3144
3342
|
formatOptions(globalOptions, userOptions) {
|
|
3145
|
-
const { shared
|
|
3343
|
+
const { allShareInfos: shared} = formatShareConfigs(globalOptions, userOptions);
|
|
3146
3344
|
const { userOptions: userOptionsRes, options: globalOptionsRes } = this.hooks.lifecycle.beforeInit.emit({
|
|
3147
3345
|
origin: this,
|
|
3148
3346
|
userOptions,
|
|
@@ -3150,7 +3348,7 @@ class ModuleFederation {
|
|
|
3150
3348
|
shareInfo: shared,
|
|
3151
3349
|
});
|
|
3152
3350
|
const remotes = this.remoteHandler.formatAndRegisterRemote(globalOptionsRes, userOptionsRes);
|
|
3153
|
-
const {
|
|
3351
|
+
const { allShareInfos } = this.sharedHandler.registerShared(globalOptionsRes, userOptionsRes);
|
|
3154
3352
|
const plugins = [...globalOptionsRes.plugins];
|
|
3155
3353
|
if (userOptionsRes.plugins) {
|
|
3156
3354
|
userOptionsRes.plugins.forEach((plugin) => {
|
|
@@ -3164,7 +3362,7 @@ class ModuleFederation {
|
|
|
3164
3362
|
...userOptions,
|
|
3165
3363
|
plugins,
|
|
3166
3364
|
remotes,
|
|
3167
|
-
shared:
|
|
3365
|
+
shared: allShareInfos,
|
|
3168
3366
|
};
|
|
3169
3367
|
this.hooks.lifecycle.init.emit({
|
|
3170
3368
|
origin: this,
|