@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/lang/en.lyaml

@@ -2,7 +2,7 @@ en:
   commands:
     generalErrors:
       updateNotify:
-        notifyTitle: "Update available"
+        notifyTitle: "CLI update available"
         cmsUpdateNotification: "{{#bold}}The CMS CLI is now the HubSpot CLI{{/bold}}\n\nTo upgrade, uninstall {{#bold}}{{ packageName }}{{/bold}}\nand then run {{ updateCommand }}"
         cliUpdateNotification: "HubSpot CLI version {{#cyan}}{{#bold}}{currentVersion}{{/bold}}{{/cyan}} is outdated.\nRun {{ updateCommand }} to upgrade to version {{#cyan}}{{#bold}}{latestVersion}{{/bold}}{{/cyan}}"
       srcIsProject: "\"{{ src }}\" is in a project folder. Did you mean \"hs project {{command}}\"?"
@@ -801,7 +801,7 @@ en:
             uploadFailed: "Failed to upload file \"{{ filePath }}\" to \"{{ remotePath }}\""
             deleteFileFailed: "Failed to delete file \"{{ remotePath }}\""
             deleteFolderFailed: "Failed to delete folder \"{{ remotePath }}\""
-            v3ApiError: "{{ command }} is not supported for platform version '{{ platformVersion}}', use {{ newCommand }} instead to develop locally. {{ linkToDocs }}"
+            v2ApiError: "{{ command }} is not supported for platform version '{{ platformVersion}}', use {{ newCommand }} instead to develop locally. {{ linkToDocs }}"
         download:
           describe: "Download your project files from HubSpot."
           examples:
@@ -1162,7 +1162,7 @@ en:
         createNewSandboxOption: "<Test on a new development sandbox>"
         createNewDeveloperTestAccountOption: "<Test on a new developer test account>"
         chooseDefaultAccountOption: "<{{#bold}}\U00002757{{/bold}} Test on this production account {{#bold}}\U00002757{{/bold}}>"
-        promptMessage: "[--account] Choose a {{ accountType }} under {{ accountIdentifier }} to test with:"
+        promptMessage: "Choose a {{ accountType }} under {{ accountIdentifier }} to test with:"
         sandboxLimit: "Your account reached the limit of {{ limit }} development sandboxes"
         sandboxLimitWithSuggestion: "Your account reached the limit of {{ limit }} development sandboxes. Run {{ authCommand }} to add an existing one to the config."
         developerTestAccountLimit: "Your account reached the limit of {{ limit }} developer test accounts."
@@ -1348,7 +1348,7 @@ en:
             succeed: "Created {{#bold}}{{ accountName }} [standard sandbox] ({{ accountId }}){{/bold}}."
         failure:
           invalidUser: "Couldn't create {{#bold}}{{ accountName }}{{/bold}} because your account has been removed from {{#bold}}{{ parentAccountName }}{{/bold}} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in {{#bold}}{{ parentAccountName }}{{/bold}}."
-          403Gating: "Couldn't create {{#bold}}{{ accountName }}{{/bold}} because {{#bold}}{{ parentAccountName }}{{/bold}} does not have access to development sandboxes. To opt in to the CRM Development Beta and use development sandboxes, visit https://app.hubspot.com/l/product-updates/in-beta?update=13899236."
+          403Gating: "We couldn't create {{#bold}}{{ accountName }}{{/bold}} because {{#bold}}{{ parentAccountName }}{{/bold}} is a developer account and does not have access to development sandboxes. To gain access to developer sandboxes, you can convert your account: https://developers.hubspot.com/docs/getting-started/convert-your-account-into-a-developer-crm-account"
           usageLimitsFetch: "Unable to fetch sandbox usage limits. Please try again."
           generic: "An error occurred while creating a new sandbox. Please try again."
           limit:

package/lib/__tests__/buildAccount.test.js

@@ -10,7 +10,8 @@ vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/api/developerTestAccounts');
 vi.mock('@hubspot/local-dev-lib/api/sandboxHubs');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
