@hubspot/cli 7.2.0 → 7.2.1-beta.0

package/commands/project/create.js

@@ -84,6 +84,8 @@ exports.handler = async (options) => {
     logger.log('');
     logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
     uiFeatureHighlight([
+        'projectCommandTip',
+        'projectUploadCommand',
         'projectDevCommand',
         'projectHelpCommand',
         'feedbackCommand',

package/lang/en.lyaml

@@ -1083,10 +1083,10 @@ en:
         restartDev: "  * Re-run {{ command }}"
         pushToGithub: "  * Commit and push your changes to GitHub"
       activeInstallWarning:
-        installCount: "{{#bold}}The app {{ appName }} has {{ installCount }} production {{ installText }}{{/bold}}"
+        installCount: "{{#bold}}The app {{ appName }} is installed in {{ installCount }} {{ accountText }}{{/bold}}"
         explanation: "Some changes made during local development may need to be synced to HubSpot, which will impact those existing installs. We strongly recommend creating a copy of this app to use instead."
         confirmation: "You will always be asked to confirm any permanent changes to your app’s configuration before uploading them."
-        confirmationPrompt: "Proceed with local development of this {{#bold}}production{{/bold}} app?"
+        confirmationPrompt: "Proceed with local development of this app with existing installs?"
       devServer:
         cleanupError: "Failed to cleanup local dev server: {{ message }}"
         setupError: "Failed to setup local dev server: {{ message }}"
@@ -1178,7 +1178,7 @@ en:
       disabledUrlText: "See all HubSpot CLI commands here."
       featureHighlight:
         defaultTitle: "What's next?"
-        commandKeys:
+        featureKeys:
           accountOption:
             command: "--account"
             message: "Use the {{ command }} option with any command to override the default account"
@@ -1208,10 +1208,12 @@ en:
             message: "Run {{ command }} to learn more about available project commands"
           projectUploadCommand:
             command: "hs project upload"
-            message: "Run {{ command }} to upload your project to HubSpot and trigger builds"
+            message: "Run {{ command }} to upload your project to your HubSpot account"
           projectDevCommand:
             command: "hs project dev"
             message: "Run {{ command }} to set up your test environment and start local development"
+          projectCommandTip:
+            message: "Tip: All project commands must be run from within a project directory"
           sampleProjects:
             linkText: "HubSpot's sample projects"
             url: "https://developers.hubspot.com/docs/platform/sample-projects?utm_source=cli&utm_content=project_create_whats_next"

package/lib/LocalDevManager.js

@@ -118,7 +118,7 @@ class LocalDevManager {
         logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.activeInstallWarning.installCount`, {
             appName: this.activePublicAppData.name,
             installCount: this.publicAppActiveInstalls,
-            installText: this.publicAppActiveInstalls === 1 ? 'install' : 'installs',
+            accountText: this.publicAppActiveInstalls === 1 ? 'account' : 'accounts',
         }));
         logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.activeInstallWarning.explanation`));
         (0, ui_1.uiLine)();

package/lib/LocalDevManagerV2.js

@@ -115,7 +115,7 @@ class LocalDevManagerV2 {
         logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.activeInstallWarning.installCount`, {
             appName: this.activePublicAppData.name,
             installCount: this.publicAppActiveInstalls,
-            installText: this.publicAppActiveInstalls === 1 ? 'install' : 'installs',
+            accountText: this.publicAppActiveInstalls === 1 ? 'account' : 'accounts',
         }));
         logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.activeInstallWarning.explanation`));
         (0, ui_1.uiLine)();

package/lib/prompts/createProjectPrompt.js

@@ -9,7 +9,20 @@ const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
 const promptUtils_1 = require("./promptUtils");
 const lang_1 = require("../lang");
+const constants_1 = require("../constants");
 const i18nKey = 'lib.prompts.createProjectPrompt';
+function validateProjectDirectory(input) {
+    if (!input) {
+        return (0, lang_1.i18n)(`${i18nKey}.errors.destRequired`);
+    }
+    if (fs_1.default.existsSync(path_1.default.resolve((0, path_2.getCwd)(), path_1.default.join(input, constants_1.PROJECT_CONFIG_FILE)))) {
+        return (0, lang_1.i18n)(`${i18nKey}.errors.invalidDest`);
+    }
+    if (!(0, path_2.isValidPath)(input)) {
+        return (0, lang_1.i18n)(`${i18nKey}.errors.invalidCharacters`);
+    }
+    return true;
+}
 function findTemplateByNameOrLabel(projectTemplates, templateNameOrLabel) {
     return projectTemplates.find(t => t.name === templateNameOrLabel || t.label === templateNameOrLabel);
 }
@@ -38,18 +51,7 @@ async function createProjectPrompt(promptOptions, projectTemplates) {
                 const projectName = (0, path_2.sanitizeFileName)(promptOptions.name || answers.name);
                 return path_1.default.resolve((0, path_2.getCwd)(), projectName);
             },
-            validate: (input) => {
-                if (!input) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.destRequired`);
-                }
-                if (fs_1.default.existsSync(input)) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidDest`);
-                }
-                if (!(0, path_2.isValidPath)(input)) {
-                    return (0, lang_1.i18n)(`${i18nKey}.errors.invalidCharacters`);
-                }
-                return true;
-            },
+            validate: validateProjectDirectory,
             filter: input => {
                 return (0, path_2.untildify)(input);
             },

