@hubspot/cli 7.4.6-beta.0 → 7.4.7-beta.0

package/lib/projects/localDev/helpers.js

@@ -15,7 +15,6 @@ exports.createNewProjectForLocalDev = createNewProjectForLocalDev;
 exports.createInitialBuildForNewProject = createInitialBuildForNewProject;
 exports.getAccountHomeUrl = getAccountHomeUrl;
 exports.hasSandboxes = hasSandboxes;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const urls_1 = require("@hubspot/local-dev-lib/urls");
@@ -42,17 +41,18 @@ const index_2 = require("../../errorHandlers/index");
 const buildAccount_1 = require("../../buildAccount");
 const accountNamePrompt_1 = require("../../prompts/accountNamePrompt");
 const en_1 = require("../../../lang/en");
+const logger_1 = require("../../ui/logger");
 // If the user passed in the --account flag, confirm they want to use that account as
 // their target account, otherwise exit
 async function confirmDefaultAccountIsTarget(accountConfig) {
     if (!accountConfig.name || !accountConfig.accountType) {
-        logger_1.logger.error(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget.configError);
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget.configError);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.log();
+    logger_1.uiLogger.log('');
     const useDefaultAccount = await (0, projectDevTargetAccountPrompt_1.confirmDefaultAccountPrompt)(accountConfig.name, config_1.HUBSPOT_ACCOUNT_TYPE_STRINGS[accountConfig.accountType]);
     if (!useDefaultAccount) {
-        logger_1.logger.log(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget
             .declineDefaultAccountExplanation);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
@@ -64,18 +64,18 @@ async function checkIfDefaultAccountIsSupported(accountConfig, hasPublicApps) {
         !((0, accountTypes_1.isAppDeveloperAccount)(accountConfig) ||
             (0, accountTypes_1.isDeveloperTestAccount)(accountConfig) ||
             defaultAccountIsUnified)) {
-        logger_1.logger.error(en_1.lib.localDevHelpers.checkIfDefaultAccountIsSupported.publicApp);
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.checkIfDefaultAccountIsSupported.publicApp);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     else if (!hasPublicApps && (0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        logger_1.logger.error(en_1.lib.localDevHelpers.checkIfDefaultAccountIsSupported.privateApp);
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.checkIfDefaultAccountIsSupported.privateApp);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 function checkIfParentAccountIsAuthed(accountConfig) {
     if (!accountConfig.parentAccountId ||
         !(0, config_2.getAccountConfig)(accountConfig.parentAccountId)) {
-        logger_1.logger.error(en_1.lib.localDevHelpers.checkIfParentAccountIsAuthed.notAuthedError(accountConfig.parentAccountId || '', (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig))));
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.checkIfParentAccountIsAuthed.notAuthedError(accountConfig.parentAccountId || '', (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig))));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
@@ -83,29 +83,29 @@ function checkIfParentAccountIsAuthed(accountConfig) {
 function checkIfAccountFlagIsSupported(accountConfig, hasPublicApps) {
     if (hasPublicApps) {
         if (!(0, accountTypes_1.isDeveloperTestAccount)(accountConfig)) {
-            logger_1.logger.error(en_1.lib.localDevHelpers.validateAccountOption.invalidPublicAppAccount);
+            logger_1.uiLogger.error(en_1.lib.localDevHelpers.validateAccountOption.invalidPublicAppAccount);
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         checkIfParentAccountIsAuthed(accountConfig);
     }
     else if ((0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        logger_1.logger.error(en_1.lib.localDevHelpers.validateAccountOption.invalidPrivateAppAccount);
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.validateAccountOption.invalidPrivateAppAccount);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 // If the user isn't using the recommended account type, prompt them to use or create one
 async function suggestRecommendedNestedAccount(accounts, accountConfig, hasPublicApps) {
-    logger_1.logger.log();
+    logger_1.uiLogger.log('');
     (0, ui_1.uiLine)();
     if (hasPublicApps) {
-        logger_1.logger.log(en_1.lib.localDevHelpers.validateAccountOption
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.validateAccountOption
             .publicAppNonDeveloperTestAccountWarning);
     }
     else {
-        logger_1.logger.log(en_1.lib.localDevHelpers.validateAccountOption.nonSandboxWarning);
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.validateAccountOption.nonSandboxWarning);
     }
     (0, ui_1.uiLine)();
-    logger_1.logger.log();
+    logger_1.uiLogger.log('');
     const targetAccountPrompt = hasPublicApps
         ? projectDevTargetAccountPrompt_1.selectDeveloperTestTargetAccountPrompt
         : projectDevTargetAccountPrompt_1.selectSandboxTargetAccountPrompt;
@@ -118,10 +118,10 @@ async function createSandboxForLocalDev(accountId, accountConfig, env) {
     }
     catch (err) {
         if ((0, index_1.isMissingScopeError)(err)) {
-            logger_1.logger.error(en_1.lib.sandbox.create.developer.failure.scopes.message);
+            logger_1.uiLogger.error(en_1.lib.sandbox.create.developer.failure.scopes.message);
             const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
             const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-            logger_1.logger.info(en_1.lib.sandbox.create.developer.failure.scopes.instructions(accountConfig.name || accountId, url));
+            logger_1.uiLogger.info(en_1.lib.sandbox.create.developer.failure.scopes.instructions(accountConfig.name || accountId, url));
         }
         else {
             (0, index_2.logError)(err);
@@ -137,7 +137,7 @@ async function createSandboxForLocalDev(accountId, accountConfig, env) {
         const targetAccountId = result.sandbox.sandboxHubId;
         const sandboxAccountConfig = (0, config_2.getAccountConfig)(result.sandbox.sandboxHubId);
         if (!sandboxAccountConfig) {
-            logger_1.logger.error(en_1.lib.sandbox.create.developer.failure.generic);
+            logger_1.uiLogger.error(en_1.lib.sandbox.create.developer.failure.generic);
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const syncTasks = await (0, sandboxes_1.getAvailableSyncTypes)(accountConfig, sandboxAccountConfig);
@@ -165,10 +165,10 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
     }
     catch (err) {
         if ((0, index_1.isMissingScopeError)(err)) {
-            logger_1.logger.error(en_1.lib.developerTestAccount.create.failure.scopes.message);
+            logger_1.uiLogger.error(en_1.lib.developerTestAccount.create.failure.scopes.message);
             const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
             const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-            logger_1.logger.info(en_1.lib.developerTestAccount.create.failure.scopes.instructions(accountConfig.name || accountId, url));
+            logger_1.uiLogger.info(en_1.lib.developerTestAccount.create.failure.scopes.instructions(accountConfig.name || accountId, url));
         }
         else {
             (0, index_2.logError)(err);
@@ -193,14 +193,14 @@ async function createDeveloperTestAccountForLocalDev(accountId, accountConfig, e
 async function useExistingDevTestAccount(env, account) {
     const useExistingDevTestAcct = await (0, projectDevTargetAccountPrompt_1.confirmUseExistingDeveloperTestAccountPrompt)(account);
     if (!useExistingDevTestAcct) {
-        logger_1.logger.log('');
-        logger_1.logger.log(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.confirmDefaultAccountIsTarget
             .declineDefaultAccountExplanation);
-        logger_1.logger.log('');
+        logger_1.uiLogger.log('');
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const devTestAcctConfigName = await (0, buildAccount_1.saveAccountToConfig)(account.id, account.accountName, env);
-    logger_1.logger.success(en_1.lib.developerTestAccount.create.success.configFileUpdated(devTestAcctConfigName, auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name));
+    logger_1.uiLogger.success(en_1.lib.developerTestAccount.create.success.configFileUpdated(devTestAcctConfigName, auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name));
 }
 // Prompt the user to create a new project if one doesn't exist on their target account
 async function createNewProjectForLocalDev(projectConfig, targetAccountId, shouldCreateWithoutConfirmation, hasPublicApps) {
@@ -213,9 +213,9 @@ async function createNewProjectForLocalDev(projectConfig, targetAccountId, shoul
             : en_1.lib.localDevHelpers.createNewProjectForLocalDev
                 .projectMustExistExplanation;
         const explanationString = explanationLangFunction((0, ui_1.uiAccountDescription)(targetAccountId), projectConfig.name);
-        logger_1.logger.log();
+        logger_1.uiLogger.log('');
         (0, ui_1.uiLine)();
-        logger_1.logger.log(explanationString);
+        logger_1.uiLogger.log(explanationString);
         (0, ui_1.uiLine)();
         shouldCreateProject = await (0, promptUtils_1.confirmPrompt)(en_1.lib.localDevHelpers.createNewProjectForLocalDev.createProject(projectConfig.name, (0, ui_1.uiAccountDescription)(targetAccountId)));
     }
@@ -233,35 +233,45 @@ async function createNewProjectForLocalDev(projectConfig, targetAccountId, shoul
         }
         catch (err) {
             SpinniesManager_1.default.fail('createProject');
-            logger_1.logger.log(en_1.lib.localDevHelpers.createNewProjectForLocalDev.failedToCreateProject);
+            logger_1.uiLogger.log(en_1.lib.localDevHelpers.createNewProjectForLocalDev.failedToCreateProject);
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
     else {
         // We cannot continue if the project does not exist in the target account
-        logger_1.logger.log();
-        logger_1.logger.log(en_1.lib.localDevHelpers.createNewProjectForLocalDev.choseNotToCreateProject);
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.log(en_1.lib.localDevHelpers.createNewProjectForLocalDev.choseNotToCreateProject);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
 function projectUploadCallback(accountId, projectConfig, tempFile, buildId) {
     if (!buildId) {
-        logger_1.logger.error(en_1.lib.localDevHelpers.createInitialBuildForNewProject.genericError);
+        logger_1.uiLogger.error(en_1.lib.localDevHelpers.createInitialBuildForNewProject.genericError);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     return (0, buildAndDeploy_1.pollProjectBuildAndDeploy)(accountId, projectConfig, tempFile, buildId, true);
 }
 // Create an initial build if the project was newly created in the account
 // Return the newly deployed build
-async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, sendIr) {
-    const { result: initialUploadResult, uploadError } = await (0, upload_1.handleProjectUpload)(targetAccountId, projectConfig, projectDir, projectUploadCallback, en_1.lib.localDevHelpers.createInitialBuildForNewProject.initialUploadMessage, sendIr);
+async function createInitialBuildForNewProject(projectConfig, projectDir, targetAccountId, sendIR) {
+    const { result: initialUploadResult, uploadError } = await (0, upload_1.handleProjectUpload)({
+        accountId: targetAccountId,
+        projectConfig,
+        projectDir,
+        callbackFunc: projectUploadCallback,
+        uploadMessage: en_1.lib.localDevHelpers.createInitialBuildForNewProject
+            .initialUploadMessage,
+        forceCreate: true,
+        skipValidation: true,
+        sendIR,
+    });
     if (uploadError) {
         if ((0, index_1.isSpecifiedError)(uploadError, {
             subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED,
         })) {
-            logger_1.logger.log();
-            logger_1.logger.error(en_1.lib.localDevHelpers.createInitialBuildForNewProject.projectLockedError);
-            logger_1.logger.log();
+            logger_1.uiLogger.log('');
+            logger_1.uiLogger.error(en_1.lib.localDevHelpers.createInitialBuildForNewProject.projectLockedError);
+            logger_1.uiLogger.log('');
         }
         else {
             (0, index_2.logError)(uploadError, new index_2.ApiErrorContext({
@@ -282,11 +292,11 @@ async function createInitialBuildForNewProject(projectConfig, projectDir, target
                 initialUploadResult.deployResult[constants_1.PROJECT_DEPLOY_TEXT.SUBTASK_KEY];
         }
         const failedSubTasks = subTasks.filter(task => task.status === 'FAILURE');
-        logger_1.logger.log();
+        logger_1.uiLogger.log('');
         failedSubTasks.forEach(failedSubTask => {
-            logger_1.logger.error(failedSubTask.errorMessage);
+            logger_1.uiLogger.error(failedSubTask.errorMessage);
         });
-        logger_1.logger.log();
+        logger_1.uiLogger.log('');
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     return initialUploadResult.buildResult;

package/lib/projects/ui.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logFeedbackMessage = logFeedbackMessage;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
+const logger_1 = require("../ui/logger");
 const constants_1 = require("../constants");
 const ui_1 = require("../ui");
 const en_1 = require("../../lang/en");
 function logFeedbackMessage(buildId) {
     if (buildId > 0 && buildId % constants_1.FEEDBACK_INTERVAL === 0) {
         (0, ui_1.uiLine)();
-        logger_1.logger.log(en_1.lib.projects.logFeedbackMessage.feedbackHeader);
+        logger_1.uiLogger.log(en_1.lib.projects.logFeedbackMessage.feedbackHeader);
         (0, ui_1.uiLine)();
-        logger_1.logger.log(en_1.lib.projects.logFeedbackMessage.feedbackMessage);
+        logger_1.uiLogger.log(en_1.lib.projects.logFeedbackMessage.feedbackMessage);
     }
 }

package/lib/projects/upload.d.ts

@@ -5,5 +5,16 @@ type ProjectUploadResult<T> = {
     result?: T;
     uploadError?: unknown;
 };
-export declare function handleProjectUpload<T>(accountId: number, projectConfig: ProjectConfig, projectDir: string, callbackFunc: ProjectUploadCallbackFunction<T>, uploadMessage?: string, sendIR?: boolean, skipValidation?: boolean): Promise<ProjectUploadResult<T>>;
+type HandleProjectUploadArg<T> = {
+    accountId: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    callbackFunc: ProjectUploadCallbackFunction<T>;
+    uploadMessage?: string;
+    forceCreate?: boolean;
+    isUploadCommand?: boolean;
+    sendIR?: boolean;
+    skipValidation?: boolean;
+};
+export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export {};

package/lib/projects/upload.js

@@ -10,7 +10,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const ui_1 = require("../ui");
 const exitCodes_1 = require("../enums/exitCodes");
@@ -18,6 +17,8 @@ const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const errorHandlers_1 = require("../errorHandlers");
 const node_util_1 = __importDefault(require("node:util"));
 const en_1 = require("../../lang/en");
+const ensureProjectExists_1 = require("./ensureProjectExists");
+const logger_1 = require("../ui/logger");
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
@@ -34,7 +35,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
             text: en_1.lib.projectUpload.uploadProjectFiles.succeed(projectName, accountIdentifier),
         });
         if (buildId) {
-            logger_1.logger.debug(en_1.lib.projectUpload.uploadProjectFiles.buildCreated(projectName, buildId));
+            logger_1.uiLogger.debug(en_1.lib.projectUpload.uploadProjectFiles.buildCreated(projectName, buildId));
         }
     }
     catch (err) {
@@ -45,19 +46,19 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-async function handleProjectUpload(accountId, projectConfig, projectDir, callbackFunc, uploadMessage = '', sendIR = false, skipValidation = false) {
+async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
     const filenames = fs_extra_1.default.readdirSync(srcDir);
     if (!filenames || filenames.length === 0) {
-        logger_1.logger.log(en_1.lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
+        logger_1.uiLogger.log(en_1.lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const tempFile = tmp_1.default.fileSync({ postfix: '.zip' });
-    logger_1.logger.debug(en_1.lib.projectUpload.handleProjectUpload.compressing(tempFile.name));
+    logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.compressing(tempFile.name));
     const output = fs_extra_1.default.createWriteStream(tempFile.name);
     const archive = (0, archiver_1.default)('zip');
     const result = new Promise(resolve => output.on('close', async function () {
-        logger_1.logger.debug(en_1.lib.projectUpload.handleProjectUpload.compressed(archive.pointer()));
+        logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.compressed(archive.pointer()));
         let intermediateRepresentation;
         if (sendIR) {
             try {
@@ -66,11 +67,11 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                     platformVersion: projectConfig.platformVersion,
                     accountId,
                 }, { skipValidation });
-                logger_1.logger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+                logger_1.uiLogger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
             }
             catch (e) {
                 if ((0, project_parsing_lib_1.isTranslationError)(e)) {
-                    logger_1.logger.error(e.toString());
+                    logger_1.uiLogger.error(e.toString());
                 }
                 else {
                     (0, errorHandlers_1.logError)(e);
@@ -78,6 +79,10 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
                 return process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
+        await (0, ensureProjectExists_1.ensureProjectExists)(accountId, projectConfig.name, {
+            forceCreate,
+            uploadCommand: isUploadCommand,
+        });
         const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
         if (error) {
             resolve({ uploadError: error });
@@ -94,7 +99,7 @@ async function handleProjectUpload(accountId, projectConfig, projectDir, callbac
         if (ignored) {
             const isNodeModule = file.name.includes('node_modules');
             if (!isNodeModule || !loggedIgnoredNodeModule) {
-                logger_1.logger.debug(en_1.lib.projectUpload.handleProjectUpload.fileFiltered(file.name));
+                logger_1.uiLogger.debug(en_1.lib.projectUpload.handleProjectUpload.fileFiltered(file.name));
             }
             if (isNodeModule && !loggedIgnoredNodeModule) {
                 loggedIgnoredNodeModule = true;

package/lib/projects/watch.js

@@ -8,7 +8,6 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const p_queue_1 = __importDefault(require("p-queue"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const extensions_1 = require("@hubspot/local-dev-lib/constants/extensions");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
@@ -17,6 +16,7 @@ const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const errorHandlers_1 = require("../errorHandlers");
 const constants_1 = require("../constants");
 const en_1 = require("../../lang/en");
+const logger_1 = require("../ui/logger");
 const queue = new p_queue_1.default({
     concurrency: 10,
 });
@@ -43,18 +43,18 @@ function debounceQueueBuild(accountId, projectName, platformVersion) {
         clearTimeout(timer);
     }
     timer = setTimeout(async () => {
-        logger_1.logger.debug(en_1.commands.project.watch.debug.pause);
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.pause);
         queue.pause();
         await queue.onIdle();
         try {
             await (0, projects_1.queueBuild)(accountId, projectName, platformVersion);
-            logger_1.logger.debug(en_1.commands.project.watch.debug.buildStarted);
+            logger_1.uiLogger.debug(en_1.commands.project.watch.debug.buildStarted);
         }
         catch (err) {
             if ((0, index_1.isSpecifiedError)(err, {
                 subCategory: constants_1.PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
             })) {
-                logger_1.logger.log(en_1.commands.project.watch.logs.watchCancelledFromUi);
+                logger_1.uiLogger.log(en_1.commands.project.watch.logs.watchCancelledFromUi);
                 process.exit(0);
             }
             else {
@@ -68,24 +68,24 @@ function debounceQueueBuild(accountId, projectName, platformVersion) {
             await processStandByQueue(accountId, projectName, platformVersion);
         }
         queue.start();
-        logger_1.logger.log(en_1.commands.project.watch.logs.resuming);
-        logger_1.logger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
+        logger_1.uiLogger.log(en_1.commands.project.watch.logs.resuming);
+        logger_1.uiLogger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
     }, 2000);
 }
 async function queueFileOrFolder(accountId, projectName, platformVersion, filePath, remotePath, action) {
     if (action === 'upload' &&
         !(0, path_2.isAllowedExtension)(filePath, Array.from(extensions_1.JSR_ALLOWED_EXTENSIONS))) {
-        logger_1.logger.debug(en_1.commands.project.watch.debug.extensionNotAllowed(filePath));
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.extensionNotAllowed(filePath));
         return;
     }
     if ((0, ignoreRules_1.shouldIgnoreFile)(filePath, true)) {
-        logger_1.logger.debug(en_1.commands.project.watch.debug.ignored(filePath));
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.ignored(filePath));
         return;
     }
     if (!queue.isPaused) {
         debounceQueueBuild(accountId, projectName, platformVersion);
     }
-    logger_1.logger.debug(en_1.commands.project.watch.debug.uploading(filePath, remotePath));
+    logger_1.uiLogger.debug(en_1.commands.project.watch.debug.uploading(filePath, remotePath));
     return queue.add(async () => {
         try {
             if (action === 'upload') {
@@ -94,12 +94,12 @@ async function queueFileOrFolder(accountId, projectName, platformVersion, filePa
             else if (action === 'deleteFile' || action === 'deleteFolder') {
                 await (0, projects_1.deleteFileFromBuild)(accountId, projectName, remotePath);
             }
-            logger_1.logger.log(
+            logger_1.uiLogger.log(
             // @ts-expect-error
             en_1.commands.project.watch.logs[`${action}Succeeded`](remotePath, filePath));
         }
         catch (err) {
-            logger_1.logger.debug(
+            logger_1.uiLogger.debug(
             // @ts-expect-error
             en_1.commands.project.watch.errors[`${action}Failed`](remotePath, filePath));
         }
@@ -107,7 +107,7 @@ async function queueFileOrFolder(accountId, projectName, platformVersion, filePa
 }
 async function createNewBuild(accountId, projectName, platformVersion) {
     try {
-        logger_1.logger.debug(en_1.commands.project.watch.debug.attemptNewBuild);
+        logger_1.uiLogger.debug(en_1.commands.project.watch.debug.attemptNewBuild);
         const { data: { buildId }, } = await (0, projects_1.provisionBuild)(accountId, projectName, platformVersion);
         return buildId;
     }
@@ -115,7 +115,7 @@ async function createNewBuild(accountId, projectName, platformVersion) {
         (0, errorHandlers_1.logError)(err, new errorHandlers_1.ApiErrorContext({ accountId }));
         if ((0, index_1.isSpecifiedError)(err, { subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED })) {
             await (0, projects_1.cancelStagedBuild)(accountId, projectName);
-            logger_1.logger.log(en_1.commands.project.watch.logs.previousStagingBuildCancelled);
+            logger_1.uiLogger.log(en_1.commands.project.watch.logs.previousStagingBuildCancelled);
         }
         process.exit(1);
     }
@@ -124,7 +124,7 @@ async function handleWatchEvent(accountId, projectName, platformVersion, project
     const remotePath = path_1.default.relative(projectSourceDir, filePath);
     if (queue.isPaused) {
         if (standbyQueue.find(file => file.filePath === filePath)) {
-            logger_1.logger.debug(en_1.commands.project.watch.debug.fileAlreadyQueued(filePath));
+            logger_1.uiLogger.debug(en_1.commands.project.watch.debug.fileAlreadyQueued(filePath));
         }
         else {
             standbyQueue.push({
@@ -148,8 +148,8 @@ async function createWatcher(accountId, projectConfig, projectDir, handleBuildSt
         ignored: file => (0, ignoreRules_1.shouldIgnoreFile)(file),
     });
     watcher.on('ready', async () => {
-        logger_1.logger.log(en_1.commands.project.watch.logs.watching(projectDir));
-        logger_1.logger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
+        logger_1.uiLogger.log(en_1.commands.project.watch.logs.watching(projectDir));
+        logger_1.uiLogger.log(`\n> Press ${chalk_1.default.bold('q')} to quit watching\n`);
     });
     watcher.on('add', async (path) => {
         handleWatchEvent(accountId, projectConfig.name, projectConfig.platformVersion, projectSourceDir, path);

package/lib/prompts/accountNamePrompt.js

@@ -7,24 +7,25 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
-const i18nKey = 'lib.prompts.accountNamePrompt';
 function getCliAccountNamePromptConfig(defaultName) {
     return {
         name: 'name',
-        message: (0, lang_1.i18n)(`${i18nKey}.enterAccountName`),
+        message: (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterAccountName`),
         default: defaultName,
         validate(val) {
             if (typeof val !== 'string') {
-                return (0, lang_1.i18n)(`${i18nKey}.errors.invalidName`);
+                return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.invalidName`);
             }
             else if (!val.length) {
-                return (0, lang_1.i18n)(`${i18nKey}.errors.nameRequired`);
+                return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.nameRequired`);
             }
             else if (val.indexOf(' ') >= 0) {
-                return (0, lang_1.i18n)(`${i18nKey}.errors.spacesInName`);
+                return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.spacesInName`);
             }
             return (0, config_1.accountNameExistsInConfig)(val)
-                ? (0, lang_1.i18n)(`${i18nKey}.errors.accountNameExists`, { name: val })
+                ? (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
+                    name: val,
+                })
                 : true;
         },
     };
@@ -41,12 +42,12 @@ function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0, }) {
     let defaultName;
     if (isSandbox) {
         promptMessageString = isDevelopmentSandbox
-            ? (0, lang_1.i18n)(`${i18nKey}.enterDevelopmentSandboxName`)
-            : (0, lang_1.i18n)(`${i18nKey}.enterStandardSandboxName`);
+            ? (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterDevelopmentSandboxName`)
+            : (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterStandardSandboxName`);
     }
     else if (isDeveloperTestAccount) {
-        promptMessageString = (0, lang_1.i18n)(`${i18nKey}.enterDeveloperTestAccountName`);
-        defaultName = (0, lang_1.i18n)(`${i18nKey}.developerTestAccountDefaultName`, {
+        promptMessageString = (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.enterDeveloperTestAccountName`);
+        defaultName = (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.developerTestAccountDefaultName`, {
             count: currentPortalCount + 1,
         });
     }
@@ -56,13 +57,15 @@ function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0, }) {
             message: promptMessageString,
             validate(val) {
                 if (typeof val !== 'string') {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidName`);
+                    return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.invalidName`);
                 }
                 else if (!val.trim().length) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.nameRequired`);
+                    return (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.nameRequired`);
                 }
                 return (0, config_1.accountNameExistsInConfig)(val)
-                    ? (0, lang_1.i18n)(`${i18nKey}.errors.accountNameExists`, { name: val })
+                    ? (0, lang_1.i18n)(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
+                        name: val,
+                    })
                     : true;
             },
             default: defaultName,

package/lib/prompts/accountsPrompt.js

@@ -12,7 +12,6 @@ function mapAccountChoices(portals) {
         value: String(p.name || (0, getAccountIdentifier_1.getAccountIdentifier)(p)),
     })) || []);
 }
-const i18nKey = 'commands.account.subcommands.use';
 async function selectAccountFromConfig(prompt = '') {
     const accountsList = (0, config_1.getConfigAccounts)();
     const defaultAccount = (0, config_1.getConfigDefaultAccount)();
@@ -21,7 +20,7 @@ async function selectAccountFromConfig(prompt = '') {
             type: 'list',
             name: 'default',
             pageSize: 20,
-            message: prompt || (0, lang_1.i18n)(`${i18nKey}.promptMessage`),
+            message: prompt || (0, lang_1.i18n)(`commands.account.subcommands.use.promptMessage`),
             choices: mapAccountChoices(accountsList),
             default: defaultAccount ?? undefined,
         },

package/lib/prompts/cmsFieldPrompt.js

@@ -9,7 +9,6 @@ const fs_1 = __importDefault(require("fs"));
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
 const escapeRegExp_1 = require("@hubspot/local-dev-lib/escapeRegExp");
-const i18nKey = 'lib.prompts.uploadPrompt';
 const FIELDS_FILES = ['fields.json', 'fields.js', 'fields.cjs', 'fields.mjs'];
 async function fieldsJsPrompt(filePath, projectDir, skipFiles = []) {
     const dirName = path_1.default.dirname(filePath);
@@ -33,7 +32,7 @@ async function fieldsJsPrompt(filePath, projectDir, skipFiles = []) {
     }));
     const promptVal = await (0, promptUtils_1.promptUser)([
         {
-            message: (0, lang_1.i18n)(`${i18nKey}.fieldsPrompt`, { dir: fileDir }),
+            message: (0, lang_1.i18n)(`lib.prompts.uploadPrompt.fieldsPrompt`, { dir: fileDir }),
             type: 'list',
             name: 'filePathChoice',
             choices: selection,

package/lib/prompts/createApiSamplePrompt.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApiSamplePrompt = createApiSamplePrompt;
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
-const i18nKey = 'lib.prompts.createApiSamplePrompt';
 function getSampleTypesPrompt(choices) {
     return {
         type: 'rawlist',
         name: 'sampleType',
-        message: (0, lang_1.i18n)(`${i18nKey}.selectApiSampleApp`),
+        message: (0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.selectApiSampleApp`),
         choices: choices.map(choice => ({
             name: `${choice.name} - ${choice.description}`,
             value: choice.id,
@@ -19,7 +18,7 @@ function getSampleTypesPrompt(choices) {
                     resolve(true);
                 }
                 else {
-                    reject((0, lang_1.i18n)(`${i18nKey}.errors.apiSampleAppRequired`));
+                    reject((0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.errors.apiSampleAppRequired`));
                 }
             });
         },
@@ -29,7 +28,7 @@ function getLanguagesPrompt(choices) {
     return {
         type: 'rawlist',
         name: 'sampleLanguage',
-        message: (0, lang_1.i18n)(`${i18nKey}.selectLanguage`),
+        message: (0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.selectLanguage`),
         choices: choices.map(choice => ({
             name: choice,
             value: choice,
@@ -39,7 +38,7 @@ function getLanguagesPrompt(choices) {
                 if (input && input.length > 0) {
                     resolve(true);
                 }
-                reject((0, lang_1.i18n)(`${i18nKey}.errors.languageRequired`));
+                reject((0, lang_1.i18n)(`lib.prompts.createApiSamplePrompt.errors.languageRequired`));
             });
         },
     };