@servicetitan/startup 35.1.0 → 35.2.0-far-1776.1

package/src/webpack/configs/utils/__tests__/get-launchdarkly-sdk-version.test.ts

@@ -6,24 +6,36 @@ jest.mock('fs', () => fs);
 describe(`[startup] ${getLaunchDarklySdkVersion.name}`, () => {
     const launchDarklySdkVersion = '1.2.3';
 
+    afterEach(() => vol.reset());
+
     const subject = () => getLaunchDarklySdkVersion();
 
-    test('returns undefined', () => {
-        expect(subject()).toBeUndefined();
+    describe('when package is not in package-lock.json', () => {
+        beforeEach(() => {
+            vol.fromJSON({
+                './package-lock.json': JSON.stringify({ packages: {} }),
+            });
+        });
+
+        test('returns undefined', () => {
+            expect(subject()).toBeUndefined();
+        });
     });
 
-    describe('when package is present', () => {
+    describe('when package is in package-lock.json', () => {
         beforeEach(() => {
             vol.fromJSON({
-                'node_modules/launchdarkly-js-client-sdk/package.json': JSON.stringify({
-                    version: launchDarklySdkVersion,
+                './package-lock.json': JSON.stringify({
+                    packages: {
+                        'node_modules/launchdarkly-js-client-sdk': {
+                            version: launchDarklySdkVersion,
+                        },
+                    },
                 }),
             });
         });
 
-        afterEach(() => vol.reset());
-
-        test('returns version from launchdarkly-js-client-sdk package', () => {
+        test('returns version from package-lock.json', () => {
             expect(subject()).toEqual(launchDarklySdkVersion);
         });
     });

package/src/webpack/configs/utils/__tests__/get-web-components-version.test.ts

@@ -6,19 +6,39 @@ jest.mock('fs', () => fs);
 describe(`[startup] ${getWebComponentsVersion.name}`, () => {
     const webComponentsVersion = '1.2.3';
 
-    beforeEach(() => {
-        vol.fromJSON({
-            'packages/web-components/package.json': JSON.stringify({
-                version: webComponentsVersion,
-            }),
-        });
-    });
-
     afterEach(() => vol.reset());
 
     const subject = () => getWebComponentsVersion();
 
-    test('returns version from @servicetitan/web-components package', () => {
-        expect(subject()).toEqual(webComponentsVersion);
+    describe('when package is in package-lock.json', () => {
+        beforeEach(() => {
+            vol.fromJSON({
+                './package-lock.json': JSON.stringify({
+                    packages: {
+                        'node_modules/@servicetitan/web-components': {
+                            version: webComponentsVersion,
+                        },
+                    },
+                }),
+            });
+        });
+
+        test('returns version from package-lock.json', () => {
+            expect(subject()).toEqual(webComponentsVersion);
+        });
+    });
+
+    describe('when package is not in package-lock.json', () => {
+        beforeEach(() => {
+            vol.fromJSON({
+                './package-lock.json': JSON.stringify({ packages: {} }),
+            });
+        });
+
+        test('throws', () => {
+            expect(subject).toThrow(
+                'Unable to resolve @servicetitan/web-components version from package-lock.json'
+            );
+        });
     });
 });

package/src/webpack/configs/utils/get-launchdarkly-sdk-version.ts

@@ -1,15 +1,5 @@
-import path from 'path';
-import { readJson } from '../../../utils';
+import { getPackageVersion } from '../../../utils';
 
 export function getLaunchDarklySdkVersion() {
-    try {
-        return readJson<{ version: string }>(
-            path.join(
-                path.dirname(require.resolve('launchdarkly-js-client-sdk')),
-                '../package.json'
-            )
-        ).version;
-    } catch {
-        // ignore
-    }
+    return getPackageVersion('launchdarkly-js-client-sdk');
 }

package/src/webpack/configs/utils/get-web-components-version.ts

@@ -1,8 +1,11 @@
-import path from 'path';
-import { readJson } from '../../../utils';
+import { getPackageVersion } from '../../../utils';
 
 export function getWebComponentsVersion() {
-    return readJson<{ version: string }>(
-        path.join(path.dirname(require.resolve('@servicetitan/web-components')), '../package.json')
-    ).version;
+    const version = getPackageVersion('@servicetitan/web-components');
+    if (!version) {
+        throw new Error(
+            'Unable to resolve @servicetitan/web-components version from package-lock.json'
+        );
+    }
+    return version;
 }