+vi.mock('../errorHandlers/index.js');
 vi.mock('../prompts/personalAccessKeyPrompt');
 vi.mock('../prompts/accountNamePrompt');
 vi.mock('../ui/SpinniesManager', () => ({
@@ -101,7 +102,7 @@ describe('lib/buildAccount', () => {
             expect(result).toBe('test-account-with-new-name');
         });
     });
-    describe('createDeveloperTestAccountV3()', () => {
+    describe('createDeveloperTestAccountV2()', () => {
         const parentAccountId = 123456;
         const mockDeveoperTestAccountConfig = {
             accountName: 'Developer Test Account',
@@ -119,7 +120,7 @@ describe('lib/buildAccount', () => {
             });
         });
         it('should create a developer test account successfully', async () => {
-            const result = await buildAccount.createDeveloperTestAccountV3(parentAccountId, mockDeveoperTestAccountConfig);
+            const result = await buildAccount.createDeveloperTestAccountV2(parentAccountId, mockDeveoperTestAccountConfig);
             expect(result).toEqual({
                 accountName: mockDeveoperTestAccountConfig.accountName,
                 accountId: 123456,

package/lib/__tests__/commonOpts.test.js

@@ -12,7 +12,7 @@ function buildArguments(args) {
     };
 }
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 describe('lib/commonOpts', () => {
     describe('getCmsPublishMode()', () => {
         const accounts = {

package/lib/__tests__/dependencyManagement.test.js

@@ -6,7 +6,7 @@ import { getProjectConfig } from '../projects/config.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import fs from 'fs';
 vi.mock('../projects/config');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/fs');
 vi.mock('fs');
 vi.mock('../ui/SpinniesManager', () => ({

package/lib/__tests__/developerTestAccounts.test.js

@@ -1,12 +1,12 @@
 import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { mockHubSpotHttpError } from '../testUtils.js';
 import * as errorHandlers from '../errorHandlers/index.js';
 import { getHasDevTestAccounts, handleDeveloperTestAccountCreateError, validateDevTestAccountUsageLimits, } from '../developerTestAccounts.js';
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/developerTestAccounts');
 vi.mock('../errorHandlers');
 const mockedGetAccountId = getAccountId;
@@ -101,7 +101,7 @@ describe('lib/developerTestAccounts', () => {
         let loggerErrorSpy;
         let logErrorSpy;
         beforeEach(() => {
-            loggerErrorSpy = vi.spyOn(logger, 'error');
+            loggerErrorSpy = vi.spyOn(uiLogger, 'error');
             logErrorSpy = vi.spyOn(errorHandlers, 'logError');
         });
         afterEach(() => {

package/lib/__tests__/hasFeature.test.js

@@ -1,35 +1,173 @@
 import { fetchEnabledFeatures } from '@hubspot/local-dev-lib/api/localDevAuth';
-import { hasFeature } from '../hasFeature.js';
+import { http } from '@hubspot/local-dev-lib/http';
+import { hasFeature, hasUnfiedAppsAccess } from '../hasFeature.js';
+import { FEATURES } from '../constants.js';
 vi.mock('@hubspot/local-dev-lib/api/localDevAuth');
+vi.mock('@hubspot/local-dev-lib/http');
 const mockedFetchEnabledFeatures = fetchEnabledFeatures;
+const mockedHttp = http;
 describe('lib/hasFeature', () => {
     describe('hasFeature()', () => {
         const accountId = 123;
-        beforeEach(() => {
+        afterEach(() => {
+            vi.clearAllMocks();
+        });
+        it('should return true if the feature is enabled', async () => {
             mockedFetchEnabledFeatures.mockResolvedValueOnce({
                 data: {
                     enabledFeatures: {
                         'feature-1': true,
-                        'feature-2': false,
-                        'feature-3': true,
                     },
                 },
             });
-        });
-        it('should return true if the feature is enabled', async () => {
             // @ts-expect-error test data
             const result = await hasFeature(accountId, 'feature-1');
             expect(result).toBe(true);
         });
-        it('should return false if the feature is not enabled', async () => {
+        it('should return false if the feature is disabled', async () => {
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        'feature-2': false,
+                    },
+                },
+            });
             // @ts-expect-error test data
             const result = await hasFeature(accountId, 'feature-2');
             expect(result).toBe(false);
         });
         it('should return false if the feature is not present', async () => {
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {},
+                },
+            });
             // @ts-expect-error test data
             const result = await hasFeature(accountId, 'feature-4');
             expect(result).toBe(false);
         });
+        it('should return true for APPS_HOME feature when not present in enabled features (defaults on)', async () => {
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {},
+                },
+            });
+            const result = await hasFeature(accountId, FEATURES.APPS_HOME);
+            expect(result).toBe(true);
+        });
+        it('should respect explicit setting for APPS_HOME feature even when it defaults on', async () => {
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        [FEATURES.APPS_HOME]: false,
+                    },
+                },
+            });
+            const result = await hasFeature(accountId, FEATURES.APPS_HOME);
+            expect(result).toBe(false);
+        });
+        it('should handle truthy values correctly', async () => {
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        'feature-truthy': 'yes',
+                    },
+                },
+            });
+            // @ts-expect-error test data
+            const truthyResult = await hasFeature(accountId, 'feature-truthy');
+            expect(truthyResult).toBe(true);
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        'feature-number': 1,
+                    },
+                },
+            });
+            // @ts-expect-error test data
+            const numberResult = await hasFeature(accountId, 'feature-number');
+            expect(numberResult).toBe(true);
+        });
+        it('should handle falsy values correctly', async () => {
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        'feature-null': null,
+                    },
+                },
+            });
+            // @ts-expect-error test data
+            const nullResult = await hasFeature(accountId, 'feature-null');
+            expect(nullResult).toBe(false);
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        'feature-zero': 0,
+                    },
+                },
+            });
+            // @ts-expect-error test data
+            const zeroResult = await hasFeature(accountId, 'feature-zero');
+            expect(zeroResult).toBe(false);
+            mockedFetchEnabledFeatures.mockResolvedValueOnce({
+                data: {
+                    enabledFeatures: {
+                        'feature-empty': '',
+                    },
+                },
+            });
+            // @ts-expect-error test data
+            const emptyResult = await hasFeature(accountId, 'feature-empty');
+            expect(emptyResult).toBe(false);
+        });
+        it('should propagate errors from fetchEnabledFeatures', async () => {
+            const error = new Error('API error');
+            mockedFetchEnabledFeatures.mockRejectedValueOnce(error);
+            await expect(hasFeature(accountId, FEATURES.UNIFIED_APPS)).rejects.toThrow('API error');
+        });
+    });
+    describe('hasUnfiedAppsAccess()', () => {
+        const accountId = 123;
+        afterEach(() => {
+            vi.clearAllMocks();
+        });
+        it('should return true when API returns true', async () => {
+            // @ts-expect-error Don't want to mock the full response object
+            mockedHttp.get.mockResolvedValueOnce({ data: true });
+            const result = await hasUnfiedAppsAccess(accountId);
+            expect(result).toBe(true);
+            expect(mockedHttp.get).toHaveBeenCalledWith(accountId, {
+                url: 'developer-tooling/external/developer-portal/has-unified-dev-platform-access',
+            });
+        });
+        it('should return false when API returns false', async () => {
+            // @ts-expect-error Don't want to mock the full response object
+            mockedHttp.get.mockResolvedValueOnce({ data: false });
+            const result = await hasUnfiedAppsAccess(accountId);
+            expect(result).toBe(false);
+        });
+        it('should handle truthy values correctly', async () => {
+            // @ts-expect-error Don't want to mock the full response object
+            mockedHttp.get.mockResolvedValueOnce({ data: 'yes' });
+            const result = await hasUnfiedAppsAccess(accountId);
+            expect(result).toBe(true);
+        });
+        it('should handle falsy values correctly', async () => {
+            // @ts-expect-error Don't want to mock the full response object
+            mockedHttp.get.mockResolvedValueOnce({ data: null });
+            const result = await hasUnfiedAppsAccess(accountId);
+            expect(result).toBe(false);
+        });
+        it('should handle undefined response data', async () => {
+            // @ts-expect-error Don't want to mock the full response object
+            mockedHttp.get.mockResolvedValueOnce({ data: undefined });
+            const result = await hasUnfiedAppsAccess(accountId);
+            expect(result).toBe(false);
+        });
+        it('should propagate errors from http.get', async () => {
+            const error = new Error('Network error');
+            mockedHttp.get.mockRejectedValueOnce(error);
+            await expect(hasUnfiedAppsAccess(accountId)).rejects.toThrow('Network error');
+        });
     });
 });

