@servicetitan/web-components 27.1.0 → 27.2.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/dist/loader.js +5 -1
- package/dist/loader.js.map +1 -1
- package/dist/utils/get-bundle-info.d.ts +1 -0
- package/dist/utils/get-bundle-info.d.ts.map +1 -1
- package/dist/utils/get-bundle-info.js +2 -0
- package/dist/utils/get-bundle-info.js.map +1 -1
- package/dist/utils/get-mfe-has-unique-chunk-namespace.d.ts +3 -0
- package/dist/utils/get-mfe-has-unique-chunk-namespace.d.ts.map +1 -0
- package/dist/utils/get-mfe-has-unique-chunk-namespace.js +12 -0
- package/dist/utils/get-mfe-has-unique-chunk-namespace.js.map +1 -0
- package/package.json +11 -11
- package/src/__tests__/loader.test.tsx +21 -8
- package/src/loader.tsx +6 -1
- package/src/utils/get-bundle-info.ts +2 -0
- package/src/utils/get-mfe-has-unique-chunk-namespace.ts +14 -0
package/dist/loader.js
CHANGED
|
@@ -62,7 +62,8 @@ function lazyLoader(props) {
|
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
function lazyWebComponent(props) {
|
|
65
|
-
const { basename,
|
|
65
|
+
const { basename, cancelation, exposedDependencies, eventBus, fallbackSrc, logService, onRequestError, retries, src, } = props;
|
|
66
|
+
let { cache } = props;
|
|
66
67
|
return lazy(async () => {
|
|
67
68
|
let bundleInfo = cache ? bundleCache.get(src) : undefined;
|
|
68
69
|
if (!bundleInfo) {
|
|
@@ -77,6 +78,9 @@ function lazyWebComponent(props) {
|
|
|
77
78
|
}
|
|
78
79
|
throw e;
|
|
79
80
|
}
|
|
81
|
+
if (cache === true && !bundleInfo.mfeHasUniqueChunkNamespace) {
|
|
82
|
+
cache = -1;
|
|
83
|
+
}
|
|
80
84
|
if (cache) {
|
|
81
85
|
bundleCache.set(src, bundleInfo, typeof cache === 'number' ? cache : undefined);
|
|
82
86
|
}
|
package/dist/loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.tsx"],"names":[],"mappings":";AAAA,OAAO,EAGH,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,SAAS,EACT,mBAAmB,EACnB,OAAO,GACV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACH,0BAA0B,EAG1B,cAAc,GACjB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAEH,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,WAAW,EACX,YAAY,GACf,MAAM,SAAS,CAAC;AAyBjB,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAA6B,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;;IACxE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IACpF,MAAM,EAAE,eAAe,EAAE,sBAAsB,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAEjE,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;IAC1B,MAAM,CAAC,UAAU,EAAE,mBAAmB,GAAG,oBAAoB,EAAE,QAAQ,GAAG,GAAG,CAAC,GAC1E,uBAAuB,CAAC,GAAG,EAAE,0BAA0B,EAAE,eAAe,CAAC,CAAC;IAC9E,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,MAAM,OAAO,GAAG,UAAU,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;QACjE,OAAO,WAAW,CAAC,eAAe,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACtF,CAAC,EAAE,CAAC,eAAe,EAAE,sBAAsB,EAAE,GAAG,CAAC,CAAC,CAAC;IAEnD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,MAAM,OAAO,GAAG,uBAAuB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACnF,OAAO,WAAW,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;IAE/B,MAAM,MAAM,GAAG,OAAO,CAClB,GAAG,EAAE,CACD,UAAU,CAAC;QACP,QAAQ;QACR,KAAK;QACL,WAAW;QACX,mBAAmB;QACnB,QAAQ;QACR,WAAW;QACX,UAAU;QACV,cAAc;QACd,OAAO;QACP,GAAG;KACN,CAAC,EACN;QACI,QAAQ;QACR,KAAK;QACL,WAAW;QACX,mBAAmB;QACnB,QAAQ;QACR,UAAU;QACV,cAAc;QACd,WAAW;QACX,OAAO;QACP,GAAG;KACN,CACJ,CAAC;IAEF,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAErD,OAAO,CACH,KAAC,aAAa,IAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,YACnD,KAAC,QAAQ,IAAC,QAAQ,EAAE,KAAC,eAAe,KAAG,YACnC,KAAC,MAAM,IACH,IAAI,EAAE,MAAA,KAAK,CAAC,IAAI,mCAAI,EAAE,EACtB,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,eAAe,EAAE,eAAe,GAClC,GACK,GACC,CACnB,CAAC;AACN,CAAC,CAAC,CAAC;AASH,SAAS,UAAU,CAAC,KAAsB;IACtC,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE9B,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAEjD,OAAO,CAAC,KAAsB,EAAE,EAAE;QAC9B,SAAS,CAAC,GAAG,EAAE;YACX,OAAO,GAAG,EAAE;gBACR,WAAW,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC,CAAC;QACN,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,CACH,KAAC,gBAAgB,IACb,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,eAAe,EAAE,KAAK,CAAC,eAAe,GACxC,CACL,CAAC;IACN,CAAC,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAsB;IAC5C,MAAM,EACF,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export type BundleInfo = Awaited<ReturnType<typeof getBundleInfo>>;
|
|
|
14
14
|
export declare function getBundleInfo(mainPackageUrl: string, fallbackPackageUrl: string | undefined, exposedDependencies?: ExposedDependencies, signal?: AbortSignal, retries?: number, onRequestError?: (error: GetJsonError) => void): Promise<{
|
|
15
15
|
disposer: () => void;
|
|
16
16
|
mfeSupportsRerendering: boolean;
|
|
17
|
+
mfeHasUniqueChunkNamespace: boolean;
|
|
17
18
|
mismatch: Record<string, {
|
|
18
19
|
host: string;
|
|
19
20
|
package: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-bundle-info.d.ts","sourceRoot":"","sources":["../../src/utils/get-bundle-info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAW,YAAY,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,WAAW,EAAkB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"get-bundle-info.d.ts","sourceRoot":"","sources":["../../src/utils/get-bundle-info.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAW,YAAY,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,WAAW,EAAkB,MAAM,oBAAoB,CAAC;AAMjE,MAAM,WAAW,QAAQ;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACjD,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,EAAE,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC;AAEnE,wBAAsB,aAAa,CAC/B,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,mBAAmB,GAAE,mBAAwB,EAC7C,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI;;;;;;;;;;GAgEjD"}
|
|
@@ -5,6 +5,7 @@ import { getEntrypoints } from './get-entry-points';
|
|
|
5
5
|
import { getMFESupportsRerendering } from './get-mfe-supports-rerendering';
|
|
6
6
|
import { getVersionMismatches } from './get-version-mismatches';
|
|
7
7
|
import { isVersionedUrl } from './is-versioned-url';
|
|
8
|
+
import { getMFEHasUniqueChunkNamespace } from './get-mfe-has-unique-chunk-namespace';
|
|
8
9
|
export async function getBundleInfo(mainPackageUrl, fallbackPackageUrl, exposedDependencies = {}, signal, retries, onRequestError) {
|
|
9
10
|
var _a;
|
|
10
11
|
const { data: metadata, url: packageUrl } = await getMetadata({
|
|
@@ -55,6 +56,7 @@ export async function getBundleInfo(mainPackageUrl, fallbackPackageUrl, exposedD
|
|
|
55
56
|
return {
|
|
56
57
|
disposer,
|
|
57
58
|
mfeSupportsRerendering: getMFESupportsRerendering(bundledWith, dependencies),
|
|
59
|
+
mfeHasUniqueChunkNamespace: getMFEHasUniqueChunkNamespace(bundledWith),
|
|
58
60
|
mismatch: hasMismatch ? mismatch : undefined,
|
|
59
61
|
urls,
|
|
60
62
|
WebComponent: name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-bundle-info.js","sourceRoot":"","sources":["../../src/utils/get-bundle-info.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAuB,OAAO,EAAgB,MAAM,WAAW,CAAC;AACvE,OAAO,EAAe,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"get-bundle-info.js","sourceRoot":"","sources":["../../src/utils/get-bundle-info.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAuB,OAAO,EAAgB,MAAM,WAAW,CAAC;AACvE,OAAO,EAAe,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAYrF,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,cAAsB,EACtB,kBAAsC,EACtC,sBAA2C,EAAE,EAC7C,MAAoB,EACpB,OAAgB,EAChB,cAA8C;;IAE9C,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,MAAM,WAAW,CAAC;QAC1D,kBAAkB;QAClB,cAAc;QACd,cAAc;QACd,OAAO;QACP,MAAM;KACT,CAAC,CAAC;IAEH,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,kBAAkB,EAAE,GAAG,QAAQ,CAAC;IAC3D,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;IACtE,MAAM,KAAK,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAE/C,IAAI,YAAmD,CAAC;IACxD,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;QACxB,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;IACzC,CAAC;SAAM,CAAC;QACJ,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,eAAe,eAAe,EAAE;YAC3E,KAAK;YACL,OAAO;YACP,MAAM;SACT,CAAC,CAAC;QAEH,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;IAC5C,CAAC;IAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,mBAAmB,EAAE,YAAY,EAAE,kBAAkB,CAAC,CAAC;IAC7F,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IACnD,MAAM,cAAc,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,uBAAuB,CAAC,CAAC;IAC9D,MAAM,mBAAmB,GAAG,cAAc,IAAI,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,CAAC,WAAW,IAAI,mBAAmB,CAAC;IAClD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5C,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,eAAe,gBAAgB,UAAU,IAAI,IAAI,EAAE,CAAC;IAE7F,IAAI,WAAwB,CAAC;IAC7B,IAAI,MAAA,QAAQ,CAAC,WAAW,0CAAG,UAAU,CAAC,EAAE,CAAC;QACrC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACJ,WAAW,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE;QAClB,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAS,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC;YAC/D,IAAI,IAAI,EAAE,CAAC;gBACP,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAC3C,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EACxE,EAAiB,CACpB,CAAC;IAEF,OAAO;QACH,QAAQ;QACR,sBAAsB,EAAE,yBAAyB,CAAC,WAAW,EAAE,YAAY,CAAC;QAC5E,0BAA0B,EAAE,6BAA6B,CAAC,WAAW,CAAC;QACtE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QAC5C,IAAI;QACJ,YAAY,EAAE,IAAI;KACrB,CAAC;AACN,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,KAM1B;IACG,MAAM,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEtF,OAAO,OAAO,CAAW,GAAG,cAAc,qBAAqB,EAAE;QAC7D,KAAK,EAAE,eAAe,CAAC,cAAc,CAAC;QACtC,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;QACzC,cAAc;QACd,MAAM;KACT,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACT,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,MAAM,CAAC,CAAC;QACZ,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,kBAAkB,qBAAqB,EAAE;YACvD,OAAO;YACP,cAAc;YACd,KAAK,EAAE,eAAe,CAAC,kBAAkB,CAAC;YAC1C,MAAM;SACT,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAChC,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;AACxD,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-mfe-has-unique-chunk-namespace.d.ts","sourceRoot":"","sources":["../../src/utils/get-mfe-has-unique-chunk-namespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,WAEjF"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import semver from 'semver';
|
|
2
|
+
// Check if the MFE loads it's chunks into a unique global chunk namespace
|
|
3
|
+
export function getMFEHasUniqueChunkNamespace(bundledWith) {
|
|
4
|
+
return !!isSupportedVersion(bundledWith === null || bundledWith === void 0 ? void 0 : bundledWith['@servicetitan/startup']);
|
|
5
|
+
}
|
|
6
|
+
function isSupportedVersion(version) {
|
|
7
|
+
const minVersion = version && semver.minVersion(version);
|
|
8
|
+
if (minVersion) {
|
|
9
|
+
return semver.gte(minVersion, '27.2.0');
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=get-mfe-has-unique-chunk-namespace.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-mfe-has-unique-chunk-namespace.js","sourceRoot":"","sources":["../../src/utils/get-mfe-has-unique-chunk-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,0EAA0E;AAC1E,MAAM,UAAU,6BAA6B,CAAC,WAAoC;IAC9E,OAAO,CAAC,CAAC,kBAAkB,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,uBAAuB,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAgB;IACxC,MAAM,UAAU,GAAG,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACzD,IAAI,UAAU,EAAE,CAAC;QACb,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicetitan/web-components",
|
|
3
|
-
"version": "27.
|
|
3
|
+
"version": "27.2.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -15,19 +15,19 @@
|
|
|
15
15
|
"src"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@servicetitan/error-boundary": "27.
|
|
18
|
+
"@servicetitan/error-boundary": "27.2.0",
|
|
19
19
|
"lodash.get": "~4.4.2",
|
|
20
20
|
"mitt": "~3.0.1",
|
|
21
21
|
"semver": "~7.6.3"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@servicetitan/anvil2": "^1.
|
|
24
|
+
"@servicetitan/anvil2": "^1.10.3",
|
|
25
25
|
"@servicetitan/design-system": "~14.0.0",
|
|
26
|
-
"@servicetitan/log-service": "27.
|
|
27
|
-
"@servicetitan/react-ioc": "27.
|
|
26
|
+
"@servicetitan/log-service": "27.2.0",
|
|
27
|
+
"@servicetitan/react-ioc": "27.2.0",
|
|
28
28
|
"@testing-library/dom": "^10.4.0",
|
|
29
29
|
"@testing-library/jest-dom": "^6.5.0",
|
|
30
|
-
"@testing-library/react": "^16.0.
|
|
30
|
+
"@testing-library/react": "^16.0.1",
|
|
31
31
|
"@types/history": "~4.7.10",
|
|
32
32
|
"@types/lodash.get": "~4.4.6",
|
|
33
33
|
"@types/react": "~18.3.3",
|
|
@@ -36,13 +36,13 @@
|
|
|
36
36
|
"history": "~4.10.1",
|
|
37
37
|
"react": "~18.3.1",
|
|
38
38
|
"react-dom": "~18.3.1",
|
|
39
|
-
"shadow-dom-testing-library": "^1.11.
|
|
39
|
+
"shadow-dom-testing-library": "^1.11.3"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@servicetitan/anvil2": ">=1.
|
|
42
|
+
"@servicetitan/anvil2": ">=1.10.3",
|
|
43
43
|
"@servicetitan/design-system": ">=12.6.2",
|
|
44
|
-
"@servicetitan/log-service": "27.
|
|
45
|
-
"@servicetitan/react-ioc": "27.
|
|
44
|
+
"@servicetitan/log-service": "27.2.0",
|
|
45
|
+
"@servicetitan/react-ioc": "27.2.0",
|
|
46
46
|
"history": "~4.10.1",
|
|
47
47
|
"react": ">=17.0.2",
|
|
48
48
|
"react-dom": ">=17.0.2"
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"cli": {
|
|
62
62
|
"webpack": false
|
|
63
63
|
},
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "311c957e8712703f03339865cd83b98e0140a523"
|
|
65
65
|
}
|
|
@@ -100,7 +100,7 @@ describe('[web-components] Loader', () => {
|
|
|
100
100
|
},
|
|
101
101
|
},
|
|
102
102
|
};
|
|
103
|
-
setStartupVersion('
|
|
103
|
+
setStartupVersion('27.2.0');
|
|
104
104
|
props = { src: baseUrl, cache: false };
|
|
105
105
|
onloadRef = null;
|
|
106
106
|
singletons = [];
|
|
@@ -775,8 +775,17 @@ describe('[web-components] Loader', () => {
|
|
|
775
775
|
});
|
|
776
776
|
}
|
|
777
777
|
|
|
778
|
+
function itNeverReloadsMetadata() {
|
|
779
|
+
test('never reloads metadata', () => {
|
|
780
|
+
jest.runOnlyPendingTimers();
|
|
781
|
+
subject();
|
|
782
|
+
|
|
783
|
+
expect(common.getJson).toHaveBeenCalledTimes(0);
|
|
784
|
+
});
|
|
785
|
+
}
|
|
786
|
+
|
|
778
787
|
describe('when component was previously loaded', () => {
|
|
779
|
-
beforeEach(() => preloadComponent());
|
|
788
|
+
beforeEach(() => preloadComponent({ id: 'mfe1' }));
|
|
780
789
|
|
|
781
790
|
test('uses cached metadata', () => {
|
|
782
791
|
subject();
|
|
@@ -798,12 +807,7 @@ describe('[web-components] Loader', () => {
|
|
|
798
807
|
describe('when component has indefinite ttl', () => {
|
|
799
808
|
beforeEach(() => preloadComponent({ id: 'mfe3', cache: -1 }));
|
|
800
809
|
|
|
801
|
-
|
|
802
|
-
jest.runOnlyPendingTimers();
|
|
803
|
-
subject();
|
|
804
|
-
|
|
805
|
-
expect(common.getJson).toHaveBeenCalledTimes(0);
|
|
806
|
-
});
|
|
810
|
+
itNeverReloadsMetadata();
|
|
807
811
|
});
|
|
808
812
|
|
|
809
813
|
describe('when component has zero ttl', () => {
|
|
@@ -817,5 +821,14 @@ describe('[web-components] Loader', () => {
|
|
|
817
821
|
expect(common.getJson).toHaveBeenCalledTimes(2);
|
|
818
822
|
});
|
|
819
823
|
});
|
|
824
|
+
|
|
825
|
+
describe("when mfe doesn't have unique chunk namespace", () => {
|
|
826
|
+
beforeEach(() => {
|
|
827
|
+
preloadComponent({ id: 'mfe5' });
|
|
828
|
+
setStartupVersion('27.1.1');
|
|
829
|
+
});
|
|
830
|
+
|
|
831
|
+
itNeverReloadsMetadata();
|
|
832
|
+
});
|
|
820
833
|
});
|
|
821
834
|
});
|
package/src/loader.tsx
CHANGED
|
@@ -148,7 +148,6 @@ function lazyLoader(props: LazyLoaderProps) {
|
|
|
148
148
|
function lazyWebComponent(props: LazyLoaderProps) {
|
|
149
149
|
const {
|
|
150
150
|
basename,
|
|
151
|
-
cache,
|
|
152
151
|
cancelation,
|
|
153
152
|
exposedDependencies,
|
|
154
153
|
eventBus,
|
|
@@ -159,6 +158,8 @@ function lazyWebComponent(props: LazyLoaderProps) {
|
|
|
159
158
|
src,
|
|
160
159
|
} = props;
|
|
161
160
|
|
|
161
|
+
let { cache } = props;
|
|
162
|
+
|
|
162
163
|
return lazy<(props: LoaderDataProps) => JSX.Element | null>(async () => {
|
|
163
164
|
let bundleInfo: BundleInfo | undefined = cache ? bundleCache.get(src) : undefined;
|
|
164
165
|
if (!bundleInfo) {
|
|
@@ -181,6 +182,10 @@ function lazyWebComponent(props: LazyLoaderProps) {
|
|
|
181
182
|
throw e;
|
|
182
183
|
}
|
|
183
184
|
|
|
185
|
+
if (cache === true && !bundleInfo.mfeHasUniqueChunkNamespace) {
|
|
186
|
+
cache = -1;
|
|
187
|
+
}
|
|
188
|
+
|
|
184
189
|
if (cache) {
|
|
185
190
|
bundleCache.set(src, bundleInfo, typeof cache === 'number' ? cache : undefined);
|
|
186
191
|
}
|
|
@@ -6,6 +6,7 @@ import { EntryPoints, getEntrypoints } from './get-entry-points';
|
|
|
6
6
|
import { getMFESupportsRerendering } from './get-mfe-supports-rerendering';
|
|
7
7
|
import { getVersionMismatches } from './get-version-mismatches';
|
|
8
8
|
import { isVersionedUrl } from './is-versioned-url';
|
|
9
|
+
import { getMFEHasUniqueChunkNamespace } from './get-mfe-has-unique-chunk-namespace';
|
|
9
10
|
|
|
10
11
|
export interface Metadata {
|
|
11
12
|
name: string;
|
|
@@ -82,6 +83,7 @@ export async function getBundleInfo(
|
|
|
82
83
|
return {
|
|
83
84
|
disposer,
|
|
84
85
|
mfeSupportsRerendering: getMFESupportsRerendering(bundledWith, dependencies),
|
|
86
|
+
mfeHasUniqueChunkNamespace: getMFEHasUniqueChunkNamespace(bundledWith),
|
|
85
87
|
mismatch: hasMismatch ? mismatch : undefined,
|
|
86
88
|
urls,
|
|
87
89
|
WebComponent: name,
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import semver from 'semver';
|
|
2
|
+
import { Metadata } from './get-bundle-info';
|
|
3
|
+
|
|
4
|
+
// Check if the MFE loads it's chunks into a unique global chunk namespace
|
|
5
|
+
export function getMFEHasUniqueChunkNamespace(bundledWith: Metadata['bundledWith']) {
|
|
6
|
+
return !!isSupportedVersion(bundledWith?.['@servicetitan/startup']);
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
function isSupportedVersion(version?: string) {
|
|
10
|
+
const minVersion = version && semver.minVersion(version);
|
|
11
|
+
if (minVersion) {
|
|
12
|
+
return semver.gte(minVersion, '27.2.0');
|
|
13
|
+
}
|
|
14
|
+
}
|