@hubspot/cli 7.4.4-beta.0 → 7.4.5-beta.0

package/commands/account/auth.js

@@ -60,49 +60,56 @@ async function updateConfig(env, doesConfigExist, disableTracking, authType, acc
         return null;
     }
 }
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
-exports.command = 'auth';
-async function handler(args) {
-    const { providedAccountId, disableTracking } = args;
-    const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+async function handleConfigMigration(providedAccountId) {
     const deprecatedConfigExists = (0, migrate_1.configFileExists)(false);
     const globalConfigExists = (0, migrate_1.configFileExists)(true);
-    if (deprecatedConfigExists) {
-        if (globalConfigExists) {
-            try {
-                await (0, configMigrate_1.handleMerge)(providedAccountId);
-            }
-            catch (error) {
-                (0, index_2.logError)(error);
-                (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
-                    command: 'hs account auth',
-                    type: 'Merge configs',
-                    successful: false,
-                }, providedAccountId);
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    if (!deprecatedConfigExists) {
+        return true;
+    }
+    if (globalConfigExists) {
+        try {
+            const mergeConfirmed = await (0, configMigrate_1.handleMerge)(providedAccountId);
+            if (!mergeConfirmed) {
+                logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.auth.errors.mergeNotConfirmed', {
+                    authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+                    migrateCommand: (0, ui_1.uiCommandReference)('hs config migrate'),
+                }));
+                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
             }
+            return mergeConfirmed;
         }
-        else {
-            try {
-                await (0, configMigrate_1.handleMigration)(providedAccountId);
-            }
-            catch (error) {
-                (0, index_2.logError)(error);
-                (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
-                    command: 'hs account auth',
-                    type: 'Migrate a single config',
-                    successful: false,
-                }, providedAccountId);
-                process.exit(exitCodes_1.EXIT_CODES.ERROR);
-            }
+        catch (error) {
+            (0, index_2.logError)(error);
+            (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
+                command: 'hs account auth',
+                type: 'Merge configs',
+                successful: false,
+            }, providedAccountId);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
-    if (!disableTracking) {
-        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
-        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
+    try {
+        const migrationConfirmed = await (0, configMigrate_1.handleMigration)(providedAccountId);
+        if (!migrationConfirmed) {
+            logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.auth.errors.migrationNotConfirmed', {
+                authCommand: (0, ui_1.uiCommandReference)('hs auth'),
+                deprecatedConfigPath: (0, migrate_1.getConfigPath)('', false),
+            }));
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        return migrationConfirmed;
     }
-    const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
-    const configAlreadyExists = (0, migrate_1.configFileExists)(true);
+    catch (error) {
+        (0, index_2.logError)(error);
+        (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
+            command: 'hs account auth',
+            type: 'Migrate a single config',
+            successful: false,
+        }, providedAccountId);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+async function handleConfigUpdate(env, configAlreadyExists, disableTracking, authType, providedAccountId) {
     if (!configAlreadyExists) {
         (0, config_1.createEmptyConfigFile)({}, true);
     }
@@ -115,14 +122,13 @@ async function handler(args) {
     }
     const { name } = updatedConfig;
     const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(updatedConfig);
-    // If the config file was just created, we don't need to prompt the user to set as default
     if (!configAlreadyExists) {
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileCreated', {
-            configPath: (0, config_1.getConfigPath)('', true),
+            configPath: (0, migrate_1.getConfigPath)('', true),
         }));
         logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileUpdated', {