package/lib/__tests__/npm.test.js

@@ -1,7 +1,7 @@
 import util from 'util';
 import { isGloballyInstalled, getLatestCliVersion, DEFAULT_PACKAGE_MANAGER, } from '../npm.js';
 import pkg from '../../package.json' with { type: 'json' };
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 vi.mock('../ui/SpinniesManager');
 describe('lib/npm', () => {
     let execMock;

package/lib/__tests__/oauth.test.js

@@ -3,7 +3,7 @@ import open from 'open';
 import { OAuth2Manager } from '@hubspot/local-dev-lib/models/OAuth2Manager';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { DEFAULT_OAUTH_SCOPES } from '@hubspot/local-dev-lib/constants/auth';
 import { authenticateWithOauth } from '../oauth.js';
@@ -12,7 +12,7 @@ vi.mock('open');
 vi.mock('@hubspot/local-dev-lib/models/OAuth2Manager');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/oauth');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
 const mockedExpress = express;
 const mockedOAuth2Manager = OAuth2Manager;
 const mockedGetAccountConfig = getAccountConfig;
@@ -59,7 +59,7 @@ describe('lib/oauth', () => {
                 env: ENVIRONMENTS.PROD,
             });
             // Verify logger was called
-            expect(logger.log).toHaveBeenCalledWith('Authorizing');
+            expect(uiLogger.log).toHaveBeenCalledWith('Authorizing');
             // Verify OAuth tokens were added to config
             expect(addOauthToAccountConfig).toHaveBeenCalledWith(mockOAuth2Manager);
         });
