@servicetitan/web-components 24.2.0 → 24.2.1
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 +6 -2
- 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 +2 -3
- package/src/__tests__/loader.test.tsx +21 -8
- package/src/loader.tsx +8 -3
- 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
|
@@ -65,7 +65,8 @@ function lazyLoader(props) {
|
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
function lazyWebComponent(props) {
|
|
68
|
-
const { basename,
|
|
68
|
+
const { basename, cancelation, exposedDependencies, eventBus, fallbackSrc, logService, onRequestError, retries, src, } = props;
|
|
69
|
+
let { cache } = props;
|
|
69
70
|
return lazy(() => __awaiter(this, void 0, void 0, function* () {
|
|
70
71
|
let bundleInfo = cache ? bundleCache.get(src) : undefined;
|
|
71
72
|
if (!bundleInfo) {
|
|
@@ -80,12 +81,15 @@ function lazyWebComponent(props) {
|
|
|
80
81
|
}
|
|
81
82
|
throw e;
|
|
82
83
|
}
|
|
84
|
+
if (cache === true && !bundleInfo.mfeHasUniqueChunkNamespace) {
|
|
85
|
+
cache = -1;
|
|
86
|
+
}
|
|
83
87
|
if (cache) {
|
|
84
88
|
bundleCache.set(src, bundleInfo, typeof cache === 'number' ? cache : undefined);
|
|
85
89
|
}
|
|
86
90
|
validateBundleInfo(bundleInfo, { exposedDependencies, logService, packageName: src });
|
|
87
|
-
yield loadScripts(bundleInfo);
|
|
88
91
|
}
|
|
92
|
+
yield loadScripts(bundleInfo);
|
|
89
93
|
return {
|
|
90
94
|
default: webComponent({
|
|
91
95
|
basename,
|
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,CAC3B,GAAG,EAAE,CAAC,WAAW,CAAC,eAAe,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,EACrF,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAC5C,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,aAAa,EAAE,sBAAsB,CAAC,EAC9D,CAAC,KAAK,CAAC,aAAa,CAAC,CACxB,CAAC;IAEF,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"}
|
|
@@ -14,6 +14,7 @@ import { getEntrypoints } from './get-entry-points';
|
|
|
14
14
|
import { getMFESupportsRerendering } from './get-mfe-supports-rerendering';
|
|
15
15
|
import { getVersionMismatches } from './get-version-mismatches';
|
|
16
16
|
import { isVersionedUrl } from './is-versioned-url';
|
|
17
|
+
import { getMFEHasUniqueChunkNamespace } from './get-mfe-has-unique-chunk-namespace';
|
|
17
18
|
export function getBundleInfo(mainPackageUrl_1, fallbackPackageUrl_1) {
|
|
18
19
|
return __awaiter(this, arguments, void 0, function* (mainPackageUrl, fallbackPackageUrl, exposedDependencies = {}, signal, retries, onRequestError) {
|
|
19
20
|
var _a;
|
|
@@ -65,6 +66,7 @@ export function getBundleInfo(mainPackageUrl_1, fallbackPackageUrl_1) {
|
|
|
65
66
|
return {
|
|
66
67
|
disposer,
|
|
67
68
|
mfeSupportsRerendering: getMFESupportsRerendering(bundledWith, dependencies),
|
|
69
|
+
mfeHasUniqueChunkNamespace: getMFEHasUniqueChunkNamespace(bundledWith),
|
|
68
70
|
mismatch: hasMismatch ? mismatch : undefined,
|
|
69
71
|
urls,
|
|
70
72
|
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":"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"}
|
|
@@ -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": "24.2.
|
|
3
|
+
"version": "24.2.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -50,6 +50,5 @@
|
|
|
50
50
|
},
|
|
51
51
|
"cli": {
|
|
52
52
|
"webpack": false
|
|
53
|
-
}
|
|
54
|
-
"gitHead": "13848340f521a17e1e251fde0d031022910ca7ab"
|
|
53
|
+
}
|
|
55
54
|
}
|
|
@@ -99,7 +99,7 @@ describe('[web-components] Loader', () => {
|
|
|
99
99
|
},
|
|
100
100
|
},
|
|
101
101
|
};
|
|
102
|
-
setStartupVersion('
|
|
102
|
+
setStartupVersion('27.2.0');
|
|
103
103
|
props = { src: baseUrl, cache: false };
|
|
104
104
|
onloadRef = null;
|
|
105
105
|
singletons = [];
|
|
@@ -742,8 +742,17 @@ describe('[web-components] Loader', () => {
|
|
|
742
742
|
});
|
|
743
743
|
}
|
|
744
744
|
|
|
745
|
+
function itNeverReloadsMetadata() {
|
|
746
|
+
test('never reloads metadata', () => {
|
|
747
|
+
jest.runOnlyPendingTimers();
|
|
748
|
+
subject();
|
|
749
|
+
|
|
750
|
+
expect(common.getJson).toHaveBeenCalledTimes(0);
|
|
751
|
+
});
|
|
752
|
+
}
|
|
753
|
+
|
|
745
754
|
describe('when component was previously loaded', () => {
|
|
746
|
-
beforeEach(() => preloadComponent());
|
|
755
|
+
beforeEach(() => preloadComponent({ id: 'mfe1' }));
|
|
747
756
|
|
|
748
757
|
test('uses cached metadata', () => {
|
|
749
758
|
subject();
|
|
@@ -765,12 +774,7 @@ describe('[web-components] Loader', () => {
|
|
|
765
774
|
describe('when component has indefinite ttl', () => {
|
|
766
775
|
beforeEach(() => preloadComponent({ id: 'mfe3', cache: -1 }));
|
|
767
776
|
|
|
768
|
-
|
|
769
|
-
jest.runOnlyPendingTimers();
|
|
770
|
-
subject();
|
|
771
|
-
|
|
772
|
-
expect(common.getJson).toHaveBeenCalledTimes(0);
|
|
773
|
-
});
|
|
777
|
+
itNeverReloadsMetadata();
|
|
774
778
|
});
|
|
775
779
|
|
|
776
780
|
describe('when component has zero ttl', () => {
|
|
@@ -784,5 +788,14 @@ describe('[web-components] Loader', () => {
|
|
|
784
788
|
expect(common.getJson).toHaveBeenCalledTimes(2);
|
|
785
789
|
});
|
|
786
790
|
});
|
|
791
|
+
|
|
792
|
+
describe("when mfe doesn't have unique chunk namespace", () => {
|
|
793
|
+
beforeEach(() => {
|
|
794
|
+
preloadComponent({ id: 'mfe5' });
|
|
795
|
+
setStartupVersion('27.1.1');
|
|
796
|
+
});
|
|
797
|
+
|
|
798
|
+
itNeverReloadsMetadata();
|
|
799
|
+
});
|
|
787
800
|
});
|
|
788
801
|
});
|
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,15 +182,19 @@ 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
|
}
|
|
187
192
|
|
|
188
193
|
validateBundleInfo(bundleInfo, { exposedDependencies, logService, packageName: src });
|
|
189
|
-
|
|
190
|
-
await loadScripts(bundleInfo);
|
|
191
194
|
}
|
|
192
195
|
|
|
196
|
+
await loadScripts(bundleInfo);
|
|
197
|
+
|
|
193
198
|
return {
|
|
194
199
|
default: webComponent({
|
|
195
200
|
basename,
|
|
@@ -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
|
+
}
|