@hubspot/cli 7.7.19-experimental.3 → 7.7.21-experimental.0

package/lib/mcp/setup.js

@@ -1,50 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.supportedTools = void 0;
-exports.addMintlifyMcpServer = addMintlifyMcpServer;
-exports.setupMintlify = setupMintlify;
-exports.addMcpServerToConfig = addMcpServerToConfig;
-exports.setupClaudeCode = setupClaudeCode;
-exports.setupCursor = setupCursor;
-exports.setupWindsurf = setupWindsurf;
-const logger_1 = require("../ui/logger");
-const en_1 = require("../../lang/en");
-const promptUtils_1 = require("../prompts/promptUtils");
-const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
-const errorHandlers_1 = require("../errorHandlers");
-const command_1 = require("../../mcp-server/utils/command");
-const child_process_1 = require("child_process");
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const fs_1 = require("fs");
+import { uiLogger } from '../ui/logger.js';
+import { commands } from '../../lang/en.js';
+import { promptUser } from '../prompts/promptUtils.js';
+import SpinniesManager from '../ui/SpinniesManager.js';
+import { logError } from '../errorHandlers/index.js';
+import { execAsync } from '../../mcp-server/utils/command.js';
+import { spawn } from 'node:child_process';
+import path from 'path';
+import os from 'os';
+import fs from 'fs-extra';
+import { existsSync } from 'fs';
 const mcpServerName = 'hubspot-cli-mcp';
 const claudeCode = 'claude';
 const windsurf = 'windsurf';
 const cursor = 'cursor';
 const supportedMintlifyClients = [windsurf, cursor];
