@hubspot/cli 4.2.1-beta.3 → 4.2.1-beta.4

package/bin/cli.js

@@ -42,7 +42,11 @@ const cmsCommand = require('../commands/cms');
 const feedbackCommand = require('../commands/feedback');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-const notifier = updateNotifier({ pkg: { ...pkg, name: '@hubspot/cli' } });
+const notifier = updateNotifier({
+  pkg: { ...pkg, name: '@hubspot/cli' },
+  distTag: 'latest',
+  shouldNotifyInNpmScript: true,
+});
 
 const i18nKey = 'cli.commands.generalErrors';
 
@@ -51,7 +55,6 @@ const CLI_UPGRADE_MESSAGE =
   '\n\nTo upgrade, run:\n\nnpm uninstall -g @hubspot/cms-cli\nand npm install -g @hubspot/cli';
 
 notifier.notify({
-  shouldNotifyInNpmScript: true,
   message: pkg.name === '@hubspot/cms-cli' ? CLI_UPGRADE_MESSAGE : null,
 });
 

package/commands/project/create.js

@@ -38,7 +38,7 @@ exports.handler = async options => {
   await createProjectConfig(
     path.resolve(getCwd(), options.location || location),
     options.name || name,
-    options.template || template,
+    template || { path: options.template },
     options.templateSource
   );
 

package/commands/project/dev.js

@@ -78,9 +78,6 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
-  if (!options.debug) {
-    console.clear();
-  }
   uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
@@ -211,11 +208,6 @@ exports.handler = async options => {
 
   SpinniesManager.init();
 
-  if (!options.debug) {
-    console.clear();
-  }
-  uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
-
   if (!projectExists) {
     // Create the project without prompting if this is a newly created sandbox
     let shouldCreateProject = createNewSandbox;
@@ -242,13 +234,14 @@ exports.handler = async options => {
     if (shouldCreateProject) {
       await showPlatformVersionWarning(accountId, projectConfig);
 
+      SpinniesManager.add('createProject', {
+        text: i18n(`${i18nKey}.status.creatingProject`, {
+          accountIdentifier: uiAccountDescription(targetAccountId),
+          projectName: projectConfig.name,
+        }),
+      });
+
       try {
-        SpinniesManager.add('createProject', {
-          text: i18n(`${i18nKey}.status.creatingProject`, {
-            accountIdentifier: uiAccountDescription(targetAccountId),
-            projectName: projectConfig.name,
-          }),
-        });
         await createProject(targetAccountId, projectConfig.name);
         SpinniesManager.succeed('createProject', {
           text: i18n(`${i18nKey}.status.createdProject`, {
@@ -258,6 +251,7 @@ exports.handler = async options => {
           succeedColor: 'white',
         });
       } catch (err) {
+        SpinniesManager.fail('createProject');
         logger.log(i18n(`${i18nKey}.status.failedToCreateProject`));
         process.exit(EXIT_CODES.ERROR);
       }
@@ -317,7 +311,7 @@ exports.handler = async options => {
 
       logger.log();
       failedSubTasks.forEach(failedSubTask => {
-        console.log(failedSubTask.errorMessage);
+        console.error(failedSubTask.errorMessage);
       });
       logger.log();
 

package/lang/en.lyaml

@@ -865,8 +865,8 @@ en:
         noCompatibleComponents: "Skipping call to {{ serverKey }} because there are no compatible components in the project."
       LocalDevManager:
         failedToInitialize: "Missing required arguments to initialize Local Dev"
+        noDeployedBuild: "There is no deployed build for this project in {{ accountIdentifier }}. Run {{ uploadCommand }} to upload and deploy your project."
         noComponents: "There are no components in this project."
-        noDeployedBuild: "There is no deployed build for this project in {{ accountIdentifier }}."
         noRunnableComponents: "There are no components in this project that support local development."
         betaMessage: "HubSpot projects local development"
         running: "Running {{#bold}}{{ projectName }}{{/bold}} locally on {{ accountIdentifier }}, waiting for changes ..."
@@ -878,12 +878,11 @@ en:
         uploadWarning:
           appLabel: "[App]"
           uiExtensionLabel: "[UI Extension]"
-          configEdit: "You edited the configuration file {{#bold}}{{ path }}{{/bold}}. Changes to configuration files cannot be handled by the local dev server."
           missingComponents: "The deployed build for this project does not contain {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
-          header: "{{ reason }} To reflect these changes:"
+          defaultWarning: "Changing project configuration requires a new project build."
+          header: "{{ warning }} To reflect these changes and continue testing:"
           stopDev: "  * Stop {{ command }}"
           runUpload: "  * Run {{ command }}"
-          runUploadWithAccount: "  * Run {{ command }}"
           restartDev: "  * Re-run {{ command }}"
         devServer:
           cleanupError: "Failed to cleanup local dev server: {{ message }}"

package/lib/LocalDevManager.js

@@ -64,12 +64,13 @@ class LocalDevManager {
 
     // Local dev currently relies on the existence of a deployed build in the target account
     if (!this.deployedBuild) {
-      logger.log();
       logger.error(
         i18n(`${i18nKey}.noDeployedBuild`, {
           accountIdentifier: uiAccountDescription(this.targetAccountId),
+          uploadCommand: this.getUploadCommand(),
         })
       );
+      logger.log();
       process.exit(EXIT_CODES.SUCCESS);
     }
 
@@ -77,7 +78,6 @@ class LocalDevManager {
 
     // The project is empty, there is nothing to run locally
     if (!components.length) {
-      logger.log();
       logger.error(i18n(`${i18nKey}.noComponents`));
       process.exit(EXIT_CODES.SUCCESS);
     }
@@ -88,15 +88,15 @@ class LocalDevManager {
 
     // The project does not contain any components that support local development
     if (!runnableComponents.length) {
-      logger.log();
       logger.error(i18n(`${i18nKey}.noRunnableComponents`));
       process.exit(EXIT_CODES.SUCCESS);
     }
 
-    logger.log();
     const setupSucceeded = await this.devServerSetup(runnableComponents);
 
-    if (setupSucceeded || !this.debug) {
+    if (!setupSucceeded) {
+      process.exit(EXIT_CODES.ERROR);
+    } else if (!this.debug) {
       console.clear();
     }
 
@@ -165,43 +165,42 @@ class LocalDevManager {
     });
   }
 
+  getUploadCommand() {
+    const currentDefaultAccount = getConfigDefaultAccount();
+
+    return this.targetAccountId !== getAccountId(currentDefaultAccount)
+      ? uiCommandReference(
+          `hs project upload --account=${this.targetAccountId}`
+        )
+      : uiCommandReference('hs project upload');
+  }
+
   logUploadWarning(reason) {
+    const warning = reason || i18n(`${i18nKey}.uploadWarning.defaultWarning`);
+
     // 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 (!this.uploadWarnings[reason]) {
-      const currentDefaultAccount = getConfigDefaultAccount();
-      const defaultAccountId = getAccountId(currentDefaultAccount);
-
+    if (!this.uploadWarnings[warning]) {
       logger.log();
-      logger.warn(i18n(`${i18nKey}.uploadWarning.header`, { reason }));
+      logger.warn(i18n(`${i18nKey}.uploadWarning.header`, { warning }));
       logger.log(
         i18n(`${i18nKey}.uploadWarning.stopDev`, {
           command: uiCommandReference('hs project dev'),
         })
       );
-      if (this.targetAccountId !== defaultAccountId) {
-        logger.log(
-          i18n(`${i18nKey}.uploadWarning.runUploadWithAccount`, {
-            command: uiCommandReference(
-              `hs project upload --account=${this.targetAccountId}`
-            ),
-          })
-        );
-      } else {
-        logger.log(
-          i18n(`${i18nKey}.uploadWarning.runUpload`, {
-            command: uiCommandReference('hs project upload'),
-          })
-        );
-      }
+      logger.log(
+        i18n(`${i18nKey}.uploadWarning.runUpload`, {
+          command: this.getUploadCommand(),
+        })
+      );
       logger.log(
         i18n(`${i18nKey}.uploadWarning.restartDev`, {
           command: uiCommandReference('hs project dev'),
         })
       );
 
-      this.mostRecentUploadWarning = reason;
-      this.uploadWarnings[reason] = true;
+      this.mostRecentUploadWarning = warning;
+      this.uploadWarnings[warning] = true;
     }
   }
 
@@ -245,7 +244,7 @@ class LocalDevManager {
             !deployedComponentNames.includes(cardConfig.data.title)
           ) {
             missingComponents.push(
-              `${i18n(`${i18nKey}.uploadWarning.appLabel`)} ${
+              `${i18n(`${i18nKey}.uploadWarning.uiExtensionLabel`)} ${
                 cardConfig.data.title
               }`
             );
@@ -298,11 +297,7 @@ class LocalDevManager {
 
   handleWatchEvent(filePath, event, configPaths) {
     if (configPaths.includes(filePath)) {
-      this.logUploadWarning(
-        i18n(`${i18nKey}.uploadWarning.configEdit`, {
-          path: path.relative(this.projectDir, filePath),
-        })
-      );
+      this.logUploadWarning();
     } else {
       this.devServerFileChange(filePath, event);
     }

package/lib/projects.js

@@ -133,24 +133,15 @@ const createProjectConfig = async (
     }`
   );
 
+  await downloadGitHubRepoContents(templateSource, template.path, projectPath);
+  const _config = JSON.parse(fs.readFileSync(projectConfigPath));
+  writeProjectConfig(projectConfigPath, {
+    ..._config,
+    name: projectName,
+  });
+
   if (template.name === 'no-template') {
     fs.ensureDirSync(path.join(projectPath, 'src'));
-
-    writeProjectConfig(projectConfigPath, {
-      name: projectName,
-      srcDir: 'src',
-    });
-  } else {
-    await downloadGitHubRepoContents(
-      templateSource,
-      template.path,
-      projectPath
-    );
-    const _config = JSON.parse(fs.readFileSync(projectConfigPath));
-    writeProjectConfig(projectConfigPath, {
-      ..._config,
-      name: projectName,
-    });
   }
 
   return true;

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -26,7 +26,11 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     logger.debug('Unable to fetch sandbox usage limits: ', err);
   }
 
-  const sandboxAccounts = accounts.reverse().filter(isSandbox);
+  const sandboxAccounts = accounts
+    .reverse()
+    .filter(
+      config => isSandbox(config) && config.parentAccountId === defaultAccountId
+    );
   let disabledMessage = false;
 
   if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.2.1-beta.3",
+  "version": "4.2.1-beta.4",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -10,7 +10,7 @@
   "dependencies": {
     "@hubspot/cli-lib": "^4.2.2",
     "@hubspot/serverless-dev-runtime": "4.2.1-beta.3",
-    "@hubspot/ui-extensions-dev-server": "^0.7.0",
+    "@hubspot/ui-extensions-dev-server": "^0.7.2",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e3e46fab20a9efb8c4c98f88b2aed1d13e6d0b1d"
+  "gitHead": "24d48c93e04bacc5db761cc15489b5bc82e17847"
 }