@hubspot/cli 7.7.0-experimental.2 → 7.7.0

package/lib/projects/localDev/LocalDevLogger.js

@@ -1,57 +1,47 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("@hubspot/local-dev-lib/config");
-const config_2 = require("@hubspot/local-dev-lib/config");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const logger_2 = require("../../ui/logger");
-const ui_1 = require("../../ui");
-const en_1 = require("../../../lang/en");
-const SpinniesManager_1 = __importDefault(require("../../ui/SpinniesManager"));
-const errorHandlers_1 = require("../../errorHandlers");
+import { getAccountId, hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
+import { getConfigDefaultAccount } from '@hubspot/local-dev-lib/config';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../ui/logger.js';
+import { uiBetaTag, uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
+import { lib } from '../../../lang/en.js';
+import SpinniesManager from '../../ui/SpinniesManager.js';
+import { logError } from '../../errorHandlers/index.js';
+import { isAutoOpenBrowserEnabled } from '../../configOptions.js';
+import { CONFIG_LOCAL_STATE_FLAGS } from '../../constants.js';
 class LocalDevLogger {
     state;
     mostRecentUploadWarning;
-    uploadWarnings;
     constructor(state) {
         this.state = state;
         this.mostRecentUploadWarning = null;
-        this.uploadWarnings = new Set();
     }
     logUploadInstructions(warning) {
-        logger_2.uiLogger.log('');
-        logger_2.uiLogger.warn(warning);
-        logger_2.uiLogger.log('');
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.uploadWarning.instructionsHeader);
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.uploadWarning.stopDev);
-        if (this.state.isGithubLinked) {
-            logger_2.uiLogger.log(en_1.lib.LocalDevManager.uploadWarning.pushToGithub);
-        }
-        else {
-            logger_2.uiLogger.log(en_1.lib.LocalDevManager.uploadWarning.runUpload(this.getUploadCommand()));
-        }
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.uploadWarning.restartDev);
+        uiLogger.log('');
+        uiLogger.warn(warning);
+        uiLogger.log('');
+        uiLogger.log(lib.LocalDevManager.uploadWarning.instructionsHeader);
+        uiLogger.log(lib.LocalDevManager.uploadWarning.stopDev);
+        uiLogger.log(lib.LocalDevManager.uploadWarning.runUpload(this.getUploadCommand()));
+        uiLogger.log(lib.LocalDevManager.uploadWarning.restartDev);
     }
     handleError(e, langFunction) {
         if (this.state.debug) {
-            logger_1.logger.error(e);
+            logger.error(e);
         }
-        logger_2.uiLogger.error(langFunction(e instanceof Error ? e.message : ''));
+        uiLogger.error(langFunction(e instanceof Error ? e.message : ''));
     }
     getUploadCommand() {
-        const currentDefaultAccount = (0, config_2.getConfigDefaultAccount)() || undefined;
+        const currentDefaultAccount = getConfigDefaultAccount() || undefined;
         return this.state.targetProjectAccountId !==
-            (0, config_1.getAccountId)(currentDefaultAccount)
-            ? (0, ui_1.uiCommandReference)(`hs project upload --account=${this.state.targetProjectAccountId}`)
-            : (0, ui_1.uiCommandReference)('hs project upload');
+            getAccountId(currentDefaultAccount)
+            ? uiCommandReference(`hs project upload --account=${this.state.targetProjectAccountId}`)
+            : uiCommandReference('hs project upload');
     }
     uploadWarning() {
         // At the moment, there is only one additional warning. We may need to do this in a
         // more robust way in the future
-        const additionalWarnings = Array.from(this.uploadWarnings).join('\n\n');
-        const warning = `${en_1.lib.LocalDevManager.uploadWarning.defaultWarning} ${additionalWarnings}`;
+        const additionalWarnings = Array.from(this.state.uploadWarnings).join('\n\n');
+        const warning = `${lib.LocalDevManager.uploadWarning.defaultWarning} ${additionalWarnings}`;
         // Avoid logging the warning to the console if it is currently the most
         // recently logged warning. We do not want to spam the console with the same message.
         if (warning !== this.mostRecentUploadWarning) {
@@ -59,85 +49,105 @@ class LocalDevLogger {
             this.mostRecentUploadWarning = warning;
         }
     }
-    addUploadWarning(warning) {
-        this.uploadWarnings.add(warning);
-    }
-    clearUploadWarnings() {
-        this.uploadWarnings.clear();
-    }
     missingComponentsWarning(components) {
-        const warning = en_1.lib.LocalDevManager.uploadWarning.missingComponents(components.join(', '));
+        const warning = lib.LocalDevManager.uploadWarning.missingComponents(components.join(', '));
         if (warning !== this.mostRecentUploadWarning) {
             this.logUploadInstructions(warning);
             this.mostRecentUploadWarning = warning;
         }
     }
     fileChangeError(e) {
-        this.handleError(e, en_1.lib.LocalDevManager.devServer.fileChangeError);
+        this.handleError(e, lib.LocalDevManager.devServer.fileChangeError);
     }
     devServerSetupError(e) {
-        this.handleError(e, en_1.lib.LocalDevManager.devServer.setupError);
+        this.handleError(e, lib.LocalDevManager.devServer.setupError);
     }
     devServerStartError(e) {
-        this.handleError(e, en_1.lib.LocalDevManager.devServer.startError);
+        this.handleError(e, lib.LocalDevManager.devServer.startError);
     }
     devServerCleanupError(e) {
-        this.handleError(e, en_1.lib.LocalDevManager.devServer.cleanupError);
-    }
-    noDeployedBuild() {
-        logger_2.uiLogger.error(en_1.lib.LocalDevManager.noDeployedBuild(this.state.projectConfig.name, (0, ui_1.uiAccountDescription)(this.state.targetProjectAccountId), this.getUploadCommand()));
-        logger_2.uiLogger.log('');
+        this.handleError(e, lib.LocalDevManager.devServer.cleanupError);
     }
     resetSpinnies() {
-        SpinniesManager_1.default.stopAll();
-        SpinniesManager_1.default.init();
+        SpinniesManager.stopAll();
+        SpinniesManager.init();
     }
     startupMessage() {
         if (!this.state.debug) {
             console.clear();
         }
-        (0, ui_1.uiBetaTag)(en_1.lib.LocalDevManager.betaMessage);
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.learnMoreLocalDevServer);
-        logger_2.uiLogger.log('');
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.running(this.state.projectConfig.name, (0, ui_1.uiAccountDescription)(this.state.targetProjectAccountId)));
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.viewProjectLink(this.state.projectConfig.name, this.state.targetProjectAccountId));
-        logger_2.uiLogger.log('');
-        logger_2.uiLogger.log(en_1.lib.LocalDevManager.quitHelper);
-        (0, ui_1.uiLine)();
-        logger_2.uiLogger.log('');
+        uiBetaTag(lib.LocalDevManager.betaMessage);
+        uiLogger.log(lib.LocalDevManager.learnMoreLocalDevServer);
+        uiLogger.log('');
+        uiLogger.log(lib.LocalDevManager.running(this.state.projectConfig.name, uiAccountDescription(this.state.targetProjectAccountId)));
+        uiLogger.log(lib.LocalDevManager.viewProjectLink(this.state.projectConfig.name, this.state.targetProjectAccountId));
+        const showWelcomeScreen = !hasLocalStateFlag(CONFIG_LOCAL_STATE_FLAGS.LOCAL_DEV_UI_WELCOME);
+        if (!isAutoOpenBrowserEnabled()) {
+            uiLogger.log(lib.LocalDevManager.viewLocalDevUILink(this.state.targetTestingAccountId, showWelcomeScreen));
+        }
+        else {
+            uiLogger.log('');
+            uiLogger.log(lib.LocalDevManager.localDevUIAutoMessage(this.state.targetTestingAccountId, showWelcomeScreen));
+        }
+        uiLogger.log('');
+        uiLogger.log(lib.LocalDevManager.quitHelper);
+        uiLine();
+        uiLogger.log('');
     }
     cleanupStart() {
-        SpinniesManager_1.default.add('cleanupMessage', {
-            text: en_1.lib.LocalDevManager.exitingStart,
+        SpinniesManager.add('cleanupMessage', {
+            text: lib.LocalDevManager.exitingStart,
         });
     }
     cleanupError() {
-        SpinniesManager_1.default.fail('cleanupMessage', {
-            text: en_1.lib.LocalDevManager.exitingFail,
+        SpinniesManager.fail('cleanupMessage', {
+            text: lib.LocalDevManager.exitingFail,
         });
     }
     cleanupSuccess() {
-        SpinniesManager_1.default.succeed('cleanupMessage', {
-            text: en_1.lib.LocalDevManager.exitingSucceed,
+        SpinniesManager.succeed('cleanupMessage', {
+            text: lib.LocalDevManager.exitingSucceed,
         });
     }
     uploadInitiated() {
-        logger_2.uiLogger.log(en_1.lib.LocalDevProcess.uploadInitiated);
+        uiLogger.log(lib.LocalDevProcess.uploadInitiated);
+    }
+    deployInitiated() {
+        uiLogger.log(lib.LocalDevProcess.deployInitiated);
     }
     projectConfigMismatch() {
-        logger_2.uiLogger.log(en_1.lib.LocalDevProcess.projectConfigMismatch);
+        uiLogger.log(lib.LocalDevProcess.projectConfigMismatch);
     }
     uploadError(error) {
-        logger_1.logger.log('');
-        (0, errorHandlers_1.logError)(error);
-        logger_2.uiLogger.log(en_1.lib.LocalDevProcess.uploadFailed);
-        logger_1.logger.log('');
+        logger.log('');
+        logError(error);
+        uiLogger.log(lib.LocalDevProcess.uploadFailed);
+        logger.log('');
     }
     uploadSuccess() {
-        logger_1.logger.log('');
-        logger_2.uiLogger.log(en_1.lib.LocalDevProcess.uploadSuccess);
-        (0, ui_1.uiLine)();
-        logger_1.logger.log('');
+        logger.log('');
+        uiLogger.log(lib.LocalDevProcess.uploadSuccess);
+        uiLine();
+        logger.log('');
+    }
+    uploadSuccessAutoDeployDisabled() {
+        uiLogger.warn(lib.LocalDevProcess.uploadSuccessAutoDeployDisabled);
+        uiLine();
+        logger.log('');
+    }
+    deployError(error) {
+        logger.log('');
+        if (error) {
+            logError(error);
+        }
+        uiLogger.log(lib.LocalDevProcess.deployFailed);
+        logger.log('');
+    }
+    deploySuccess() {
+        logger.log('');
+        uiLogger.log(lib.LocalDevProcess.deploySuccess);
+        uiLine();
+        logger.log('');
     }
     monitorConsoleOutput() {
         const originalStdoutWrite = process.stdout.write.bind(process.stdout);
@@ -155,4 +165,4 @@ class LocalDevLogger {
         process.stdout.write = customStdoutWrite;
     }
 }
-exports.default = LocalDevLogger;
+export default LocalDevLogger;

package/lib/projects/localDev/LocalDevManager.d.ts

@@ -2,7 +2,7 @@ import { FSWatcher } from 'chokidar';
 import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { PublicApp } from '@hubspot/local-dev-lib/types/Apps';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
-import { Component, ProjectConfig } from '../../../types/Projects';
+import { Component, ProjectConfig } from '../../../types/Projects.js';
 type LocalDevManagerConstructorOptions = {
     targetAccountId: number;
     parentAccountId: number;