-            account: name || accountId || '',
+            account: name || accountId?.toString() || '',
         }));
     }
     else {
@@ -149,6 +155,20 @@ async function handler(args) {
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
+exports.command = 'auth';
+async function handler(args) {
+    const { providedAccountId, disableTracking } = args;
+    const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    await handleConfigMigration(providedAccountId);
+    if (!disableTracking) {
+        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
+    }
+    const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
+    const configAlreadyExists = (0, migrate_1.configFileExists)(true);
+    await handleConfigUpdate(env, configAlreadyExists, disableTracking, authType, providedAccountId);
+}
 function builder(yargs) {
     yargs.options({
         account: {

package/commands/app/migrate.js

@@ -13,7 +13,7 @@ const exitCodes_1 = require("../../lib/enums/exitCodes");
 const migrate_1 = require("../../lib/app/migrate");
 const ui_1 = require("../../lib/ui");
 const migrate_legacy_1 = require("../../lib/app/migrate_legacy");
-const projects_2 = require("../../lib/projects");
+const config_2 = require("../../lib/projects/config");
 const { v2023_2, v2025_2 } = projects_1.PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = undefined; // uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text.describe`), false);
@@ -31,7 +31,7 @@ async function handler(options) {
     logger_1.logger.log('');
     try {
         if (platformVersion === v2025_2 || unstable) {
-            if ((0, projects_2.getIsInProject)()) {
+            if ((0, config_2.getIsInProject)()) {
                 logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.notAllowedWithinProject`, { command: (0, ui_1.uiCommandReference)('hs project migrate') }));
                 return process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }

package/commands/create/website-theme.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
-const { getIsInProject } = require('../../lib/projects');
+const { getIsInProject } = require('../../lib/projects/config');
 const PROJECT_BOILERPLATE_BRANCH = 'cms-boilerplate-developer-projects';
 module.exports = {
     dest: ({ name, assetType }) => name || assetType,

package/commands/project/add.js

@@ -12,7 +12,7 @@ const errorHandlers_1 = require("../../lib/errorHandlers");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const projectAddPrompt_1 = require("../../lib/prompts/projectAddPrompt");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const create_1 = require("../../lib/projects/create");
 const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
@@ -25,7 +25,7 @@ exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcom
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-add', undefined, derivedAccountId);
-    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
     if (!projectDir || !projectConfig) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.locationInProject`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);

package/commands/project/cloneApp.js

@@ -17,13 +17,13 @@ const ui_2 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const accountTypes_1 = require("../../lib/accountTypes");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const constants_1 = require("../../lib/constants");
-const projects_2 = require("@hubspot/local-dev-lib/api/projects");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const archive_1 = require("@hubspot/local-dev-lib/archive");
-const config_1 = require("@hubspot/local-dev-lib/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const migrate_1 = require("../../lib/app/migrate");
 exports.command = 'clone-app';
@@ -32,7 +32,7 @@ exports.deprecated = true;
 const handler = async (options) => {
     const { derivedAccountId } = options;
     await (0, usageTracking_1.trackCommandUsage)('clone-app', {}, derivedAccountId);
-    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
+    const accountConfig = (0, config_2.getAccountConfig)(derivedAccountId);
     const accountName = (0, ui_2.uiAccountDescription)(derivedAccountId);
     if (!accountConfig) {
         throw new Error((0, lang_1.i18n)(`commands.projects.subcommands.cloneApp.errors.noAccountConfig`));
@@ -69,15 +69,15 @@ const handler = async (options) => {
         SpinniesManager_1.default.add('cloneApp', {
             text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.inProgress`),
         });
-        const { data: { exportId }, } = await (0, projects_2.cloneApp)(derivedAccountId, appId);
-        const { status } = await (0, polling_1.poll)(() => (0, projects_2.checkCloneStatus)(derivedAccountId, exportId));
+        const { data: { exportId }, } = await (0, projects_1.cloneApp)(derivedAccountId, appId);
+        const { status } = await (0, polling_1.poll)(() => (0, projects_1.checkCloneStatus)(derivedAccountId, exportId));
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
             const baseDestPath = path_1.default.resolve((0, path_2.getCwd)(), projectDest);
             const absoluteDestPath = path_1.default.resolve(baseDestPath, 'src', 'app');
             fs_1.default.mkdirSync(absoluteDestPath, { recursive: true });
             // Extract zipped app files and place them in correct directory
-            const { data: zippedApp } = await (0, projects_2.downloadClonedProject)(derivedAccountId, exportId);
+            const { data: zippedApp } = await (0, projects_1.downloadClonedProject)(derivedAccountId, exportId);
             await (0, archive_1.extractZipArchive)(zippedApp, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
                 includesRootDir: true,
                 hideLogs: true,
@@ -89,7 +89,7 @@ const handler = async (options) => {
                 srcDir: 'src',
                 platformVersion: '2023.2',
             };
-            const success = (0, projects_1.writeProjectConfig)(configPath, configContent);
+            const success = (0, config_1.writeProjectConfig)(configPath, configContent);
             SpinniesManager_1.default.succeed('cloneApp', {
                 text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.done`),
                 succeedColor: 'white',

package/commands/project/create.js

@@ -10,7 +10,7 @@ const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { createProjectPrompt, } = require('../../lib/prompts/createProjectPrompt');
-const { writeProjectConfig, getProjectConfig } = require('../../lib/projects');
+const { writeProjectConfig, getProjectConfig, } = require('../../lib/projects/config');
 const { getProjectTemplateListFromRepo, EMPTY_PROJECT_TEMPLATE_NAME, } = require('../../lib/projects/create');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');

package/commands/project/deploy.js

@@ -13,7 +13,7 @@ const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
 const usageTracking_1 = require("../../lib/usageTracking");
 const index_2 = require("../../lib/errorHandlers/index");
-const projects_2 = require("../../lib/projects");
+const config_2 = require("../../lib/projects/config");
 const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
 const urls_1 = require("../../lib/projects/urls");
 const projectNamePrompt_1 = require("../../lib/prompts/projectNamePrompt");
@@ -47,7 +47,7 @@ async function handler(args) {
     const { project: projectOption, buildId: buildIdOption } = args;
     const accountType = accountConfig && accountConfig.accountType;
     (0, usageTracking_1.trackCommandUsage)('project-deploy', accountType ? { type: accountType } : undefined, derivedAccountId);
-    const { projectConfig } = await (0, projects_2.getProjectConfig)();
+    const { projectConfig } = await (0, config_2.getProjectConfig)();
     let projectName = projectOption;
     if (!projectOption && projectConfig) {
         projectName = projectConfig.name;

package/commands/project/dev/deprecatedFlow.js

@@ -13,11 +13,11 @@ const lang_1 = require("../../../lib/lang");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const ui_1 = require("../../../lib/ui");
 const SpinniesManager_1 = __importDefault(require("../../../lib/ui/SpinniesManager"));
-const LocalDevManager_1 = __importDefault(require("../../../lib/LocalDevManager"));
-const localDev_1 = require("../../../lib/localDev");
+const LocalDevManager_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevManager"));
+const helpers_1 = require("../../../lib/projects/localDev/helpers");
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
-const projects_1 = require("../../../lib/projects");
+const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
 async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
     const { providedAccountId, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
@@ -52,7 +52,7 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         bypassRecommendedAccountPrompt = true;
     }
     else if (!hasPublicApps) {
-        const defaultAccountHasSandboxes = await (0, localDev_1.hasSandboxes)(accountConfig);
+        const defaultAccountHasSandboxes = await (0, helpers_1.hasSandboxes)(accountConfig);
         bypassRecommendedAccountPrompt = !defaultAccountHasSandboxes;
     }
     // targetProjectAccountId and targetTestingAccountId are set to null if --account flag is not provided.
@@ -62,20 +62,20 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     let targetTestingAccountId = providedAccountId ? derivedAccountId : null;
     // Check that the default account or flag option is valid for the type of app in this project
     if (providedAccountId) {
-        (0, localDev_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
+        (0, helpers_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             targetProjectAccountId = accountConfig.parentAccountId || null;
         }
     }
     else {
-        await (0, localDev_1.checkIfDefaultAccountIsSupported)(accountConfig, hasPublicApps);
+        await (0, helpers_1.checkIfDefaultAccountIsSupported)(accountConfig, hasPublicApps);
     }
     // The user is targeting an account type that we recommend developing on
     if (!targetProjectAccountId && bypassRecommendedAccountPrompt) {
         targetTestingAccountId = derivedAccountId;
-        await (0, localDev_1.confirmDefaultAccountIsTarget)(accountConfig);
+        await (0, helpers_1.confirmDefaultAccountIsTarget)(accountConfig);
         if (hasPublicApps) {
-            (0, localDev_1.checkIfParentAccountIsAuthed)(accountConfig);
+            (0, helpers_1.checkIfParentAccountIsAuthed)(accountConfig);
             targetProjectAccountId = accountConfig.parentAccountId || null;
         }
         else {
@@ -85,25 +85,25 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     let createNewSandbox = false;
     let createNewDeveloperTestAccount = false;
     if (!targetProjectAccountId) {
-        const { targetAccountId, parentAccountId, createNestedAccount, notInConfigAccount, } = await (0, localDev_1.suggestRecommendedNestedAccount)(accounts, accountConfig, hasPublicApps);
+        const { targetAccountId, parentAccountId, createNestedAccount, notInConfigAccount, } = await (0, helpers_1.suggestRecommendedNestedAccount)(accounts, accountConfig, hasPublicApps);
         targetProjectAccountId = hasPublicApps
             ? parentAccountId || null
             : targetAccountId;
         targetTestingAccountId = targetAccountId;
         // Only used for developer test accounts that are not yet in the config
         if (notInConfigAccount) {
-            await (0, localDev_1.useExistingDevTestAccount)(env, notInConfigAccount);
+            await (0, helpers_1.useExistingDevTestAccount)(env, notInConfigAccount);
         }
         createNewSandbox = hasPrivateApps && createNestedAccount;
         createNewDeveloperTestAccount = hasPublicApps && createNestedAccount;
     }
     if (createNewSandbox) {
-        targetProjectAccountId = await (0, localDev_1.createSandboxForLocalDev)(derivedAccountId, accountConfig, env);
+        targetProjectAccountId = await (0, helpers_1.createSandboxForLocalDev)(derivedAccountId, accountConfig, env);
         // We will be running our tests against this new sandbox account
         targetTestingAccountId = targetProjectAccountId;
     }
     if (createNewDeveloperTestAccount) {
-        targetTestingAccountId = await (0, localDev_1.createDeveloperTestAccountForLocalDev)(derivedAccountId, accountConfig, env);
+        targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(derivedAccountId, accountConfig, env);
         targetProjectAccountId = derivedAccountId;
     }
     if (!targetProjectAccountId || !targetTestingAccountId) {
@@ -111,7 +111,7 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     // eslint-disable-next-line prefer-const
-    let { projectExists, project } = await (0, projects_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
+    let { projectExists, project } = await (0, ensureProjectExists_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
         allowCreate: false,
         noLogs: true,
         withPolling: createNewSandbox,
@@ -124,8 +124,8 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         isGithubLinked = Boolean(project.sourceIntegration && project.sourceIntegration.source === 'GITHUB');
     }
     else {
-        project = await (0, localDev_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, createNewSandbox, hasPublicApps);
-        deployedBuild = await (0, localDev_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId);
+        project = await (0, helpers_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, createNewSandbox, hasPublicApps);
+        deployedBuild = await (0, helpers_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId);
     }
     const LocalDev = new LocalDevManager_1.default({
         runnableComponents,

package/commands/project/dev/index.js

@@ -8,7 +8,7 @@ const usageTracking_1 = require("../../../lib/usageTracking");
 const lang_1 = require("../../../lib/lang");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
-const projects_1 = require("../../../lib/projects");
+const config_2 = require("../../../lib/projects/config");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const ui_1 = require("../../../lib/ui");
 const deprecatedFlow_1 = require("./deprecatedFlow");
@@ -20,7 +20,7 @@ async function handler(args) {
     const { derivedAccountId } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     (0, usageTracking_1.trackCommandUsage)('project-dev', {}, derivedAccountId);
-    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
+    const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.betaMessage`));
     logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.learnMoreLocalDevServer`), 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
     if (!projectConfig || !projectDir) {
@@ -34,7 +34,7 @@ async function handler(args) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccount`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    (0, projects_1.validateProjectConfig)(projectConfig, projectDir);
+    (0, config_2.validateProjectConfig)(projectConfig, projectDir);
     if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
         await (0, unifiedFlow_1.unifiedProjectDevFlow)(args, accountConfig, projectConfig, projectDir);
     }

package/commands/project/dev/unifiedFlow.js

@@ -13,11 +13,11 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const environment_1 = require("@hubspot/local-dev-lib/environment");
 const errorHandlers_1 = require("../../../lib/errorHandlers");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
-const projects_1 = require("../../../lib/projects");
-const localDev_1 = require("../../../lib/localDev");
+const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
+const helpers_1 = require("../../../lib/projects/localDev/helpers");
 const projectDevTargetAccountPrompt_1 = require("../../../lib/prompts/projectDevTargetAccountPrompt");
 const SpinniesManager_1 = __importDefault(require("../../../lib/ui/SpinniesManager"));
-const LocalDevManagerV2_1 = __importDefault(require("../../../lib/LocalDevManagerV2"));
+const LocalDevManagerV2_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevManagerV2"));
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ui_1 = require("../../../lib/ui");
@@ -71,14 +71,14 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
     if (!!devAccountPromptResponse.notInConfigAccount) {
         // When the developer test account isn't configured in the CLI config yet
         // Walk the user through adding the account's PAK to the config
-        await (0, localDev_1.useExistingDevTestAccount)(env, devAccountPromptResponse.notInConfigAccount);
+        await (0, helpers_1.useExistingDevTestAccount)(env, devAccountPromptResponse.notInConfigAccount);
     }
     else if (devAccountPromptResponse.createNestedAccount) {
         // Create a new developer test account and automatically add it to the CLI config
-        targetTestingAccountId = await (0, localDev_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, accountConfig, env);
+        targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, accountConfig, env);
     }
     // Check if project exists in HubSpot
-    const { projectExists, project: uploadedProject } = await (0, projects_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
+    const { projectExists, project: uploadedProject } = await (0, ensureProjectExists_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
         allowCreate: false,
         noLogs: true,
     });
@@ -91,8 +91,8 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
         isGithubLinked = Boolean(project.sourceIntegration && project.sourceIntegration.source === 'GITHUB');
     }
     else {
-        project = await (0, localDev_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, false, false);
-        deployedBuild = await (0, localDev_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId, true);
+        project = await (0, helpers_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, false, false);
+        deployedBuild = await (0, helpers_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId, true);
     }
     const LocalDev = new LocalDevManagerV2_1.default({
         projectNodes,

package/commands/project/download.js

@@ -11,7 +11,7 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const archive_1 = require("@hubspot/local-dev-lib/archive");
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const index_1 = require("../../lib/errorHandlers/index");
-const projects_2 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const downloadProjectPrompt_1 = require("../../lib/prompts/downloadProjectPrompt");
 const lang_1 = require("../../lib/lang");
 const ui_1 = require("../../lib/ui");
@@ -21,7 +21,7 @@ const yargsUtils_1 = require("../../lib/yargsUtils");
 exports.command = 'download';
 exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.download.describe`), false);
 async function handler(args) {
-    const { projectConfig } = await (0, projects_2.getProjectConfig)();
+    const { projectConfig } = await (0, config_1.getProjectConfig)();
     if (projectConfig) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.download.warnings.cannotDownloadWithinProject`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);

package/commands/project/installDeps.js

@@ -8,7 +8,7 @@ exports.handler = handler;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const dependencyManagement_1 = require("../../lib/dependencyManagement");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const path_1 = __importDefault(require("path"));
 const lang_1 = require("../../lib/lang");
@@ -22,7 +22,7 @@ async function handler(args) {
     const { derivedAccountId, packages } = args;
     try {
         (0, usageTracking_1.trackCommandUsage)('project-install-deps', undefined, derivedAccountId);
-        const projectConfig = await (0, projects_1.getProjectConfig)();
+        const projectConfig = await (0, config_1.getProjectConfig)();
         if (!projectConfig || !projectConfig.projectDir) {
             logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noProjectConfig`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);

package/commands/project/listBuilds.js

@@ -11,7 +11,7 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const table_1 = require("../../lib/ui/table");
 const ui_1 = require("../../lib/ui");
-const projects_2 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const urls_1 = require("../../lib/projects/urls");
 const moment_1 = __importDefault(require("moment"));
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
@@ -82,8 +82,8 @@ async function handler(args) {
     (0, usageTracking_1.trackCommandUsage)('project-list-builds', undefined, derivedAccountId);
     let projectName = projectFlagValue;
     if (!projectName) {
-        const { projectConfig, projectDir } = await (0, projects_2.getProjectConfig)();
-        (0, projects_2.validateProjectConfig)(projectConfig, projectDir);
+        const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+        (0, config_1.validateProjectConfig)(projectConfig, projectDir);
         projectName = projectConfig.name;
     }
     try {

package/commands/project/migrate.js

@@ -6,18 +6,18 @@ exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const commonOpts_1 = require("../../lib/commonOpts");
 const migrate_1 = require("../../lib/app/migrate");
-const projects_1 = require("../../lib/projects");
-const projects_2 = require("@hubspot/local-dev-lib/constants/projects");
+const config_1 = require("../../lib/projects/config");
+const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_1 = require("../../lib/ui");
 const en_1 = require("../../lang/en");
-const { v2025_2 } = projects_2.PLATFORM_VERSIONS;
+const { v2025_2 } = projects_1.PLATFORM_VERSIONS;
 exports.command = 'migrate';
 exports.describe = undefined;
 async function handler(options) {
     const { platformVersion, unstable } = options;
-    const projectConfig = await (0, projects_1.getProjectConfig)();
+    const projectConfig = await (0, config_1.getProjectConfig)();
     if (!projectConfig.projectConfig) {
         logger_1.logger.error(en_1.commands.project.migrate.errors.noProjectConfig((0, ui_1.uiCommandReference)('hs app migrate')));
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -30,7 +30,7 @@ async function handler(options) {
             ...options,
             name: projectConfig?.projectConfig?.name,
             platformVersion: unstable
-                ? projects_2.PLATFORM_VERSIONS.unstable
+                ? projects_1.PLATFORM_VERSIONS.unstable
                 : platformVersion,
         }, projectConfig);
     }

package/commands/project/open.js

@@ -11,7 +11,8 @@ const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
+const ensureProjectExists_1 = require("../../lib/projects/ensureProjectExists");
 const urls_1 = require("../../lib/projects/urls");
 const projectNamePrompt_1 = require("../../lib/prompts/projectNamePrompt");
 const ui_1 = require("../../lib/ui");
@@ -21,10 +22,10 @@ exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcom
 async function handler(args) {
     const { project, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-open', undefined, derivedAccountId);
-    const { projectConfig } = await (0, projects_1.getProjectConfig)();
+    const { projectConfig } = await (0, config_1.getProjectConfig)();
     let projectName = project;
     if (projectName) {
-        const { projectExists } = await (0, projects_1.ensureProjectExists)(derivedAccountId, projectName, {
+        const { projectExists } = await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectName, {
             allowCreate: false,
         });
         if (!projectExists) {

package/commands/project/upload.js

@@ -12,7 +12,9 @@ const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
 const ui_1 = require("../../lib/ui");
 const usageTracking_1 = require("../../lib/usageTracking");
-const projects_1 = require("../../lib/projects");
+const config_2 = require("../../lib/projects/config");
+const ensureProjectExists_1 = require("../../lib/projects/ensureProjectExists");
+const ui_2 = require("../../lib/projects/ui");
 const upload_1 = require("../../lib/projects/upload");
 const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
 const lang_1 = require("../../lib/lang");
@@ -26,10 +28,10 @@ async function handler(args) {
     const { forceCreate, message, derivedAccountId, skipValidation } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
+    const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, usageTracking_1.trackCommandUsage)('project-upload', { type: accountType }, derivedAccountId);
-    (0, projects_1.validateProjectConfig)(projectConfig, projectDir);
-    await (0, projects_1.ensureProjectExists)(derivedAccountId, projectConfig.name, {
+    (0, config_2.validateProjectConfig)(projectConfig, projectDir);
+    await (0, ensureProjectExists_1.ensureProjectExists)(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
@@ -58,7 +60,7 @@ async function handler(args) {
             logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.upload.logs.autoDeployDisabled`, {
                 deployCommand: (0, ui_1.uiCommandReference)(`hs project deploy --build=${result.buildId}`),
             }));
-            (0, projects_1.logFeedbackMessage)(result.buildId);
+            (0, ui_2.logFeedbackMessage)(result.buildId);
             await (0, buildAndDeploy_2.displayWarnLogs)(derivedAccountId, projectConfig.name, result.buildId);
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }

package/commands/project/watch.js

@@ -12,7 +12,9 @@ const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
 const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiBetaTag } = require('../../lib/ui');
-const { ensureProjectExists, getProjectConfig, validateProjectConfig, logFeedbackMessage, } = require('../../lib/projects');
+const { getProjectConfig, validateProjectConfig, } = require('../../lib/projects/config');
+const { ensureProjectExists, } = require('../../lib/projects/ensureProjectExists');
+const { logFeedbackMessage } = require('../../lib/projects/ui');
 const { handleProjectUpload } = require('../../lib/projects/upload');
 const { pollBuildStatus, pollDeployStatus, } = require('../../lib/projects/buildAndDeploy');
 const { cancelStagedBuild, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');

package/commands/theme/preview.js

@@ -22,7 +22,7 @@ const previewPrompt_1 = require("../../lib/prompts/previewPrompt");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
 const process_1 = require("../../lib/process");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
 const hasFeature_1 = require("../../lib/hasFeature");
@@ -63,7 +63,7 @@ function handleUserInput() {
 async function determineSrcAndDest(args) {
     let absoluteSrc;
     let dest;
-    const { projectDir, projectConfig } = await (0, projects_1.getProjectConfig)();
+    const { projectDir, projectConfig } = await (0, config_1.getProjectConfig)();
     if (!(projectDir && projectConfig)) {
         // Not in a project, prompt for src and dest of traditional theme
         const previewPromptAnswers = await (0, previewPrompt_1.previewPrompt)(args);