package/lib/ui/index.d.ts

@@ -8,7 +8,7 @@ export declare function uiLink(linkText: string, url: string): string;
 export declare function uiAccountDescription(accountId?: number | null, bold?: boolean): string;
 export declare function uiInfoSection(title: string, logContent: () => void): void;
 export declare function uiCommandReference(command: string, withQuotes?: boolean): string;
-export declare function uiFeatureHighlight(commands: string[], title?: string): void;
+export declare function uiFeatureHighlight(features: string[], title?: string): void;
 export declare function uiBetaTag(message: string, log?: boolean): string | undefined;
 export declare function uiDeprecatedTag(message: string): void;
 export declare function uiCommandDisabledBanner(command: string, url?: string, message?: string): void;

package/lib/ui/index.js

@@ -77,14 +77,14 @@ function uiCommandReference(command, withQuotes = true) {
         ? chalk_1.default.hex(exports.UI_COLORS.MARIGOLD_DARK)(commandReference)
         : commandReference);
 }
-function uiFeatureHighlight(commands, title) {
+function uiFeatureHighlight(features, title) {
     const i18nKey = 'lib.ui.featureHighlight';
     uiInfoSection(title ? title : (0, lang_1.i18n)(`${i18nKey}.defaultTitle`), () => {
-        commands.forEach((c, i) => {
-            const commandKey = `${i18nKey}.commandKeys.${c}`;
-            const message = (0, lang_1.i18n)(`${commandKey}.message`, {
-                command: uiCommandReference((0, lang_1.i18n)(`${commandKey}.command`)),
-                link: uiLink((0, lang_1.i18n)(`${commandKey}.linkText`), (0, lang_1.i18n)(`${commandKey}.url`)),
+        features.forEach((c, i) => {
+            const featureKey = `${i18nKey}.featureKeys.${c}`;
+            const message = (0, lang_1.i18n)(`${featureKey}.message`, {
+                command: uiCommandReference((0, lang_1.i18n)(`${featureKey}.command`)),
+                link: uiLink((0, lang_1.i18n)(`${featureKey}.linkText`), (0, lang_1.i18n)(`${featureKey}.url`)),
             });
             if (i !== 0) {
                 logger_1.logger.log('');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.2.0",
+    "version": "7.2.1-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -9,7 +9,7 @@
         "@hubspot/project-parsing-lib": "0.1.1",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.8.48",
+        "@hubspot/ui-extensions-dev-server": "0.8.50",
         "archiver": "7.0.1",
         "chalk": "4.1.2",
         "chokidar": "3.6.0",