@servicetitan/startup 36.2.0 → 36.3.0-far-1776.2

package/src/webpack/__tests__/create-webpack-config-shared-dependencies.test.ts

@@ -13,7 +13,6 @@ import yargs from 'yargs';
 import {
     getFolders,
     getPackageData,
-    getPackageDependencyVersion,
     getPackages,
     getTsConfig,
     isCustomStyleRules,
@@ -21,6 +20,7 @@ import {
     loadSharedDependencies,
     log,
     pick,
+    readPackageLock,
 } from '../../utils';
 import { miniCssPluginStyleRules } from '../__mocks__';
 import { getLaunchDarklySdkVersion } from '../configs/utils/get-launchdarkly-sdk-version';
@@ -46,7 +46,7 @@ jest.mock('../../utils', () => ({
     ...jest.requireActual('../../utils'),
     getFolders: jest.fn(),
     getPackageData: jest.fn(),
-    getPackageDependencyVersion: jest.fn(),
+    readPackageLock: jest.fn(),
     getPackages: jest.fn(),
     getTsConfig: jest.fn(),
     isCustomStyleRules: jest.fn(),
@@ -113,9 +113,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
             dependencies,
             sharedDependencies,
         });
-        jest.mocked(getPackageDependencyVersion).mockImplementation(
-            (_, defaultVersion) => defaultVersion
-        );
+        jest.mocked(readPackageLock).mockReturnValue({ packages: {} });
         jest.mocked(getPackages).mockReturnValue([]);
         jest.mocked(getTsConfig).mockReturnValue(tsConfig);
         jest.mocked(loadSharedDependencies).mockReturnValue(sharedDependencies);
@@ -162,7 +160,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
                 Object.entries(sharedDependencies).map(([name, variable]) => [
                     name,
                     {
-                        version: getPackageDependencyVersion(name, dependencies[name]),
+                        version: dependencies[name],
                         variable,
                     },
                 ])

package/src/webpack/__tests__/create-webpack-config.test.ts

@@ -17,7 +17,6 @@ import {
     getConfiguration,
     getFolders,
     getPackageData,
-    getPackageDependencyVersion,
     getPackages,
     getTsConfig,
     getWebpackConfiguration,
@@ -27,6 +26,7 @@ import {
     loadSharedDependencies,
     log,
     Package,
+    readPackageLock,
     WebpackConfiguration,
 } from '../../utils';
 import { fileRules, productionStyleRules, styleRules } from '../__mocks__';
@@ -60,7 +60,7 @@ jest.mock('../../utils', () => ({
     getConfiguration: jest.fn(),
     getFolders: jest.fn(),
     getPackageData: jest.fn(),
-    getPackageDependencyVersion: jest.fn(),
+    readPackageLock: jest.fn(),
     getPackages: jest.fn(),
     getTsConfig: jest.fn(),
     getWebpackConfiguration: jest.fn(),
@@ -146,9 +146,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
             dependencies,
             sharedDependencies,
         });
-        jest.mocked(getPackageDependencyVersion).mockImplementation(
-            (_, defaultVersion) => defaultVersion
-        );
+        jest.mocked(readPackageLock).mockReturnValue({ packages: {} });
         jest.mocked(getPackages).mockImplementation(() => packages);
         jest.mocked(getTsConfig).mockReturnValue(tsConfig);
         jest.mocked(loadSharedDependencies).mockReturnValue(sharedDependencies);

package/src/webpack/configs/plugins/define-exposed-dependencies-plugin.ts

@@ -1,5 +1,5 @@
 import { DefinePlugin } from 'webpack';
-import { getPackageDependencyVersion } from '../../../utils';
+import { getLockFileVersion, readPackageLock } from '../../../utils';
 import { Context, Overrides } from '../types';
 import { getExposedDependencies } from '../utils';
 
@@ -10,8 +10,11 @@ export function defineExposedDependenciesPlugin(context: Context, _: Overrides)
     }
 
     const { packageData, sharedDependencies } = context;
-    const exposedDependencies = getExposedDependencies(sharedDependencies, dependency =>
-        getPackageDependencyVersion(dependency, packageData.dependencies?.[dependency])
+    const lockFile = readPackageLock();
+    const exposedDependencies = getExposedDependencies(
+        sharedDependencies,
+        dependency =>
+            getLockFileVersion(lockFile, dependency) ?? packageData.dependencies?.[dependency]
     );
 
     return new DefinePlugin({

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

@@ -1,30 +1,47 @@
 import { fs, vol } from 'memfs';
-import { getLaunchDarklySdkVersion } from '../get-launchdarkly-sdk-version';
 
 jest.mock('fs', () => fs);
 
-describe(`[startup] ${getLaunchDarklySdkVersion.name}`, () => {
+describe('[startup] getLaunchDarklySdkVersion', () => {
     const launchDarklySdkVersion = '1.2.3';
 
-    const subject = () => getLaunchDarklySdkVersion();
+    afterEach(() => {
+        jest.resetModules();
+        vol.reset();
+    });
+
+    const subject = async () => {
+        const { getLaunchDarklySdkVersion } = await import('../get-launchdarkly-sdk-version');
+        return 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', async () => {
+            expect(await 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', () => {
-            expect(subject()).toEqual(launchDarklySdkVersion);
+        test('returns version from package-lock.json', async () => {
+            expect(await subject()).toEqual(launchDarklySdkVersion);
         });
     });
 });

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

@@ -1,24 +1,49 @@
 import { fs, vol } from 'memfs';
-import { getWebComponentsVersion } from '../get-web-components-version';
 
 jest.mock('fs', () => fs);
 
-describe(`[startup] ${getWebComponentsVersion.name}`, () => {
+describe('[startup] getWebComponentsVersion', () => {
     const webComponentsVersion = '1.2.3';
 
-    beforeEach(() => {
-        vol.fromJSON({
-            'packages/web-components/package.json': JSON.stringify({
-                version: webComponentsVersion,
-            }),
-        });
+    afterEach(() => {
+        jest.resetModules();
+        vol.reset();
     });
 
-    afterEach(() => vol.reset());
+    const subject = async () => {
+        const { getWebComponentsVersion } = await import('../get-web-components-version');
+        return getWebComponentsVersion();
+    };
+
+    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', async () => {
+            expect(await subject()).toEqual(webComponentsVersion);
+        });
+    });
 
-    const subject = () => getWebComponentsVersion();
+    describe('when package is not in package-lock.json', () => {
+        beforeEach(() => {
+            vol.fromJSON({
+                './package-lock.json': JSON.stringify({ packages: {} }),
+            });
+        });
 
-    test('returns version from @servicetitan/web-components package', () => {
-        expect(subject()).toEqual(webComponentsVersion);
+        test('throws', async () => {
+            await expect(subject()).rejects.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 { getLockFileVersion, readPackageLock } 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 getLockFileVersion(readPackageLock(), '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 { getLockFileVersion, readPackageLock } from '../../../utils';
 
 export function getWebComponentsVersion() {
-    return readJson<{ version: string }>(
-        path.join(path.dirname(require.resolve('@servicetitan/web-components')), '../package.json')
-    ).version;
+    const version = getLockFileVersion(readPackageLock(), '@servicetitan/web-components');
+    if (!version) {
+        throw new Error(
+            'Unable to resolve @servicetitan/web-components version from package-lock.json'
+        );
+    }
+    return version;
 }