-exports.supportedTools = [
-    { name: en_1.commands.mcp.setup.claudeCode, value: claudeCode },
-    { name: en_1.commands.mcp.setup.cursor, value: cursor },
-    { name: en_1.commands.mcp.setup.windsurf, value: windsurf },
+export const supportedTools = [
+    { name: commands.mcp.setup.claudeCode, value: claudeCode },
+    { name: commands.mcp.setup.cursor, value: cursor },
+    { name: commands.mcp.setup.windsurf, value: windsurf },
 ];
 const defaultMcpCommand = {
     command: 'hs',
     args: ['mcp', 'start'],
 };
-async function addMintlifyMcpServer(installTargets) {
+export async function addMintlifyMcpServer(installTargets) {
     await runSetupFunction(() => setupMintlify(installTargets));
 }
-async function setupMintlify(derivedTargets = supportedMintlifyClients) {
-    logger_1.uiLogger.info(en_1.commands.mcp.setup.installingDocSearch);
-    logger_1.uiLogger.log('');
+export async function setupMintlify(derivedTargets = supportedMintlifyClients) {
+    uiLogger.info(commands.mcp.setup.installingDocSearch);
+    uiLogger.log('');
     return new Promise(resolve => {
         const subcommands = ['mint-mcp', 'add', 'hubspot-migration'];
         const docsSearchClients = derivedTargets.filter(target => supportedMintlifyClients.includes(target));
-        const childProcess = (0, child_process_1.spawn)(`npx`, docsSearchClients && docsSearchClients.length
+        const childProcess = spawn(`npx`, docsSearchClients && docsSearchClients.length
             ? [...subcommands, '--client', ...docsSearchClients]
             : subcommands, {
             stdio: 'inherit',
@@ -57,18 +45,18 @@ async function setupMintlify(derivedTargets = supportedMintlifyClients) {
         });
     });
 }
-async function addMcpServerToConfig(targets) {
+export async function addMcpServerToConfig(targets) {
     try {
         let derivedTargets = [];
         if (!targets || targets.length === 0) {
-            const { selectedTargets } = await (0, promptUtils_1.promptUser)({
+            const { selectedTargets } = await promptUser({
                 name: 'selectedTargets',
                 type: 'checkbox',
-                message: en_1.commands.mcp.setup.prompts.targets,
-                choices: exports.supportedTools,
+                message: commands.mcp.setup.prompts.targets,
+                choices: supportedTools,
                 validate: (choices) => {
                     return choices.length === 0
-                        ? en_1.commands.mcp.setup.prompts.targetsRequired
+                        ? commands.mcp.setup.prompts.targetsRequired
                         : true;
                 },
             });
@@ -77,7 +65,7 @@ async function addMcpServerToConfig(targets) {
         else {
             derivedTargets = targets;
         }
-        SpinniesManager_1.default.init();
+        SpinniesManager.init();
         if (derivedTargets.includes(claudeCode)) {
             await runSetupFunction(setupClaudeCode);
         }
@@ -87,12 +75,12 @@ async function addMcpServerToConfig(targets) {
         if (derivedTargets.includes(windsurf)) {
             await runSetupFunction(setupWindsurf);
         }
-        logger_1.uiLogger.info(en_1.commands.mcp.setup.success(derivedTargets));
+        uiLogger.info(commands.mcp.setup.success(derivedTargets));
         return derivedTargets;
     }
     catch (error) {
-        SpinniesManager_1.default.fail('mcpSetup', {
-            text: en_1.commands.mcp.setup.spinners.failedToConfigure,
+        SpinniesManager.fail('mcpSetup', {
+            text: commands.mcp.setup.spinners.failedToConfigure,
         });
         throw error;
     }
@@ -105,22 +93,22 @@ async function runSetupFunction(func) {
 }
 function setupMcpConfigFile(config) {
     try {
-        SpinniesManager_1.default.add('spinner', {
+        SpinniesManager.add('spinner', {
             text: config.configuringMessage,
         });
-        if (!(0, fs_1.existsSync)(config.configPath)) {
-            fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
+        if (!existsSync(config.configPath)) {
+            fs.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
         }
         let mcpConfig = {};
         try {
-            const configContent = fs_extra_1.default.readFileSync(config.configPath, 'utf8');
+            const configContent = fs.readFileSync(config.configPath, 'utf8');
             mcpConfig = JSON.parse(configContent);
         }
         catch (error) {
-            SpinniesManager_1.default.fail('spinner', {
+            SpinniesManager.fail('spinner', {
                 text: config.failedMessage,
             });
-            (0, errorHandlers_1.logError)(error);
+            logError(error);
             return false;
         }
         // Initialize mcpServers if it doesn't exist
@@ -132,87 +120,87 @@ function setupMcpConfigFile(config) {
             ...config.mcpCommand,
         };
         // Write the updated config
-        fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
-        SpinniesManager_1.default.succeed('spinner', {
+        fs.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
+        SpinniesManager.succeed('spinner', {
             text: config.configuredMessage,
         });
         return true;
     }
     catch (error) {
-        SpinniesManager_1.default.fail('spinner', {
+        SpinniesManager.fail('spinner', {
             text: config.failedMessage,
         });
-        (0, errorHandlers_1.logError)(error);
+        logError(error);
         return false;
     }
 }
-async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
+export async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
     try {
-        SpinniesManager_1.default.add('claudeCode', {
-            text: en_1.commands.mcp.setup.spinners.configuringClaudeCode,
+        SpinniesManager.add('claudeCode', {
+            text: commands.mcp.setup.spinners.configuringClaudeCode,
         });
         try {
             // Check if claude command is available
-            await (0, command_1.execAsync)('claude --version');
+            await execAsync('claude --version');
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
                 ...mcpCommand,
             });
-            const { stdout } = await (0, command_1.execAsync)('claude mcp list');
+            const { stdout } = await execAsync('claude mcp list');
             if (stdout.includes(mcpServerName)) {
-                SpinniesManager_1.default.update('claudeCode', {
-                    text: en_1.commands.mcp.setup.spinners.alreadyInstalled,
+                SpinniesManager.update('claudeCode', {
+                    text: commands.mcp.setup.spinners.alreadyInstalled,
                 });
-                await (0, command_1.execAsync)(`claude mcp remove "${mcpServerName}" --scope user`);
+                await execAsync(`claude mcp remove "${mcpServerName}" --scope user`);
             }
-            await (0, command_1.execAsync)(`claude mcp add-json "${mcpServerName}" '${mcpConfig}' --scope user`);
-            SpinniesManager_1.default.succeed('claudeCode', {
-                text: en_1.commands.mcp.setup.spinners.configuredClaudeCode,
+            await execAsync(`claude mcp add-json "${mcpServerName}" '${mcpConfig}' --scope user`);
+            SpinniesManager.succeed('claudeCode', {
+                text: commands.mcp.setup.spinners.configuredClaudeCode,
             });
             return true;
         }
         catch (error) {
             if (error instanceof Error &&
                 error.message.includes('claude: command not found')) {
-                SpinniesManager_1.default.fail('claudeCode', {
-                    text: en_1.commands.mcp.setup.spinners.claudeCodeNotFound,
+                SpinniesManager.fail('claudeCode', {
+                    text: commands.mcp.setup.spinners.claudeCodeNotFound,
                 });
             }
             else {
-                SpinniesManager_1.default.fail('claudeCode', {
-                    text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
+                SpinniesManager.fail('claudeCode', {
+                    text: commands.mcp.setup.spinners.claudeCodeInstallFailed,
                 });
-                (0, errorHandlers_1.logError)(error);
+                logError(error);
             }
             return false;
         }
     }
     catch (error) {
-        SpinniesManager_1.default.fail('claudeCode', {
-            text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
+        SpinniesManager.fail('claudeCode', {
+            text: commands.mcp.setup.spinners.claudeCodeInstallFailed,
         });
-        (0, errorHandlers_1.logError)(error);
+        logError(error);
         return false;
     }
 }
-function setupCursor(mcpCommand = defaultMcpCommand) {
-    const cursorConfigPath = path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json');
+export function setupCursor(mcpCommand = defaultMcpCommand) {
+    const cursorConfigPath = path.join(os.homedir(), '.cursor', 'mcp.json');
     return setupMcpConfigFile({
         configPath: cursorConfigPath,
-        configuringMessage: en_1.commands.mcp.setup.spinners.configuringCursor,
-        configuredMessage: en_1.commands.mcp.setup.spinners.configuredCursor,
-        failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
+        configuringMessage: commands.mcp.setup.spinners.configuringCursor,
+        configuredMessage: commands.mcp.setup.spinners.configuredCursor,
+        failedMessage: commands.mcp.setup.spinners.failedToConfigureCursor,
         mcpCommand,
     });
 }
-function setupWindsurf(mcpCommand = defaultMcpCommand) {
-    const windsurfConfigPath = path_1.default.join(os_1.default.homedir(), '.codeium', 'windsurf', 'mcp_config.json');
+export function setupWindsurf(mcpCommand = defaultMcpCommand) {
+    const windsurfConfigPath = path.join(os.homedir(), '.codeium', 'windsurf', 'mcp_config.json');
     return setupMcpConfigFile({
         configPath: windsurfConfigPath,
-        configuringMessage: en_1.commands.mcp.setup.spinners.configuringWindsurf,
-        configuredMessage: en_1.commands.mcp.setup.spinners.configuredWindsurf,
-        failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureWindsurf,
+        configuringMessage: commands.mcp.setup.spinners.configuringWindsurf,
+        configuredMessage: commands.mcp.setup.spinners.configuredWindsurf,
+        failedMessage: commands.mcp.setup.spinners.failedToConfigureWindsurf,
         mcpCommand,
     });
 }

package/lib/middleware/__test__/configMiddleware.test.js

@@ -1,58 +1,23 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const cliConfig = __importStar(require("@hubspot/local-dev-lib/config"));
-const validation = __importStar(require("../../validation"));
-const exitCodes_1 = require("../../enums/exitCodes");
-const configMiddleware_1 = require("../configMiddleware");
-jest.mock('@hubspot/local-dev-lib/logger', () => ({
+import { logger } from '@hubspot/local-dev-lib/logger';
+import * as cliConfig from '@hubspot/local-dev-lib/config';
+import * as validation from '../../validation.js';
+import { EXIT_CODES } from '../../enums/exitCodes.js';
+import { handleDeprecatedEnvVariables, injectAccountIdMiddleware, loadConfigMiddleware, validateAccountOptions, } from '../configMiddleware.js';
+vi.mock('@hubspot/local-dev-lib/logger', () => ({
     logger: {
-        error: jest.fn(),
-        log: jest.fn(),
+        error: vi.fn(),
+        log: vi.fn(),
     },
 }));
-jest.mock('@hubspot/local-dev-lib/config');
-jest.mock('../../validation');
-const validateAccountSpy = jest.spyOn(validation, 'validateAccount');
-const loadConfigSpy = jest.spyOn(cliConfig, 'loadConfig');
-const getAccountIdSpy = jest.spyOn(cliConfig, 'getAccountId');
-const configFileExistsSpy = jest.spyOn(cliConfig, 'configFileExists');
-const getConfigPathSpy = jest.spyOn(cliConfig, 'getConfigPath');
-const validateConfigSpy = jest.spyOn(cliConfig, 'validateConfig');
-const processExitSpy = jest.spyOn(process, 'exit');
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../validation');
+const validateAccountSpy = vi.spyOn(validation, 'validateAccount');
+const loadConfigSpy = vi.spyOn(cliConfig, 'loadConfig');
+const getAccountIdSpy = vi.spyOn(cliConfig, 'getAccountId');
+const configFileExistsSpy = vi.spyOn(cliConfig, 'configFileExists');
+const getConfigPathSpy = vi.spyOn(cliConfig, 'getConfigPath');
+const validateConfigSpy = vi.spyOn(cliConfig, 'validateConfig');
+const processExitSpy = vi.spyOn(process, 'exit');
 describe('lib/middleware/configMiddleware', () => {
     beforeEach(() => {
         processExitSpy.mockImplementation(code => {
@@ -73,8 +38,8 @@ describe('lib/middleware/configMiddleware', () => {
                 useEnv: true,
                 $0: 'hs',
             };
-            (0, configMiddleware_1.handleDeprecatedEnvVariables)(argv);
-            expect(logger_1.logger.log).toHaveBeenCalledWith(expect.stringContaining('The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead.'));
+            handleDeprecatedEnvVariables(argv);
+            expect(logger.log).toHaveBeenCalledWith(expect.stringContaining('The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead.'));
             expect(process.env.HUBSPOT_ACCOUNT_ID).toBe('123');
             process.env = originalEnv;
         });
@@ -90,8 +55,8 @@ describe('lib/middleware/configMiddleware', () => {
                 useEnv: true,
                 $0: 'hs',
             };
-            (0, configMiddleware_1.handleDeprecatedEnvVariables)(argv);
-            expect(logger_1.logger.log).not.toHaveBeenCalled();
+            handleDeprecatedEnvVariables(argv);
+            expect(logger.log).not.toHaveBeenCalled();
             expect(process.env.HUBSPOT_ACCOUNT_ID).toBe('456');
             process.env = originalEnv;
         });
@@ -108,7 +73,7 @@ describe('lib/middleware/configMiddleware', () => {
                 useEnv: true,
                 $0: 'hs',
             };
-            await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
+            await injectAccountIdMiddleware(argv);
             expect(argv.userProvidedAccount).toBeUndefined();
             expect(argv.derivedAccountId).toBe(123);
             expect(getAccountIdSpy).not.toHaveBeenCalled();
@@ -122,7 +87,7 @@ describe('lib/middleware/configMiddleware', () => {
                 useEnv: false,
                 $0: 'hs',
             };
-            await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
+            await injectAccountIdMiddleware(argv);
             expect(argv.userProvidedAccount).toBe('test-account');
             expect(argv.derivedAccountId).toBe(456);
             expect(getAccountIdSpy).toHaveBeenCalledWith('test-account');
@@ -136,9 +101,9 @@ describe('lib/middleware/configMiddleware', () => {
                 config: 'custom-config.json',
                 $0: 'hs',
             };
-            await expect((0, configMiddleware_1.loadConfigMiddleware)(argv)).rejects.toThrow();
-            expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
-            expect(logger_1.logger.error).toHaveBeenCalledWith('A configuration file already exists at /path/to/config. To specify a new configuration file, delete the existing one and try again.');
+            await expect(loadConfigMiddleware(argv)).rejects.toThrow();
+            expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
+            expect(logger.error).toHaveBeenCalledWith('A configuration file already exists at /path/to/config. To specify a new configuration file, delete the existing one and try again.');
         });
         it('should load config and validate for non-init commands', async () => {
             configFileExistsSpy.mockReturnValue(false);
@@ -148,7 +113,7 @@ describe('lib/middleware/configMiddleware', () => {
                 _: ['some-command'],
                 $0: 'hs',
             };
-            await (0, configMiddleware_1.loadConfigMiddleware)(argv);
+            await loadConfigMiddleware(argv);
             expect(loadConfigSpy).toHaveBeenCalled();
             expect(validateConfigSpy).toHaveBeenCalled();
         });
@@ -158,7 +123,7 @@ describe('lib/middleware/configMiddleware', () => {
                 _: ['init'],
                 $0: 'hs',
             };
-            await (0, configMiddleware_1.loadConfigMiddleware)(argv);
+            await loadConfigMiddleware(argv);
             expect(loadConfigSpy).not.toHaveBeenCalled();
             expect(validateConfigSpy).not.toHaveBeenCalled();
         });
@@ -170,7 +135,7 @@ describe('lib/middleware/configMiddleware', () => {
                 _: ['some-command'],
                 $0: 'hs',
             };
-            await (0, configMiddleware_1.validateAccountOptions)(argv);
+            await validateAccountOptions(argv);
             expect(validateAccountSpy).toHaveBeenCalledWith(argv);
         });
         it('should skip validation for init command', async () => {
@@ -178,7 +143,7 @@ describe('lib/middleware/configMiddleware', () => {
                 _: ['init'],
                 $0: 'hs',
             };
-            await (0, configMiddleware_1.validateAccountOptions)(argv);
+            await validateAccountOptions(argv);
             expect(validateAccountSpy).not.toHaveBeenCalled();
         });
         it('should exit with error when account validation fails', async () => {
@@ -187,8 +152,8 @@ describe('lib/middleware/configMiddleware', () => {
                 _: ['some-command'],
                 $0: 'hs',
             };
-            await expect((0, configMiddleware_1.validateAccountOptions)(argv)).rejects.toThrow();
-            expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
+            await expect(validateAccountOptions(argv)).rejects.toThrow();
+            expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
     });
 });

package/lib/middleware/__test__/gitMiddleware.test.js

@@ -1,55 +1,20 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const config = __importStar(require("@hubspot/local-dev-lib/config"));
-const gitUI = __importStar(require("../../ui/git"));
-const gitMiddleware_1 = require("../gitMiddleware");
-jest.mock('@hubspot/local-dev-lib/config');
-jest.mock('../../ui/git');
-const getConfigPathSpy = jest.spyOn(config, 'getConfigPath');
-const checkAndWarnGitInclusionSpy = jest.spyOn(gitUI, 'checkAndWarnGitInclusion');
+import * as config from '@hubspot/local-dev-lib/config';
+import * as gitUI from '../../ui/git.js';
+import { checkAndWarnGitInclusionMiddleware } from '../gitMiddleware.js';
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../ui/git');
+const getConfigPathSpy = vi.spyOn(config, 'getConfigPath');
+const checkAndWarnGitInclusionSpy = vi.spyOn(gitUI, 'checkAndWarnGitInclusion');
 describe('lib/middleware/gitMiddleware', () => {
     describe('checkAndWarnGitInclusionMiddleware()', () => {
         it('should call checkAndWarnGitInclusion when command is provided and config path exists', () => {
-            const mockConfigPath = '/path/to/config';
+            const mockConfigPath = '/path/to/config.js';
             getConfigPathSpy.mockReturnValue(mockConfigPath);
             const argv = {
                 _: ['some-command'],
                 $0: 'hs',
             };
-            (0, gitMiddleware_1.checkAndWarnGitInclusionMiddleware)(argv);
+            checkAndWarnGitInclusionMiddleware(argv);
             expect(getConfigPathSpy).toHaveBeenCalledTimes(1);
             expect(checkAndWarnGitInclusionSpy).toHaveBeenCalledWith(mockConfigPath);
         });
@@ -58,7 +23,7 @@ describe('lib/middleware/gitMiddleware', () => {
                 _: [],
                 $0: 'hs',
             };
-            (0, gitMiddleware_1.checkAndWarnGitInclusionMiddleware)(argv);
+            checkAndWarnGitInclusionMiddleware(argv);
             expect(getConfigPathSpy).not.toHaveBeenCalled();
             expect(checkAndWarnGitInclusionSpy).not.toHaveBeenCalled();
         });
@@ -68,7 +33,7 @@ describe('lib/middleware/gitMiddleware', () => {
                 _: ['some-command'],
                 $0: 'hs',
             };
-            (0, gitMiddleware_1.checkAndWarnGitInclusionMiddleware)(argv);
+            checkAndWarnGitInclusionMiddleware(argv);
             expect(getConfigPathSpy).toHaveBeenCalledTimes(1);
             expect(checkAndWarnGitInclusionSpy).not.toHaveBeenCalled();
         });

package/lib/middleware/__test__/notificationsMiddleware.test.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const { notifyAboutUpdates } = require('../notificationsMiddleware');
+import { notifyAboutUpdates } from '../notificationsMiddleware.js';
 describe('lib/middleware/notificationsMiddleware', () => {
     describe('notifyAboutUpdates()', () => {
         it('should safely execute without throwing an error', () => {

package/lib/middleware/__test__/requestMiddleware.test.js

@@ -1,20 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const http_1 = require("@hubspot/local-dev-lib/http");
-const requestMiddleware_1 = require("../requestMiddleware");
-const package_json_1 = __importDefault(require("../../../package.json"));
-jest.mock('@hubspot/local-dev-lib/http', () => ({
-    addUserAgentHeader: jest.fn(),
+import { addUserAgentHeader } from '@hubspot/local-dev-lib/http';
+import { setRequestHeaders } from '../requestMiddleware.js';
+import pkg from '../../../package.json' with { type: 'json' };
+vi.mock('@hubspot/local-dev-lib/http', () => ({
+    addUserAgentHeader: vi.fn(),
 }));
 describe('lib/middleware/requestMiddleware', () => {
     describe('setRequestHeaders()', () => {
         it('should call addUserAgentHeader with correct parameters', () => {
-            (0, requestMiddleware_1.setRequestHeaders)();
-            expect(http_1.addUserAgentHeader).toHaveBeenCalledTimes(1);
-            expect(http_1.addUserAgentHeader).toHaveBeenCalledWith('HubSpot CLI', package_json_1.default.version);
+            setRequestHeaders();
+            expect(addUserAgentHeader).toHaveBeenCalledTimes(1);
+            expect(addUserAgentHeader).toHaveBeenCalledWith('HubSpot CLI', pkg.version);
         });
     });
 });

package/lib/middleware/__test__/utils.test.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../utils");
+import { isTargetedCommand } from '../utils.js';
 const targetCommandMap = {
     init: { target: true },
     account: {
@@ -18,35 +16,35 @@ const targetCommandMap = {
 describe('lib/middleware/utils', () => {
     describe('isTargetedCommand()', () => {
         it('should return true for a direct target command', () => {
-            const result = (0, utils_1.isTargetedCommand)(['init'], targetCommandMap);
+            const result = isTargetedCommand(['init'], targetCommandMap);
             expect(result).toBe(true);
         });
         it('should return true for a command with a subcommand', () => {
-            const result = (0, utils_1.isTargetedCommand)(['account'], targetCommandMap);
+            const result = isTargetedCommand(['account'], targetCommandMap);
             expect(result).toBe(true);
         });
         it('should return true for a nested target command', () => {
-            const result = (0, utils_1.isTargetedCommand)(['project', 'deploy'], targetCommandMap);
+            const result = isTargetedCommand(['project', 'deploy'], targetCommandMap);
             expect(result).toBe(true);
         });
         it('should return false for a non-existent command', () => {
-            const result = (0, utils_1.isTargetedCommand)(['nonexistent'], targetCommandMap);
+            const result = isTargetedCommand(['nonexistent'], targetCommandMap);
             expect(result).toBe(false);
         });
         it('should return false for a non-targeted command', () => {
-            const result = (0, utils_1.isTargetedCommand)(['auth'], targetCommandMap);
+            const result = isTargetedCommand(['auth'], targetCommandMap);
             expect(result).toBe(false);
         });
         it('should return false for a command with a targeted subcommand', () => {
-            const result = (0, utils_1.isTargetedCommand)(['project'], targetCommandMap);
+            const result = isTargetedCommand(['project'], targetCommandMap);
             expect(result).toBe(false);
         });
         it('should return false for a non-existent subcommand', () => {
-            const result = (0, utils_1.isTargetedCommand)(['auth', 'nonexistent'], targetCommandMap);
+            const result = isTargetedCommand(['auth', 'nonexistent'], targetCommandMap);
             expect(result).toBe(false);
         });
         it('should return false for an empty command array', () => {
-            const result = (0, utils_1.isTargetedCommand)([], targetCommandMap);
+            const result = isTargetedCommand([], targetCommandMap);
             expect(result).toBe(false);
         });
     });