@@ -75,7 +75,7 @@ describe('lib/oauth', () => {
                 throw new Error('exit');
             });
             await expect(authenticateWithOauth(invalidConfig)).rejects.toThrow('exit');
-            expect(logger.error).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
             expect(exitSpy).toHaveBeenCalled();
             exitSpy.mockRestore();
         });

package/lib/__tests__/process.test.js

@@ -1,10 +1,15 @@
 import readline from 'readline';
-import { logger, setLogLevel, LOG_LEVEL } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
+import { setLogLevel, LOG_LEVEL } from '@hubspot/local-dev-lib/logger';
 import { handleExit, handleKeypress, TERMINATION_SIGNALS } from '../process.js';
 vi.mock('readline');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
+vi.mock('@hubspot/local-dev-lib/logger', async () => {
+    const logger = await vi.importActual('@hubspot/local-dev-lib/logger');
+    return { ...logger, setLogLevel: vi.fn() };
+});
 const mockedReadline = readline;
-const mockedLogger = logger;
+const mockedUiLogger = uiLogger;
 const mockedSetLogLevel = setLogLevel;
 const processRemoveListenerSpy = vi.spyOn(process, 'removeAllListeners');
 const processOnSpy = vi.spyOn(process, 'on');
@@ -26,7 +31,7 @@ describe('lib/process', () => {
             sighupCallback();
             expect(mockedSetLogLevel).toHaveBeenCalledWith(LOG_LEVEL.NONE);
             expect(mockCallback).toHaveBeenCalledWith({ isSIGHUP: true });
-            expect(mockedLogger.debug).toHaveBeenCalledWith(expect.stringContaining('SIGHUP'));
+            expect(mockedUiLogger.debug).toHaveBeenCalledWith(expect.stringContaining('SIGHUP'));
         });
         it('should handle non-SIGHUP signals correctly', async () => {
             handleExit(mockCallback);
@@ -36,7 +41,7 @@ describe('lib/process', () => {
             sigintCallback();
             expect(mockedSetLogLevel).not.toHaveBeenCalled();
             expect(mockCallback).toHaveBeenCalledWith({ isSIGHUP: false });
-            expect(mockedLogger.debug).toHaveBeenCalledWith(expect.stringContaining('SIGINT'));
+            expect(mockedUiLogger.debug).toHaveBeenCalledWith(expect.stringContaining('SIGINT'));
         });
         it('should prevent duplicate exit handling', async () => {
             handleExit(mockCallback);

package/lib/__tests__/sandboxSync.test.js

@@ -1,4 +1,4 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { initiateSync } from '@hubspot/local-dev-lib/api/sandboxSync';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
@@ -6,12 +6,12 @@ import { mockHubSpotHttpError } from '../testUtils.js';
 import { getAvailableSyncTypes } from '../sandboxes.js';
 import { syncSandbox } from '../sandboxSync.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/sandboxSync');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../sandboxes');
 vi.mock('../ui/SpinniesManager');
-const mockedLogger = logger;
+const mockedUiLogger = uiLogger;
 const mockedInitiateSync = initiateSync;
 const mockedGetAccountId = getAccountId;
 const mockedGetAvailableSyncTypes = getAvailableSyncTypes;
@@ -73,7 +73,7 @@ describe('lib/sandboxSync', () => {
             mockedInitiateSync.mockRejectedValue(error);
             await expect(syncSandbox(mockChildAccount, mockParentAccount, mockEnv, mockSyncTasks)).rejects.toEqual(error);
             expect(mockedSpinniesFail).toHaveBeenCalled();
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Couldn't run the sync because there's another sync in progress/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Couldn't run the sync because there's another sync in progress/));
         });
         it('handles invalid user error', async () => {
             const error = mockHubSpotHttpError('', {
@@ -86,7 +86,7 @@ describe('lib/sandboxSync', () => {
             mockedInitiateSync.mockRejectedValue(error);
             await expect(syncSandbox(mockChildAccount, mockParentAccount, mockEnv, mockSyncTasks)).rejects.toEqual(error);
             expect(mockedSpinniesFail).toHaveBeenCalled();
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/because your account has been removed from/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/because your account has been removed from/));
         });
         it('handles not super admin error', async () => {
             const error = mockHubSpotHttpError('', {
@@ -99,7 +99,7 @@ describe('lib/sandboxSync', () => {
             mockedInitiateSync.mockRejectedValue(error);
             await expect(syncSandbox(mockChildAccount, mockParentAccount, mockEnv, mockSyncTasks)).rejects.toEqual(error);
             expect(mockedSpinniesFail).toHaveBeenCalled();
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Couldn't run the sync because you are not a super admin in/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Couldn't run the sync because you are not a super admin in/));
         });
         it('handles sandbox not found error', async () => {
             const error = mockHubSpotHttpError('', {
@@ -112,12 +112,12 @@ describe('lib/sandboxSync', () => {
             mockedInitiateSync.mockRejectedValue(error);
             await expect(syncSandbox(mockChildAccount, mockParentAccount, mockEnv, mockSyncTasks)).rejects.toEqual(error);
             expect(mockedSpinniesFail).toHaveBeenCalled();
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/may have been deleted through the UI/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/may have been deleted through the UI/));
         });
         it('displays slim info message when specified', async () => {
             mockedInitiateSync.mockResolvedValue({ status: 'SUCCESS' });
             await syncSandbox(mockChildAccount, mockParentAccount, mockEnv, mockSyncTasks, true);
-            expect(mockedLogger.info).not.toHaveBeenCalled();
+            expect(mockedUiLogger.info).not.toHaveBeenCalled();
             expect(mockedSpinniesSucceed).toHaveBeenCalledWith('sandboxSync', expect.objectContaining({
                 text: expect.stringMatching(/Initiated sync of object definitions from production to /),
             }));

package/lib/__tests__/sandboxes.test.js

@@ -1,11 +1,11 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { fetchTypes } from '@hubspot/local-dev-lib/api/sandboxSync';
 import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { mockHubSpotHttpError } from '../testUtils.js';
 import { getSandboxTypeAsString, getHasSandboxesByType, getAvailableSyncTypes, validateSandboxUsageLimits, handleSandboxCreateError, } from '../sandboxes.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/sandboxHubs');
 vi.mock('@hubspot/local-dev-lib/api/sandboxSync');
 vi.mock('@hubspot/local-dev-lib/config');
@@ -13,7 +13,7 @@ const mockedGetAccountId = getAccountId;
 const mockedGetSandboxUsageLimits = getSandboxUsageLimits;
 const mockedFetchTypes = fetchTypes;
 const mockedGetConfigAccounts = getConfigAccounts;
-const mockedLogger = logger;
+const mockedUiLogger = uiLogger;
 describe('lib/sandboxes', () => {
     describe('getSandboxTypeAsString()', () => {
         it('returns "development" for development sandbox type', () => {
@@ -101,7 +101,7 @@ describe('lib/sandboxes', () => {
                     usage: { DEVELOPER: { available: 0, limit: 1 } },
                 },
             });
-            await expect(validateSandboxUsageLimits(mockAccount, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, 'qa')).rejects.toThrow(/reached the limit of 1 development sandbox/);
+            await expect(validateSandboxUsageLimits(mockAccount, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, 'qa')).rejects.toThrow(/reached the limit of 1 developer sandboxes/);
         });
     });
     describe('handleSandboxCreateError()', () => {
@@ -117,8 +117,8 @@ describe('lib/sandboxes', () => {
                 },
             });
             expect(() => handleSandboxCreateError(error, mockEnv, mockName, mockAccountId)).toThrow(error);
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/The personal access key you provided doesn't include sandbox permissions/));
-            expect(mockedLogger.info).toHaveBeenCalledWith(expect.stringMatching(/To update CLI permissions for/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/The personal access key you provided doesn't include sandbox permissions/));
+            expect(mockedUiLogger.info).toHaveBeenCalledWith(expect.stringMatching(/To update CLI permissions for/));
         });
         it('handles user access not allowed error', () => {
             const error = mockHubSpotHttpError('user access not allowed error', {
@@ -129,7 +129,7 @@ describe('lib/sandboxes', () => {
                 },
             });
             expect(() => handleSandboxCreateError(error, mockEnv, mockName, mockAccountId)).toThrow(error);
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/your permission set doesn't allow you to create the sandbox/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/your permission set doesn't allow you to create the sandbox/));
         });
         it('handles 403 gating error', () => {
             const error = mockHubSpotHttpError('403 gating error', {
@@ -140,7 +140,7 @@ describe('lib/sandboxes', () => {
                 },
             });
             expect(() => handleSandboxCreateError(error, mockEnv, mockName, mockAccountId)).toThrow(error);
-            expect(mockedLogger.error).toHaveBeenCalledWith(expect.stringMatching(/does not have access to development sandboxes/));
+            expect(mockedUiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/does not have access to development sandboxes/));
         });
     });
 });

package/lib/__tests__/serverlessLogs.test.js

@@ -2,7 +2,7 @@ import mockStdIn from 'mock-stdin';
 import { outputLogs } from '../ui/serverlessFunctionLogs.js';
 import { tailLogs } from '../serverlessLogs.js';
 vi.mock('../ui/serverlessFunctionLogs');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 vi.mock('../ui/SpinniesManager', () => ({
     default: {
         init: vi.fn(),

package/lib/__tests__/usageTracking.test.js

@@ -1,17 +1,17 @@
 import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
 import { isTrackingAllowed, getAccountConfig, } from '@hubspot/local-dev-lib/config';
 import { API_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { trackCommandUsage, trackHelpUsage, trackConvertFieldsUsage, trackAuthAction, trackCommandMetadataUsage, } from '../usageTracking.js';
 import packageJson from '../../package.json' with { type: 'json' };
 const version = packageJson.version;
 vi.mock('@hubspot/local-dev-lib/trackUsage');
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../ui/logger.js');
 const mockedTrackUsage = trackUsage;
 const mockedIsTrackingAllowed = isTrackingAllowed;
 const mockedGetAccountConfig = getAccountConfig;
-const mockedLogger = logger;
+const mockedUiLogger = uiLogger;
 describe('lib/usageTracking', () => {
     const mockPlatform = 'darwin';
     const mockNodeVersion = 'v16.14.0';
@@ -53,7 +53,7 @@ describe('lib/usageTracking', () => {
                 throw error;
             });
             await trackCommandUsage(mockCommand);
-            expect(mockedLogger.debug).toHaveBeenCalledWith(expect.stringContaining(error.message));
+            expect(mockedUiLogger.debug).toHaveBeenCalledWith(expect.stringContaining(error.message));
         });
     });
     describe('trackHelpUsage()', () => {
@@ -76,7 +76,7 @@ describe('lib/usageTracking', () => {
         });
         it('should track main help usage without command', async () => {
             await trackHelpUsage('');
-            expect(mockedLogger.debug).toHaveBeenCalledWith(expect.stringContaining('main command'));
+            expect(mockedUiLogger.debug).toHaveBeenCalledWith(expect.stringContaining('main command'));
         });
     });
     describe('trackConvertFieldsUsage()', () => {

package/lib/__tests__/validation.test.js

@@ -3,7 +3,8 @@ import { getOauthManager } from '@hubspot/local-dev-lib/oauth';
 import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personalAccessKey';
 import { validateAccount } from '../validation.js';
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../lib/ui/logger.js');
+vi.mock('../errorHandlers/index.js');
 vi.mock('@hubspot/local-dev-lib/oauth');
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('../commonOpts');