@hubspot/cli 8.14.0-beta.1 → 8.15.0-beta.0

package/commands/project/listBuilds.js

@@ -1,7 +1,7 @@
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { fetchProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { uiLink } from '../../lib/ui/index.js';
-import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import moment from 'moment';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
@@ -13,7 +13,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { renderTable } from '../../ui/render.js';
-import { ProjectBuildsListSchema, mapBuildToJsonOutput, } from '../../lib/jsonOutput.js';
+import { ProjectBuildsListSchema, mapBuildToJsonOutput, } from '../../lib/jsonOutput/listBuilds.js';
 const command = 'list-builds';
 const describe = commands.project.listBuilds.describe;
 async function fetchAndDisplayBuilds(accountId, project, options) {
@@ -66,18 +66,14 @@ async function handler(args) {
     const { project: projectFlagValue, limit, derivedAccountId, exit, json: formatOutputAsJson, addJsonOutput, } = args;
     let projectName = projectFlagValue;
     if (!projectName) {
-        const { projectConfig, projectDir } = await getProjectConfig();
         try {
-            validateProjectConfig(projectConfig, projectDir);
+            const { projectConfig } = getProjectConfig();
+            projectName = projectConfig.name;
         }
         catch (error) {
             logError(error);
             return exit(EXIT_CODES.ERROR);
         }
-        if (!projectConfig) {
-            return exit(EXIT_CODES.ERROR);
-        }
-        projectName = projectConfig.name;
     }
     try {
         const { data: project } = await fetchProject(derivedAccountId, projectName);

package/commands/project/migrate.js

@@ -19,19 +19,21 @@ const command = 'migrate';
 const describe = commands.project.migrate.describe;
 async function handler(args) {
     const { platformVersion, unstable, derivedAccountId, exit } = args;
-    const projectConfig = await getProjectConfig();
-    if (!projectConfig.projectConfig) {
+    let projectConfig;
+    let projectDir;
+    try {
+        ({ projectConfig, projectDir } = getProjectConfig());
+    }
+    catch {
         uiLogger.error(commands.project.migrate.errors.noProjectConfig(uiCommandReference('hs app migrate')));
         return exit(EXIT_CODES.ERROR);
     }
-    if (projectConfig?.projectConfig) {
-        await renderInline(getWarningBox({
-            title: lib.migrate.projectMigrationWarningTitle(platformVersion),
-            message: lib.migrate.projectMigrationWarning(platformVersion),
-        }));
-    }
+    await renderInline(getWarningBox({
+        title: lib.migrate.projectMigrationWarningTitle(platformVersion),
+        message: lib.migrate.projectMigrationWarning(platformVersion),
+    }));
     try {
-        const { hasMigratableThemes, migratableThemesCount } = await getHasMigratableThemes(projectConfig);
+        const { hasMigratableThemes, migratableThemesCount } = await getHasMigratableThemes({ projectConfig, projectDir });
         if (hasMigratableThemes) {
             const hasThemeMigrationAccess = await hasFeature(derivedAccountId, FEATURES.THEME_MIGRATION_2025_2);
             if (!hasThemeMigrationAccess) {
@@ -43,16 +45,16 @@ async function handler(args) {
                 platformVersion: unstable
                     ? PLATFORM_VERSIONS.UNSTABLE
                     : platformVersion,
-            }, migratableThemesCount, projectConfig);
+            }, migratableThemesCount, { projectConfig, projectDir });
         }
         else {
             await migrateApp(derivedAccountId, {
                 ...args,
-                name: projectConfig?.projectConfig?.name,
+                name: projectConfig.name,
                 platformVersion: unstable
                     ? PLATFORM_VERSIONS.UNSTABLE
                     : platformVersion,
-            }, projectConfig);
+            }, { projectConfig, projectDir });
         }
     }
     catch (error) {

package/commands/project/open.js

@@ -12,7 +12,6 @@ const command = 'open';
 const describe = commands.project.open.describe;
 async function handler(args) {
     const { project, derivedAccountId, exit } = args;
-    const { projectConfig } = await getProjectConfig();
     let projectName = project;
     if (projectName) {
         const { projectExists } = await ensureProjectExists(derivedAccountId, projectName, {
@@ -22,12 +21,21 @@ async function handler(args) {
             return exit(EXIT_CODES.ERROR);
         }
     }
-    else if (!projectName && projectConfig) {
-        projectName = projectConfig.name;
-    }
-    else if (!projectName && !projectConfig) {
-        const namePromptResponse = await projectNamePrompt(derivedAccountId);
-        projectName = namePromptResponse.projectName;
+    else if (!projectName) {
+        let projectConfig;
+        try {
+            ({ projectConfig } = getProjectConfig());
+        }
+        catch {
+            // Not in a project directory, fall through to prompt
+        }
+        if (projectConfig) {
+            projectName = projectConfig.name;
+        }
+        else {
+            const namePromptResponse = await projectNamePrompt(derivedAccountId);
+            projectName = namePromptResponse.projectName;
+        }
     }
     const url = getProjectDetailUrl(projectName, derivedAccountId);
     open(url, { url: true });

package/commands/project/profile/add.js

@@ -12,7 +12,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { commands } from '../../../lang/en.js';
 import { promptUser, listPrompt, confirmPrompt, } from '../../../lib/prompts/promptUtils.js';
 import { fileExists } from '../../../lib/validation.js';
-import { debugError } from '../../../lib/errorHandlers/index.js';
+import { debugError, logError } from '../../../lib/errorHandlers/index.js';
 const command = 'add [name]';
 const describe = commands.project.profile.add.describe;
 const verboseDescribe = commands.project.profile.add.verboseDescribe;
@@ -52,9 +52,13 @@ async function selectProfileToCopyVariablesFrom(existingProfiles) {
 }
 async function handler(args) {
     const { exit } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig || !projectDir) {
-        uiLogger.error(commands.project.profile.add.errors.noProjectConfig);
+    let projectConfig;
+    let projectDir;
+    try {
+        ({ projectConfig, projectDir } = getProjectConfig());
+    }
+    catch (error) {
+        logError(error);
         return exit(EXIT_CODES.ERROR);
     }
     if (isLegacyProject(projectConfig.platformVersion)) {

package/commands/project/profile/delete.js

@@ -12,15 +12,19 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { commands } from '../../../lang/en.js';
 import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { fileExists } from '../../../lib/validation.js';
-import { debugError } from '../../../lib/errorHandlers/index.js';
+import { debugError, logError } from '../../../lib/errorHandlers/index.js';
 import { isDeveloperTestAccount, isSandbox, } from '../../../lib/accountTypes.js';
 const command = 'delete [name]';
 const describe = commands.project.profile.delete.describe;
 async function handler(args) {
     const { exit } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig || !projectDir) {
-        uiLogger.error(commands.project.profile.delete.errors.noProjectConfig);
+    let projectConfig;
+    let projectDir;
+    try {
+        ({ projectConfig, projectDir } = getProjectConfig());
+    }
+    catch (error) {
+        logError(error);
         return exit(EXIT_CODES.ERROR);
     }
     if (isLegacyProject(projectConfig.platformVersion)) {

package/commands/project/release/create.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../../types/Yargs.js';
-import { ReleaseJsonOutput } from '../../../lib/jsonOutput.js';
+import { ReleaseJsonOutput } from '../../../lib/jsonOutput/release.js';
 export type ProjectReleaseCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<ReleaseJsonOutput> & {
     build?: number;
     force: boolean;

package/commands/project/release/create.js

@@ -3,14 +3,14 @@ import { pollProjectBuildAndDeploy } from '../../../lib/projects/pollProjectBuil
 import { resolveBuildId, validateBuildForRelease, executeRelease, } from '../../../lib/projects/release.js';
 import { logError, ApiErrorContext } from '../../../lib/errorHandlers/index.js';
 import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
-import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
 import { confirmPrompt } from '../../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { commands } from '../../../lang/en.js';
 import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
-import { ReleaseSchema, mapReleaseToJsonOutput, } from '../../../lib/jsonOutput.js';
+import { ReleaseSchema, mapReleaseToJsonOutput, } from '../../../lib/jsonOutput/release.js';
 const command = 'create';
 // const describe = commands.project.release.create.describe;
 const describe = undefined;
@@ -27,17 +27,15 @@ function logUploadError(error, accountId) {
 }
 async function handler(args) {
     const { exit, derivedAccountId, build: buildOption, json: formatOutputAsJson, force, addJsonOutput, } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
+    let projectConfig;
+    let projectDir;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig, projectDir } = getProjectConfig());
     }
     catch (error) {
         logError(error);
         return exit(EXIT_CODES.ERROR);
     }
-    if (!projectConfig || !projectDir) {
-        return exit(EXIT_CODES.ERROR);
-    }
     const projectName = projectConfig.name;
     let buildId;
     try {

package/commands/project/release/info.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../../types/Yargs.js';
-import { ReleaseJsonOutput } from '../../../lib/jsonOutput.js';
+import { ReleaseJsonOutput } from '../../../lib/jsonOutput/release.js';
 export type ProjectReleaseInfoArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<ReleaseJsonOutput> & {
     tag?: string;
 };

package/commands/project/release/info.js

@@ -1,7 +1,7 @@
 import { getReleaseInfo, listReleases } from '../../../api/releases.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { logError, ApiErrorContext } from '../../../lib/errorHandlers/index.js';
-import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
 import { listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -12,7 +12,7 @@ import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHand
 import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import { mapToUserFacingType } from '@hubspot/project-parsing-lib/transform';
 import { AUTO_GENERATED_COMPONENT_TYPES } from '@hubspot/project-parsing-lib/constants';
-import { ReleaseSchema, mapReleaseToJsonOutput, } from '../../../lib/jsonOutput.js';
+import { ReleaseSchema, mapReleaseToJsonOutput, } from '../../../lib/jsonOutput/release.js';
 const command = 'info';
 // const describe = commands.project.release.info.describe;
 const describe = undefined;
@@ -38,9 +38,9 @@ async function selectReleasePrompt(accountId, projectName) {
 }
 async function handler(args) {
     const { derivedAccountId, tag: rawTag, json: formatOutputAsJson, exit, addJsonOutput, } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
+    let projectConfig;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig } = getProjectConfig());
     }
     catch (error) {
         logError(error);

package/commands/project/release/list.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../../types/Yargs.js';
-import { ReleaseListJsonOutput } from '../../../lib/jsonOutput.js';
+import { ReleaseListJsonOutput } from '../../../lib/jsonOutput/release.js';
 export type ProjectReleaseListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs<ReleaseListJsonOutput> & {
     limit?: number;
 };

package/commands/project/release/list.js

@@ -2,7 +2,7 @@ import { listReleases } from '../../../api/releases.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import { logError, ApiErrorContext } from '../../../lib/errorHandlers/index.js';
-import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
 import { promptUser } from '../../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -10,7 +10,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { commands } from '../../../lang/en.js';
 import { renderTable } from '../../../ui/render.js';
 import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
-import { ReleaseListSchema, mapReleaseToJsonOutput, } from '../../../lib/jsonOutput.js';
+import { ReleaseListSchema, mapReleaseToJsonOutput, } from '../../../lib/jsonOutput/release.js';
 const command = 'list';
 // const describe = commands.project.release.list.describe;
 const describe = undefined;
@@ -43,9 +43,9 @@ async function fetchAndDisplayReleases(accountId, projectName, options) {
 }
 async function handler(args) {
     const { derivedAccountId, limit, json: formatOutputAsJson, exit, addJsonOutput, } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
+    let projectConfig;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig } = getProjectConfig());
     }
     catch (error) {
         logError(error);

package/commands/project/updateDeps.js

@@ -5,7 +5,6 @@ import { getProjectConfig } from '../../lib/projects/config.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
-import { uiLogger } from '../../lib/ui/logger.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -14,12 +13,14 @@ const describe = commands.project.updateDeps.help.describe;
 async function handler(args) {
     const { packages, exit } = args;
     try {
-        const projectConfig = await getProjectConfig();
-        if (!projectConfig || !projectConfig.projectDir) {
-            uiLogger.error(commands.project.updateDeps.noProjectConfig);
+        let projectDir;
+        try {
+            ({ projectDir } = getProjectConfig());
+        }
+        catch (error) {
+            logError(error);
             return exit(EXIT_CODES.ERROR);
         }
-        const { projectDir } = projectConfig;
         let installLocations = await getProjectPackageJsonLocations();
         if (packages) {
             const { selectedInstallLocations } = await promptUser([

package/commands/project/upload.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-import { UploadJsonOutput } from '../../lib/jsonOutput.js';
+import { UploadJsonOutput } from '../../lib/jsonOutput/upload.js';
 export type ProjectUploadArgs = CommonArgs & JSONOutputArgs<UploadJsonOutput> & {
     force: boolean;
     forceCreate: boolean;

package/commands/project/upload.js

@@ -3,7 +3,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { isLegacyProject, meetsMinimumPlatformVersion, } from '@hubspot/project-parsing-lib/projects';
-import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { loadAndValidateProfile } from '../../lib/projects/projectProfiles.js';
@@ -14,7 +14,7 @@ import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
-import { UploadSchema, } from '../../lib/jsonOutput.js';
+import { mapAccountToTargetAccount, UploadSchema, } from '../../lib/jsonOutput/upload.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
 import { uiDeprecatedTag } from '../../lib/ui/index.js';
@@ -41,27 +41,28 @@ async function handler(args) {
     if (forceCreate) {
         uiDeprecatedTag(commands.project.upload.logs.forceCreateDeprecated);
     }
-    const { projectConfig, projectDir } = await getProjectConfig();
+    let projectConfig;
+    let projectDir;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig, projectDir } = getProjectConfig());
     }
     catch (error) {
         logError(error);
         return exit(EXIT_CODES.ERROR);
     }
-    if (!projectDir) {
-        uiLogger.error(commands.project.upload.errors.noProjectConfig);
-        return exit(EXIT_CODES.ERROR);
-    }
     let targetAccountId;
     let profileName = args.profile;
-    if (!isLegacyProject(projectConfig?.platformVersion)) {
+    let resolvedViaProfile = false;
+    if (!isLegacyProject(projectConfig.platformVersion)) {
         try {
             const profileNamePromptResult = await projectProfilePrompt(projectDir, projectConfig, profileOption, !!useEnvOption);
             if (profileNamePromptResult) {
                 profileName = profileNamePromptResult;
                 const profile = await loadAndValidateProfile(projectConfig, projectDir, profileName);
                 targetAccountId = profile.accountId;
+                resolvedViaProfile = true;
+                uiLogger.log(commands.project.upload.logs.uploadingWithProfile(profileName, targetAccountId));
+                uiLogger.log('');
             }
         }
         catch (error) {
@@ -76,6 +77,10 @@ async function handler(args) {
         type: accountType,
         assetType: projectConfig.platformVersion,
     });
+    if (!resolvedViaProfile) {
+        uiLogger.log(commands.project.upload.logs.uploadingToAccount(targetAccountId));
+        uiLogger.log('');
+    }
     try {
         const { result, uploadError, projectId, userDeclined } = await handleProjectUpload({
             accountId: targetAccountId,
@@ -118,7 +123,7 @@ async function handler(args) {
             (!result.buildResult.isAutoDeployEnabled || preview || skipAutoDeploy)) {
             uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
             if (!preview) {
-                if (meetsMinimumPlatformVersion(result.buildResult.platformVersion, PLATFORM_VERSIONS.v2027_03_BETA)) {
+                if (meetsMinimumPlatformVersion(result.buildResult.platformVersion, PLATFORM_VERSIONS.v2027_03)) {
                     const releaseCommand = `hs project release create --build=${result.buildId}`;
                     uiLogger.log(commands.project.upload.logs.releaseManagementRequired(releaseCommand));
                 }
@@ -132,17 +137,23 @@ async function handler(args) {
             }
             await displayWarnLogs(targetAccountId, projectConfig.name, result.buildId);
         }
+        if (result) {
+            addJsonOutput({
+                targetAccount: mapAccountToTargetAccount(targetAccountId, accountConfig),
+                buildId: result.buildId,
+            });
+            if (result.deployResult) {
+                addJsonOutput({ deployId: result.deployResult.deployId });
+            }
+        }
         if (result && result.succeeded && preview && targetPortalId) {
             const previewJson = await handlePreview(targetAccountId, projectId, result.buildId, targetPortalId);
             if (previewJson) {
                 addJsonOutput({ preview: previewJson });
             }
         }
-        if (result) {
-            addJsonOutput({ buildId: result.buildId });
-            if (result.deployResult) {
-                addJsonOutput({ deployId: result.deployResult.deployId });
-            }
+        if (result && result.succeeded) {
+            uiLogger.log(commands.project.upload.logs.uploadedToAccount(targetAccountId));
         }
         if (result && !result.succeeded) {
             return exit(EXIT_CODES.ERROR);

package/commands/project/validate.js

@@ -1,112 +1,40 @@
-import path from 'path';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
 import { commands } from '../../lang/en.js';
-import { validateProjectForProfile } from '../../lib/projects/projectProfiles.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
-import SpinniesManager from '../../lib/ui/SpinniesManager.js';
+import { validateProject } from '../../lib/projects/validate.js';
 const command = 'validate';
 const describe = commands.project.validate.describe;
 async function handler(args) {
     const { derivedAccountId, profile, exit, addUsageMetadata } = args;
-    const { projectConfig, projectDir } = await getProjectConfig();
     const accountConfig = getConfigAccountById(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     addUsageMetadata({ type: accountType });
-    if (!projectConfig || !projectDir) {
-        uiLogger.error(commands.project.validate.mustBeRanWithinAProject);
-        return exit(EXIT_CODES.ERROR);
-    }
-    if (isLegacyProject(projectConfig.platformVersion)) {
-        uiLogger.error(commands.project.validate.badVersion);
-        return exit(EXIT_CODES.ERROR);
-    }
+    let projectConfig;
+    let projectDir;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig, projectDir } = getProjectConfig());
     }
     catch (error) {
         logError(error);
         return exit(EXIT_CODES.ERROR);
     }
-    let validationSucceeded = true;
-    const srcDir = path.resolve(projectDir, projectConfig.srcDir);
-    const profiles = await getAllHsProfiles(path.join(projectDir, projectConfig.srcDir));
-    // If a profile is specified, only validate that profile
-    if (profile) {
-        const validationErrors = await validateProjectForProfile({
-            projectConfig,
-            projectDir,
-            profileName: profile,
-            derivedAccountId,
-        });
-        if (validationErrors.length) {
-            logValidationErrors(validationErrors);
-            validationSucceeded = false;
-        }
-    }
-    else if (profiles.length > 0) {
-        // If no profile was specified and the project has profiles, validate all of them
-        SpinniesManager.add('validatingAllProfiles', {
-            text: commands.project.validate.spinners.validatingAllProfiles,
-        });
-        const errors = [];
-        for (const profileName of profiles) {
-            const validationErrors = await validateProjectForProfile({
-                projectConfig,
-                projectDir,
-                profileName,
-                derivedAccountId,
-                indentSpinners: true,
-            });
-            if (validationErrors.length) {
-                errors.push(...validationErrors);
-                validationSucceeded = false;
-            }
-        }
-        if (validationSucceeded) {
-            SpinniesManager.succeed('validatingAllProfiles', {
-                text: commands.project.validate.spinners.allProfilesValidationSucceeded,
-            });
-        }
-        else {
-            SpinniesManager.fail('validatingAllProfiles', {
-                text: commands.project.validate.spinners.allProfilesValidationFailed,
-            });
-        }
-        logValidationErrors(errors);
-    }
-    else if (profiles.length === 0) {
-        // If the project has no profiles, validate the project without a profile
-        try {
-            await handleTranslate({
-                projectDir: projectDir,
-                projectConfig,
-                accountId: derivedAccountId,
-                skipValidation: false,
-            });
-        }
-        catch (e) {
-            uiLogger.error(commands.project.validate.failure(projectConfig.name));
-            logError(e);
-            validationSucceeded = false;
-            uiLogger.log('');
-        }
-    }
-    if (!validationSucceeded) {
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.validate.badVersion);
         return exit(EXIT_CODES.ERROR);
     }
-    try {
-        await validateSourceDirectory(srcDir, projectConfig, projectDir);
-    }
-    catch (e) {
-        logError(e);
+    const valid = await validateProject({
+        projectConfig,
+        projectDir,
+        derivedAccountId,
+        profile,
+    });
+    if (!valid) {
         return exit(EXIT_CODES.ERROR);
     }
     uiLogger.success(commands.project.validate.success(projectConfig.name));
@@ -130,17 +58,6 @@ function projectValidateBuilder(yargs) {
     ]);
     return yargs;
 }
-function logValidationErrors(validationErrors) {
-    uiLogger.log('');
-    validationErrors.forEach(error => {
-        if (error instanceof Error) {
-            logError(error);
-        }
-        else {
-            uiLogger.log(error);
-        }
-    });
-}
 const builder = makeYargsBuilder(projectValidateBuilder, command, describe, {
     useGlobalOptions: true,
     useConfigOptions: true,

package/commands/project/watch.js

@@ -6,7 +6,7 @@ import { createWatcher } from '../../lib/projects/watch.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
-import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
+import { getProjectConfig } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { pollBuildStatus, pollDeployStatus, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
@@ -58,22 +58,19 @@ function handleUserInput(accountId, projectName, currentBuildId, exit) {
 async function handler(args) {
     const { initialUpload, derivedAccountId, exit } = args;
     uiCommandRelocatedMessage('hs project dev');
-    const { projectConfig, projectDir } = await getProjectConfig();
-    if (!projectConfig || !projectDir) {
-        uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
-        return exit(EXIT_CODES.ERROR);
-    }
-    if (!isLegacyProject(projectConfig.platformVersion)) {
-        uiLogger.error(commands.project.watch.errors.v2ApiError(projectConfig.platformVersion));
-        return exit(EXIT_CODES.ERROR);
-    }
+    let projectConfig;
+    let projectDir;
     try {
-        validateProjectConfig(projectConfig, projectDir);
+        ({ projectConfig, projectDir } = getProjectConfig());
     }
     catch (error) {
         logError(error);
         return exit(EXIT_CODES.ERROR);
     }
+    if (!isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.watch.errors.v2ApiError(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
+    }
     try {
         const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;

package/commands/project.js

@@ -33,7 +33,7 @@ const describe = commands.project.describe;
 // the CLI is not officially compatible with
 async function validatePlatformVersion() {
     try {
-        const { projectConfig } = await getProjectConfig();
+        const { projectConfig } = getProjectConfig();
         // Only warn if a platform version is explicitly set but not supported
         // Don't warn if the platform version is missing/undefined
         if (projectConfig?.platformVersion &&

package/commands/testAccount/create.d.ts

@@ -1,6 +1,6 @@
 import { AccountLevel } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
 import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-import { CreateTestAccountJsonOutput } from '../../lib/jsonOutput.js';
+import { CreateTestAccountJsonOutput } from '../../lib/jsonOutput/createTestAccount.js';
 type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & JSONOutputArgs<CreateTestAccountJsonOutput> & {
     configPath?: string;
     name?: string;