@servicetitan/web-components 21.7.3 → 21.10.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.d.ts.map +1 -1
- package/dist/loader.js +3 -17
- package/dist/loader.js.map +1 -1
- package/dist/utils.d.ts +6 -0
- package/dist/utils.d.ts.map +1 -0
- package/dist/utils.js +21 -0
- package/dist/utils.js.map +1 -0
- package/package.json +5 -5
- package/src/__tests__/utils.test.ts +82 -0
- package/src/loader.tsx +5 -22
- package/src/utils.ts +32 -0
package/dist/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.tsx"],"names":[],"mappings":"AAAA,OAAO,EASH,SAAS,EACZ,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.tsx"],"names":[],"mappings":"AAAA,OAAO,EASH,SAAS,EACZ,MAAM,OAAO,CAAC;AAiBf,OAAO,EAAE,QAAQ,EAAe,MAAM,aAAa,CAAC;AAgGpD,oBAAY,SAAS,GAAG,QAAQ,CAAC;AAEjC,MAAM,WAAW,WAAW;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAChD,aAAa,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,MAAM,kGA2LlB,CAAC"}
|
package/dist/loader.js
CHANGED
|
@@ -14,10 +14,11 @@ import get from 'lodash.get';
|
|
|
14
14
|
import { ErrorBoundary } from '@servicetitan/error-boundary';
|
|
15
15
|
import { Log } from '@servicetitan/log-service';
|
|
16
16
|
import { useOptionalDependencies } from '@servicetitan/react-ioc';
|
|
17
|
-
import { EXPOSED_DEPENDENCIES_TOKEN, useCancelation, getJson,
|
|
17
|
+
import { EXPOSED_DEPENDENCIES_TOKEN, useCancelation, getJson, } from './common';
|
|
18
18
|
import { useEventBus } from './event-bus';
|
|
19
19
|
import { HistoryManager } from './history-manager';
|
|
20
20
|
import { EXPOSED_DEPENDENCIES } from './globals';
|
|
21
|
+
import { getVersionMismatches } from './utils';
|
|
21
22
|
function omitPackageVersion(packageUrl) {
|
|
22
23
|
const chunks = packageUrl.split('@');
|
|
23
24
|
if (chunks.length > 2) {
|
|
@@ -58,22 +59,7 @@ function getBundleInfo(mainPackageUrl, fallbackPackageUrl, exposedDependencies =
|
|
|
58
59
|
cache: 'no-store',
|
|
59
60
|
signal,
|
|
60
61
|
});
|
|
61
|
-
const mismatch =
|
|
62
|
-
const packageVersion = dependencies[dependency];
|
|
63
|
-
if (packageVersion && !isCompatible(hostVersion, packageVersion)) {
|
|
64
|
-
result[dependency] = { host: hostVersion, package: packageVersion };
|
|
65
|
-
}
|
|
66
|
-
return result;
|
|
67
|
-
}, {});
|
|
68
|
-
for (const [dependency, variable] of Object.entries(metadata.sharedDependencies)) {
|
|
69
|
-
const packageVersion = dependencies[dependency];
|
|
70
|
-
if (!exposedDependencies[dependency]) {
|
|
71
|
-
mismatch[dependency] = { host: 'missing', package: packageVersion };
|
|
72
|
-
}
|
|
73
|
-
else if (exposedDependencies[dependency].variable !== variable) {
|
|
74
|
-
mismatch[dependency] = { host: 'wrong global variable', package: packageVersion };
|
|
75
|
-
}
|
|
76
|
-
}
|
|
62
|
+
const mismatch = getVersionMismatches(exposedDependencies, dependencies, metadata.sharedDependencies);
|
|
77
63
|
const hasMismatch = !!Object.keys(mismatch).length;
|
|
78
64
|
const startupVersion = (_a = metadata.bundledWith) === null || _a === void 0 ? void 0 : _a['@servicetitan/startup'];
|
|
79
65
|
const supportLightBundles = startupVersion && semver.gte(startupVersion, '17.0.0');
|
package/dist/loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EACH,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,EACP,QAAQ,EACR,UAAU,EACV,mBAAmB,GAGtB,MAAM,OAAO,CAAC;AAEf,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,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,EAEH,0BAA0B,EAC1B,cAAc,EACd,OAAO,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EACH,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,EACP,QAAQ,EACR,UAAU,EACV,mBAAmB,GAGtB,MAAM,OAAO,CAAC;AAEf,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,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,EAEH,0BAA0B,EAC1B,cAAc,EACd,OAAO,GAEV,MAAM,UAAU,CAAC;AAClB,OAAO,EAAY,WAAW,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,SAAS,kBAAkB,CAAC,UAAkB;IAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACxC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAe,cAAc,CACzB,GAAW,EACX,MAAoB;;QAEpB,IAAI;YACA,OAAO,CACH,MAAM,OAAO,CAAC,GAAG,EAAE;gBACf,KAAK,EAAE,UAAU;gBACjB,MAAM;aACT,CAAC,CACL,CAAC,IAAI,CAAC;SACV;QAAC,WAAM;YACJ,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;SACnD;IACL,CAAC;CAAA;AAED,SAAe,aAAa,CACxB,cAAsB,EACtB,kBAAsC,EACtC,sBAA2C,EAAE,EAC7C,MAAoB;;;QAEpB,MAAM,EACF,IAAI,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,EAC/B,OAAO,EACP,GAAG,EAAE,UAAU,GAClB,GAAG,MAAM,OAAO,CAAC,GAAG,cAAc,eAAe,EAAE;YAChD,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;YAC3C,MAAM;SACT,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;YACT,IAAI,CAAC,kBAAkB,EAAE;gBACrB,MAAM,CAAC,CAAC;aACX;YAED,OAAO,OAAO,CAAC,GAAG,kBAAkB,eAAe,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,CACpB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,OAAO;YACrC,CAAC,CAAC,GAAG,kBAAkB,CAAC,UAAU,CAAC,IAAI,OAAO,EAAE;YAChD,CAAC,CAAC,UAAU,CACnB,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QAE/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,eAAe,qBAAqB,EAAE;YAC9E,KAAK,EAAE,UAAU;YACjB,MAAM;SACT,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,oBAAoB,CACjC,mBAAmB,EACnB,YAAY,EACZ,QAAQ,CAAC,kBAAkB,CAC9B,CAAC;QAEF,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QACnD,MAAM,cAAc,GAAG,MAAA,QAAQ,CAAC,WAAW,0CAAG,uBAAuB,CAAC,CAAC;QACvE,MAAM,mBAAmB,GAAG,cAAc,IAAI,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACnF,MAAM,KAAK,GAAG,CAAC,WAAW,IAAI,mBAAmB,CAAC;QAClD,MAAM,WAAW,GAAG,CAAC,IAAY,EAAE,EAAE;YACjC,OAAO,GAAG,eAAe,gBAAgB,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAChF,CAAC,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC1E,OAAO;YACH,IAAI,EAAE;gBACF,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;gBACrC,EAAE,EAAE,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC;aACtC;YACD,YAAY,EAAE,QAAQ,CAAC,IAAI;YAC3B,QAAQ,EAAE,GAAG,EAAE;gBACX,IAAI,KAAK,EAAE;oBACP,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAS,QAAQ,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC;oBACxE,IAAI,IAAI,EAAE;wBACN,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBACvD;iBACJ;YACL,CAAC;YACD,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SAC/C,CAAC;;CACL;AAcD,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAC5B,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE;IAC1F,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjD,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,mBAAmB,GAAG,oBAAoB,CAAC,GAC1E,uBAAuB,CAAC,GAAG,EAAE,cAAc,EAAE,0BAA0B,CAAC,CAAC;IAE7E,MAAM,SAAS,GAAG,OAAO,CACrB,GAAG,EAAE,CACD,MAAM,CAAC,WAAW,CACd,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACvC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACrE,KAAK;KACR,CAAC,CACL,EACL,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,kDAAkD;KAClG,CAAC;IAEF,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QACxB,MAAM,SAAS,GAAG,UAAU,CAAY,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE;YAChD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;YACrC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;YAE/B,mBAAmB,CACf,GAAG,EACH,GAAG,EAAE,CAAC,QAAQ,EACd,EAAE,CAAC,kDAAkD;aACxD,CAAC;YAEF,SAAS,CAAC,GAAG,EAAE;gBACX,YAAY,CAAC,IAAI,CAAC,CAAC;gBAEnB,OAAO,GAAG,EAAE;oBACR,WAAW,CAAC,KAAK,EAAE,CAAC;gBACxB,CAAC,CAAC;YACN,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kDAAkD;YAE1D,MAAM,IAAI,GAAG,OAAO,CAChB,GAAG,EAAE,CACD,IAAI,CAA2B,GAAS,EAAE;gBACtC,IAAI,UAAqD,CAAC;gBAC1D,IAAI;oBACA,UAAU,GAAG,MAAM,aAAa,CAC5B,GAAG,EACH,WAAW,EACX,mBAAmB,EACnB,WAAW,CAAC,MAAM,CACrB,CAAC;iBACL;gBAAC,OAAO,CAAC,EAAE;oBACR,IAAI,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE;wBAC5B,OAAO;4BACH,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;yBACtB,CAAC;qBACL;oBAED,MAAM,CAAC,CAAC;iBACX;gBAED,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC;gBAE9D,IAAI,QAAQ,EAAE;oBACV,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC;wBAChB,QAAQ,EAAE,qCAAqC;wBAC/C,OAAO,EACH,8DAA8D;wBAClE,IAAI,EAAE;4BACF,OAAO,EAAE,GAAG;4BACZ,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;yBACzC;qBACJ,CAAC,CAAC;iBACN;gBAED,MAAM,OAAO,CAAC,GAAG,CACb,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBACd,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAC5C,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAC3B,CAAC;oBACF,IAAI,CAAC,MAAM,EAAE;wBACT,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;4BAC/B,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;4BAEhD,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;4BACjC,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;gCACjB,MAAM,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;gCAC3C,OAAO,EAAE,CAAC;4BACd,CAAC,CAAC;4BACF,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC;4BACpB,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;4BAEjB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;wBACjC,CAAC,CAAC,CAAC;qBACN;yBAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE;wBACrC,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;4BAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;4BACrC,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,EAAE,EAAE;gCACxB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;gCACtC,OAAO,EAAE,CAAC;4BACd,CAAC,CAAC;wBACN,CAAC,CAAC,CAAC;qBACN;oBAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC7B,CAAC,CAAC,CACL,CAAC;gBAEF,MAAM,SAAS,GAAG,CAAC,YAAkC,EAAE,EAAE;oBACrD,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,CAAC;wBAClB,UAAU;wBACV,cAAc;wBACd,mBAAmB;wBACnB,QAAQ;wBACR,QAAQ;wBACR,OAAO,EAAE,GAAG,EAAE;4BACV,YAAY,CAAC,KAAK,CAAC,CAAC;wBACxB,CAAC;wBACD,SAAS,EAAE,GAAG,EAAE;4BACZ,QAAQ,EAAE,CAAC;wBACf,CAAC;qBACJ,CAAC,CAAC;gBACP,CAAC,CAAC;gBAEF,OAAO;oBACH,OAAO,EAAE,GAAG,EAAE,CAAC,CACX,KAAC,YAAY,kBACT,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,SAAS,IACZ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM;wBAChB,CAAC,CAAC;4BACI,YAAY,EAAE,kBAAkB,CAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAC3B;yBACJ;wBACH,CAAC,CAAC,EAAE,CAAC,EACL,SAAS,EACf,CACL;iBACJ,CAAC;YACN,CAAC,CAAA,CAAC,EACN,EAAE,CAAC,kDAAkD;aACxD,CAAC;YAEF,OAAO,KAAC,IAAI,KAAG,CAAC;QACpB,CAAC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IACrB,CAAC,EAAE;QACC,GAAG;QACH,WAAW;QACX,SAAS;QACT,UAAU;QACV,cAAc;QACd,mBAAmB;QACnB,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,GAAG,EAAE;QACP,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,OAAO,eAA+B,CAAC;SAC1C;QAED,OAAO,sCAAmB,CAAC;IAC/B,CAAC,EACD,CAAC,eAAe,CAAC,CACpB,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CACzB,GAAG,EAAE,CAAC,GAAG,EAAE;QACP,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,OAAO,aAA6B,CAAC;SACxC;QAED,OAAO,gDAA6B,CAAC;IACzC,CAAC,EACD,CAAC,aAAa,CAAC,CAClB,CAAC;IAEF,OAAO,CACH,MAAC,aAAa,kBAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,iBAClD,SAAS,IAAI,KAAC,eAAe,KAAG,EACjC,KAAC,QAAQ,kBAAC,QAAQ,EAAE,IAAI,gBACpB,KAAC,MAAM,IAAC,GAAG,EAAE,GAAG,GAAI,IACb,KACC,CACnB,CAAC;AACN,CAAC,CACJ,CAAC"}
|
package/dist/utils.d.ts
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ExposedDependencies } from './common';
|
|
2
|
+
export declare const getVersionMismatches: (exposedDependencies: ExposedDependencies, dependencies: Record<string, string>, sharedDependencies: Record<string, string>) => Record<string, {
|
|
3
|
+
host: string;
|
|
4
|
+
package: string;
|
|
5
|
+
}>;
|
|
6
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAgB,MAAM,UAAU,CAAC;AAE7D,eAAO,MAAM,oBAAoB,wBACR,mBAAmB,gBAC1B,OAAO,MAAM,EAAE,MAAM,CAAC,sBAChB,OAAO,MAAM,EAAE,MAAM,CAAC;UAYT,MAAM;aAAW,MAAM;EAc3D,CAAC"}
|
package/dist/utils.js
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { isCompatible } from './common';
|
|
2
|
+
export const getVersionMismatches = (exposedDependencies, dependencies, sharedDependencies) => {
|
|
3
|
+
const mismatch = Object.entries(exposedDependencies).reduce((result, [dependency, { version: hostVersion }]) => {
|
|
4
|
+
const packageVersion = dependencies[dependency];
|
|
5
|
+
if (packageVersion && !isCompatible(hostVersion, packageVersion)) {
|
|
6
|
+
result[dependency] = { host: hostVersion, package: packageVersion };
|
|
7
|
+
}
|
|
8
|
+
return result;
|
|
9
|
+
}, {});
|
|
10
|
+
for (const [dependency, variable] of Object.entries(sharedDependencies)) {
|
|
11
|
+
const packageVersion = dependencies[dependency];
|
|
12
|
+
if (!exposedDependencies[dependency]) {
|
|
13
|
+
mismatch[dependency] = { host: 'missing', package: packageVersion };
|
|
14
|
+
}
|
|
15
|
+
else if (exposedDependencies[dependency].variable !== variable) {
|
|
16
|
+
mismatch[dependency] = { host: 'wrong global variable', package: packageVersion };
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return mismatch;
|
|
20
|
+
};
|
|
21
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7D,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAChC,mBAAwC,EACxC,YAAoC,EACpC,kBAA0C,EAC5C,EAAE;IACA,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,MAAM,CACvD,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE;QAC/C,MAAM,cAAc,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,cAAc,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE;YAC9D,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;SACvE;QAED,OAAO,MAAM,CAAC;IAClB,CAAC,EACD,EAAuD,CAC1D,CAAC;IAEF,KAAK,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE;QACrE,MAAM,cAAc,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAEhD,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;YAClC,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;SACvE;aAAM,IAAI,mBAAmB,CAAC,UAAU,CAAC,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC9D,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,uBAAuB,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;SACrF;KACJ;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicetitan/web-components",
|
|
3
|
-
"version": "21.
|
|
3
|
+
"version": "21.10.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -15,15 +15,15 @@
|
|
|
15
15
|
"src"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@servicetitan/error-boundary": "^21.
|
|
18
|
+
"@servicetitan/error-boundary": "^21.10.0",
|
|
19
19
|
"lodash.get": "~4.4.2",
|
|
20
20
|
"mitt": "~3.0.0",
|
|
21
21
|
"semver": "~7.3.7"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@servicetitan/design-system": "~11.9.0",
|
|
25
|
-
"@servicetitan/log-service": "^21.
|
|
26
|
-
"@servicetitan/react-ioc": "^21.
|
|
25
|
+
"@servicetitan/log-service": "^21.10.0",
|
|
26
|
+
"@servicetitan/react-ioc": "^21.10.0",
|
|
27
27
|
"@types/history": "~4.7.10",
|
|
28
28
|
"@types/lodash.get": "~4.4.6",
|
|
29
29
|
"@types/react": "~17.0.38",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"cli": {
|
|
48
48
|
"webpack": false
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "f0fda3c26c6bb275978d9a5c68d0d2f7fc6132aa"
|
|
51
51
|
}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { getVersionMismatches } from '../utils';
|
|
2
|
+
|
|
3
|
+
describe('getVersionMismatches', () => {
|
|
4
|
+
const getSharedDependencies = () => ({
|
|
5
|
+
'@servicetitan/design-system': 'SharedDependencies.ServiceTitan.DesignSystem',
|
|
6
|
+
'classnames': 'SharedDependencies.ClassNames',
|
|
7
|
+
'formstate': 'SharedDependencies.FormState',
|
|
8
|
+
'mobx': 'SharedDependencies.MobX',
|
|
9
|
+
'mobx-react': 'SharedDependencies.MobXReact',
|
|
10
|
+
'mobx-utils': 'SharedDependencies.MobXUtils',
|
|
11
|
+
'react': 'SharedDependencies.React',
|
|
12
|
+
'react-dom': 'SharedDependencies.ReactDOM',
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
const getDependencies = () => ({
|
|
16
|
+
'@servicetitan/confirm': '^21.7.1',
|
|
17
|
+
'@servicetitan/culture': '^21.7.1',
|
|
18
|
+
'@servicetitan/datetime-utils': '^21.7.1',
|
|
19
|
+
'@servicetitan/design-system': '~11.8.0',
|
|
20
|
+
'@servicetitan/form': '^21.7.1',
|
|
21
|
+
'@servicetitan/log-service': '^21.7.1',
|
|
22
|
+
'@servicetitan/react-ioc': '^21.7.1',
|
|
23
|
+
'@servicetitan/tokens': '~11.8.0',
|
|
24
|
+
'@servicetitan/web-components': '^21.7.1',
|
|
25
|
+
'accounting': '~0.4.1',
|
|
26
|
+
'axios': '~0.25.0',
|
|
27
|
+
'classnames': '~2.3.1',
|
|
28
|
+
'formstate': '^2.0.0',
|
|
29
|
+
'mobx': '~6.6.0',
|
|
30
|
+
'mobx-react': '~7.5.0',
|
|
31
|
+
'react': '~17.0.2',
|
|
32
|
+
'react-dom': '~17.0.2',
|
|
33
|
+
'react-router-dom': '~6.3.0',
|
|
34
|
+
'resumablejs': '1.0.2',
|
|
35
|
+
'utils': '^0.15.9',
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
const getExposedDependencies = () => ({
|
|
39
|
+
'@servicetitan/design-system': {
|
|
40
|
+
version: '~11.8.0',
|
|
41
|
+
variable: 'SharedDependencies.ServiceTitan.DesignSystem',
|
|
42
|
+
},
|
|
43
|
+
'classnames': {
|
|
44
|
+
version: '~2.3.1',
|
|
45
|
+
variable: 'SharedDependencies.ClassNames',
|
|
46
|
+
},
|
|
47
|
+
'formstate': {
|
|
48
|
+
version: '~2.0.0',
|
|
49
|
+
variable: 'SharedDependencies.FormState',
|
|
50
|
+
},
|
|
51
|
+
'mobx': {
|
|
52
|
+
version: '~6.6.0',
|
|
53
|
+
variable: 'SharedDependencies.MobX',
|
|
54
|
+
},
|
|
55
|
+
'mobx-react': {
|
|
56
|
+
version: '~7.5.0',
|
|
57
|
+
variable: 'SharedDependencies.MobXReact',
|
|
58
|
+
},
|
|
59
|
+
'mobx-utils': {
|
|
60
|
+
version: '~6.0.4',
|
|
61
|
+
variable: 'SharedDependencies.MobXUtils',
|
|
62
|
+
},
|
|
63
|
+
'react': {
|
|
64
|
+
version: '~17.0.2',
|
|
65
|
+
variable: 'SharedDependencies.React',
|
|
66
|
+
},
|
|
67
|
+
'react-dom': {
|
|
68
|
+
version: '~17.0.2',
|
|
69
|
+
variable: 'SharedDependencies.ReactDOM',
|
|
70
|
+
},
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
test('doesnt find mismatches when everything ok', () => {
|
|
74
|
+
expect(
|
|
75
|
+
getVersionMismatches(
|
|
76
|
+
getExposedDependencies(),
|
|
77
|
+
getDependencies(),
|
|
78
|
+
getSharedDependencies()
|
|
79
|
+
)
|
|
80
|
+
).toEqual({});
|
|
81
|
+
});
|
|
82
|
+
});
|
package/src/loader.tsx
CHANGED
|
@@ -23,12 +23,12 @@ import {
|
|
|
23
23
|
EXPOSED_DEPENDENCIES_TOKEN,
|
|
24
24
|
useCancelation,
|
|
25
25
|
getJson,
|
|
26
|
-
isCompatible,
|
|
27
26
|
IWebComponent,
|
|
28
27
|
} from './common';
|
|
29
28
|
import { EventBus, useEventBus } from './event-bus';
|
|
30
29
|
import { HistoryManager } from './history-manager';
|
|
31
30
|
import { EXPOSED_DEPENDENCIES } from './globals';
|
|
31
|
+
import { getVersionMismatches } from './utils';
|
|
32
32
|
|
|
33
33
|
function omitPackageVersion(packageUrl: string) {
|
|
34
34
|
const chunks = packageUrl.split('@');
|
|
@@ -89,29 +89,12 @@ async function getBundleInfo(
|
|
|
89
89
|
signal,
|
|
90
90
|
});
|
|
91
91
|
|
|
92
|
-
const mismatch =
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (packageVersion && !isCompatible(hostVersion, packageVersion)) {
|
|
97
|
-
result[dependency] = { host: hostVersion, package: packageVersion };
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
return result;
|
|
101
|
-
},
|
|
102
|
-
{} as Record<string, { host: string; package: string }>
|
|
92
|
+
const mismatch = getVersionMismatches(
|
|
93
|
+
exposedDependencies,
|
|
94
|
+
dependencies,
|
|
95
|
+
metadata.sharedDependencies
|
|
103
96
|
);
|
|
104
97
|
|
|
105
|
-
for (const [dependency, variable] of Object.entries(metadata.sharedDependencies)) {
|
|
106
|
-
const packageVersion = dependencies[dependency];
|
|
107
|
-
|
|
108
|
-
if (!exposedDependencies[dependency]) {
|
|
109
|
-
mismatch[dependency] = { host: 'missing', package: packageVersion };
|
|
110
|
-
} else if (exposedDependencies[dependency].variable !== variable) {
|
|
111
|
-
mismatch[dependency] = { host: 'wrong global variable', package: packageVersion };
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
|
|
115
98
|
const hasMismatch = !!Object.keys(mismatch).length;
|
|
116
99
|
const startupVersion = metadata.bundledWith?.['@servicetitan/startup'];
|
|
117
100
|
const supportLightBundles = startupVersion && semver.gte(startupVersion, '17.0.0');
|
package/src/utils.ts
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { ExposedDependencies, isCompatible } from './common';
|
|
2
|
+
|
|
3
|
+
export const getVersionMismatches = (
|
|
4
|
+
exposedDependencies: ExposedDependencies,
|
|
5
|
+
dependencies: Record<string, string>,
|
|
6
|
+
sharedDependencies: Record<string, string>
|
|
7
|
+
) => {
|
|
8
|
+
const mismatch = Object.entries(exposedDependencies).reduce(
|
|
9
|
+
(result, [dependency, { version: hostVersion }]) => {
|
|
10
|
+
const packageVersion = dependencies[dependency];
|
|
11
|
+
|
|
12
|
+
if (packageVersion && !isCompatible(hostVersion, packageVersion)) {
|
|
13
|
+
result[dependency] = { host: hostVersion, package: packageVersion };
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
return result;
|
|
17
|
+
},
|
|
18
|
+
{} as Record<string, { host: string; package: string }>
|
|
19
|
+
);
|
|
20
|
+
|
|
21
|
+
for (const [dependency, variable] of Object.entries(sharedDependencies)) {
|
|
22
|
+
const packageVersion = dependencies[dependency];
|
|
23
|
+
|
|
24
|
+
if (!exposedDependencies[dependency]) {
|
|
25
|
+
mismatch[dependency] = { host: 'missing', package: packageVersion };
|
|
26
|
+
} else if (exposedDependencies[dependency].variable !== variable) {
|
|
27
|
+
mismatch[dependency] = { host: 'wrong global variable', package: packageVersion };
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return mismatch;
|
|
32
|
+
};
|