@hubspot/cli 3.0.10-beta.14 → 3.0.10-beta.18

package/README.md

@@ -1,6 +1,6 @@
 # @hubspot/cli
 
-Provides an `hs` command for interacting with the HubSpot. [Learn more about building on HubSpot](https://developers.hubspot.com).
+Provides an `hs` command for interacting with HubSpot. [Learn more about building on HubSpot](https://developers.hubspot.com).
 
 ## Getting started
 

package/bin/cli.js

@@ -10,7 +10,6 @@ const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage } = require('../lib/usageTracking');
 const pkg = require('../package.json');
 
-const appCommand = require('../commands/app');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -75,7 +74,6 @@ const argv = yargs
     describe: 'set log level to debug',
     type: 'boolean',
   })
-  .command(appCommand)
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)

package/commands/auth.js

@@ -18,13 +18,13 @@ const {
   getConfigPath,
 } = require('@hubspot/cli-lib/lib/config');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const {
-  promptUser,
   personalAccessKeyPrompt,
   OAUTH_FLOW,
   API_KEY_FLOW,
   ACCOUNT_NAME,
-} = require('../lib/prompts');
+} = require('../lib/prompts/personalAccessKeyPrompt');
 const {
   addConfigOptions,
   setLogLevel,

package/commands/config/set/allowUsageTracking.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateAllowUsageTracking } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -11,7 +11,7 @@ const i18nKey =
   'cli.commands.config.subcommands.set.subcommands.allowUsageTracking';
 
 const enableOrDisableUsageTracking = async () => {
-  const { isEnabled } = await inquirer.prompt([
+  const { isEnabled } = await promptUser([
     {
       type: 'list',
       look: false,

package/commands/config/set/defaultAccount.js

@@ -4,18 +4,18 @@ const {
   getConfigPath,
   updateDefaultAccount,
 } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey =
   'cli.commands.config.subcommands.set.subcommands.defaultAccount';
 
 const selectAccountFromConfig = async config => {
-  const { default: selectedDefault } = await inquirer.prompt([
+  const { default: selectedDefault } = await promptUser([
     {
       type: 'list',
       look: false,

package/commands/config/set/defaultMode.js

@@ -1,11 +1,11 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateDefaultMode } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 const { Mode } = require('@hubspot/cli-lib');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -14,7 +14,7 @@ const i18nKey = 'cli.commands.config.subcommands.set.subcommands.defaultMode';
 const ALL_MODES = Object.values(Mode);
 
 const selectMode = async () => {
-  const { mode } = await inquirer.prompt([
+  const { mode } = await promptUser([
     {
       type: 'list',
       look: false,

package/commands/create/api-sample.js

@@ -1,5 +1,9 @@
-const { createApiSamplePrompt } = require('../../lib/createApiSamplePrompt');
-const { folderOverwritePrompt } = require('../../lib/prompts');
+const {
+  createApiSamplePrompt,
+} = require('../../lib/prompts/createApiSamplePrompt');
+const {
+  folderOverwritePrompt,
+} = require('../../lib/prompts/folderOverwritePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');

package/commands/create/function.js

@@ -1,5 +1,7 @@
 const { createFunction } = require('@hubspot/cli-lib/functions');
-const { createFunctionPrompt } = require('../../lib/createFunctionPrompt');
+const {
+  createFunctionPrompt,
+} = require('../../lib/prompts/createFunctionPrompt');
 
 module.exports = {
   dest: ({ name }) => name,

package/commands/create/index.js

@@ -3,7 +3,6 @@ module.exports = {
   app: require('./app'),
   function: require('./function'),
   module: require('./module'),
-  project: require('./project'),
   'react-app': require('./react-app'),
   template: require('./template'),
   'vue-app': require('./vue-app'),

package/commands/create/module.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { createModulePrompt } = require('../../lib/createModulePrompt');
+const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
 const fs = require('fs-extra');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');

package/commands/create/template.js

@@ -1,4 +1,6 @@
-const { createTemplatePrompt } = require('../../lib/createTemplatePrompt');
+const {
+  createTemplatePrompt,
+} = require('../../lib/prompts/createTemplatePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');

package/commands/create/website-theme.js

@@ -1,8 +1,19 @@
 const { createProject } = require('@hubspot/cli-lib/projects');
+const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const { getIsInProject } = require('../../lib/projects');
+
+const PROJECT_BOILERPLATE_REF = 'cms-boilerplate-developer-projects';
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
-  execute: ({ dest, assetType, options }) => {
+  execute: async ({ dest, assetType, options }) => {
+    const isInProject = await getIsInProject(dest);
+
+    if (isInProject) {
+      options.ref = PROJECT_BOILERPLATE_REF;
+      // releaseType has to be 'REPOSITORY' to download a specific branch
+      options.releaseType = GITHUB_RELEASE_TYPES.REPOSITORY;
+    }
     createProject(dest, assetType, 'cms-theme-boilerplate', 'src', options);
   },
 };

package/commands/functions/deploy.js

@@ -83,7 +83,7 @@ exports.handler = async options => {
     spinner.stop();
     await outputBuildLog(successResp.cdnUrl);
     logger.success(
-      i18n(`${i18nKey}.success.deploy`, {
+      i18n(`${i18nKey}.success.deployed`, {
         accountId,
         buildTimeSeconds,
         functionPath,

package/commands/init.js

@@ -26,13 +26,13 @@ const {
 const { getCwd } = require('@hubspot/cli-lib/path');
 const { trackCommandUsage, trackAuthAction } = require('../lib/usageTracking');
 const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const {
   OAUTH_FLOW,
   API_KEY_FLOW,
   ACCOUNT_NAME,
   personalAccessKeyPrompt,
-  promptUser,
-} = require('../lib/prompts');
+} = require('../lib/prompts/personalAccessKeyPrompt');
 const { logDebugInfo } = require('../lib/debugInfo');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');

package/commands/open.js

@@ -6,14 +6,14 @@ const {
 } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { logSiteLinks, getSiteLinksAsArray, openLink } = require('../lib/links');
-const inquirer = require('inquirer');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.open';
 
 const separator = ' => ';
 const createListPrompt = async accountId =>
-  inquirer.prompt([
+  promptUser([
     {
       type: 'rawlist',
       look: false,

package/commands/project/create.js

@@ -8,9 +8,10 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const path = require('path');
-const { prompt } = require('inquirer');
+const {
+  createProjectPrompt,
+} = require('../../lib/prompts/createProjectPrompt');
 const { createProjectConfig } = require('../../lib/projects');
-const { PROJECT_TEMPLATES } = require('@hubspot/cli-lib/lib/constants');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
@@ -23,58 +24,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  const { name, template, location } = await prompt([
-    {
-      name: 'name',
-      message: '[--name] Give your project a name:',
-      when: !options.name,
-      validate: input => {
-        if (!input) {
-          return 'A project name is required';
-        }
-        return true;
-      },
-    },
-    {
-      name: 'location',
-      message: '[--location] Where should the project be created?',
-      when: !options.location,
-      default: answers => {
-        return path.resolve(getCwd(), answers.name || options.name);
-      },
-      validate: input => {
-        if (!input) {
-          return 'A project location is required';
-        }
-        return true;
-      },
-    },
-    {
-      name: 'template',
-      message: () => {
-        return options.template &&
-          !PROJECT_TEMPLATES.find(t => t.name === options.template)
-          ? `[--template] Could not find template ${options.template}. Please choose an available template.`
-          : '[--template] Start from a template?';
-      },
-      when:
-        !options.template ||
-        !PROJECT_TEMPLATES.find(t => t.name === options.template),
-      type: 'list',
-      choices: [
-        {
-          name: 'No template',
-          value: 'none',
-        },
-        ...PROJECT_TEMPLATES.map(template => {
-          return {
-            name: template.label,
-            value: template.name,
-          };
-        }),
-      ],
-    },
-  ]);
+  const { name, template, location } = await createProjectPrompt(options);
 
   trackCommandUsage('project-create', { projectName: name }, accountId);
 

package/commands/project/listBuilds.js

@@ -29,7 +29,7 @@ const {
   validateProjectConfig,
 } = require('../../lib/projects');
 const moment = require('moment');
-const { prompt } = require('inquirer');
+const { promptUser } = require('../../lib/prompts/promptUtils');
 
 exports.command = 'list-builds [path]';
 exports.describe = false;
@@ -111,7 +111,7 @@ exports.handler = async options => {
       );
     }
     if (paging && paging.next) {
-      await prompt({
+      await promptUser({
         name: 'more',
         message: 'Press <enter> to load more, or ctrl+c to exit',
       });

package/commands/project/watch.js

@@ -0,0 +1,103 @@
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { createWatcher } = require('@hubspot/cli-lib/projectsWatch');
+const { cancelStagedBuild } = require('@hubspot/cli-lib/api/dfs');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  addAccountOptions,
+  addConfigOptions,
+  getAccountId,
+  addUseEnvironmentOptions,
+} = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const {
+  getProjectConfig,
+  validateProjectConfig,
+  pollBuildStatus,
+  pollDeployStatus,
+} = require('../../lib/projects');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+const i18nKey = 'cli.commands.project.subcommands.watch';
+
+exports.command = 'watch [path]';
+exports.describe = false;
+
+const handleBuildStatus = async (accountId, projectName, buildId) => {
+  const {
+    isAutoDeployEnabled,
+    deployStatusTaskLocator,
+  } = await pollBuildStatus(accountId, projectName, buildId);
+
+  if (isAutoDeployEnabled && deployStatusTaskLocator) {
+    await pollDeployStatus(
+      accountId,
+      projectName,
+      deployStatusTaskLocator.id,
+      buildId
+    );
+  }
+};
+
+const handleSigInt = (accountId, projectName, currentBuildId) => {
+  process.removeAllListeners('SIGINT');
+  process.on('SIGINT', async () => {
+    if (currentBuildId) {
+      try {
+        await cancelStagedBuild(accountId, projectName);
+        logger.debug(i18n(`${i18nKey}.debug.buildCancelled`));
+        process.exit(EXIT_CODES.SUCCESS);
+      } catch (err) {
+        logApiErrorInstance(
+          err,
+          new ApiErrorContext({ accountId, projectName: projectName })
+        );
+        process.exit(EXIT_CODES.ERROR);
+      }
+    } else {
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+  });
+};
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  const { path: projectPath } = options;
+  const accountId = getAccountId(options);
+
+  trackCommandUsage('project-watch', { projectPath }, accountId);
+
+  const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+
+  validateProjectConfig(projectConfig, projectDir);
+
+  await createWatcher(
+    accountId,
+    projectConfig,
+    projectDir,
+    handleBuildStatus,
+    handleSigInt
+  );
+};
+
+exports.builder = yargs => {
+  yargs.positional('path', {
+    describe: i18n(`${i18nKey}.describe`),
+    type: 'string',
+  });
+
+  yargs.example([
+    ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
+  ]);
+
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+
+  return yargs;
+};

package/commands/project.js

@@ -4,6 +4,7 @@ const create = require('./project/create');
 const upload = require('./project/upload');
 const listBuilds = require('./project/listBuilds');
 const logs = require('./project/logs');
+const watch = require('./project/watch');
 
 exports.command = 'project';
 exports.describe = false; //'Commands for working with projects';
@@ -16,6 +17,7 @@ exports.builder = yargs => {
   yargs.command(deploy).demandCommand(1, '');
   yargs.command(create).demandCommand(0, '');
   yargs.command(upload).demandCommand(0, '');
+  yargs.command(watch).demandCommand(0, '');
   yargs.command(listBuilds).demandCommand(0, '');
   yargs.command(logs).demandCommand(1, '');
 

package/commands/sandbox/create.js

@@ -9,7 +9,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { createSandbox: prompt } = require('../../lib/prompts/sandboxes');
+const { createSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
@@ -27,7 +27,7 @@ exports.handler = async options => {
   trackCommandUsage('sandbox-create', {}, accountId);
 
   if (!name) {
-    namePrompt = await prompt();
+    namePrompt = await createSandboxPrompt();
   }
 
   const sandboxName = name || namePrompt.name;

package/commands/secrets/addSecret.js

@@ -14,7 +14,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
-const { secretValuePrompt } = require('../../lib/secretPrompt');
+const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.add';

package/commands/secrets/updateSecret.js

@@ -14,7 +14,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
-const { secretValuePrompt } = require('../../lib/secretPrompt');
+const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.update';

package/lib/projects.js

@@ -3,7 +3,6 @@ const path = require('path');
 
 const chalk = require('chalk');
 const findup = require('findup-sync');
-const { prompt } = require('inquirer');
 const Spinnies = require('spinnies');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getEnv } = require('@hubspot/cli-lib/lib/config');
@@ -29,6 +28,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { getCwd } = require('@hubspot/cli-lib/path');
+const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiAccountDescription } = require('../lib/ui');
 
@@ -69,7 +69,12 @@ const writeProjectConfig = (configPath, config) => {
   }
 };
 
-const getProjectConfig = async _dir => {
+const getIsInProject = async _dir => {
+  const configPath = await getProjectConfigPath(_dir);
+  return !!configPath;
+};
+
+const getProjectConfigPath = async _dir => {
   const projectDir = _dir ? path.resolve(getCwd(), _dir) : getCwd();
 
   const configPath = findup(PROJECT_CONFIG_FILE, {
@@ -77,6 +82,11 @@ const getProjectConfig = async _dir => {
     nocase: true,
   });
 
+  return configPath;
+};
+
+const getProjectConfig = async _dir => {
+  const configPath = await getProjectConfigPath(_dir);
   if (!configPath) {
     return { projectConfig: null, projectDir: null };
   }
@@ -103,7 +113,7 @@ const createProjectConfig = async (projectPath, projectName, template) => {
         : `Found an existing project definition in ${projectDir}.`
     );
 
-    const { shouldContinue } = await prompt([
+    const { shouldContinue } = await promptUser([
       {
         name: 'shouldContinue',
         message: () => {
@@ -182,7 +192,7 @@ const ensureProjectExists = async (accountId, projectName, forceCreate) => {
       let shouldCreateProject = forceCreate;
 
       if (!shouldCreateProject) {
-        const promptResult = await prompt([
+        const promptResult = await promptUser([
           {
             name: 'shouldCreateProject',
             message: `The project ${projectName} does not exist in ${uiAccountDescription(
@@ -381,6 +391,7 @@ const makeGetTaskStatus = taskType => {
 module.exports = {
   writeProjectConfig,
   getProjectConfig,
+  getIsInProject,
   createProjectConfig,
   validateProjectConfig,
   showWelcomeMessage,

package/lib/{createApiSamplePrompt.js → prompts/createApiSamplePrompt.js}

@@ -1,9 +1,12 @@
-const inquirer = require('inquirer');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.createApiSamplePrompt';
 
 const getSampleTypesPrompt = choices => ({
   type: 'rawlist',
   name: 'sampleType',
-  message: 'Please, select API sample app',
+  message: i18n(`${i18nKey}.selectApiSampleApp`),
   choices: choices.map(choice => ({
     name: `${choice.name} - ${choice.description}`,
     value: choice.id,
@@ -13,7 +16,7 @@ const getSampleTypesPrompt = choices => ({
       if (input.length > 0) {
         resolve(true);
       }
-      reject('Please select API sample app');
+      reject(i18n(`${i18nKey}.errors.apiSampleAppRequired`));
     });
   },
 });
@@ -21,7 +24,7 @@ const getSampleTypesPrompt = choices => ({
 const getLanguagesPrompt = choices => ({
   type: 'rawlist',
   name: 'sampleLanguage',
-  message: "Please, select sample app's language",
+  message: i18n(`${i18nKey}.selectLanguage`),
   choices: choices.map(choice => ({
     name: choice,
     value: choice,
@@ -31,7 +34,7 @@ const getLanguagesPrompt = choices => ({
       if (input.length > 0) {
         resolve(true);
       }
-      reject("Please select API sample app's language");
+      reject(i18n(`${i18nKey}.errors.languageRequired`));
     });
   },
 });
@@ -39,16 +42,12 @@ const getLanguagesPrompt = choices => ({
 const createApiSamplePrompt = async samplesConfig => {
   try {
     const { samples } = samplesConfig;
-    const sampleTypeAnswer = await inquirer.prompt(
-      getSampleTypesPrompt(samples)
-    );
+    const sampleTypeAnswer = await promptUser(getSampleTypesPrompt(samples));
     const chosenSample = samples.find(
       sample => sample.id === sampleTypeAnswer.sampleType
     );
     const { languages } = chosenSample;
-    const languagesAnswer = await inquirer.prompt(
-      getLanguagesPrompt(languages)
-    );
+    const languagesAnswer = await promptUser(getLanguagesPrompt(languages));
     return {
       ...sampleTypeAnswer,
       ...languagesAnswer,

package/lib/{createFunctionPrompt.js → prompts/createFunctionPrompt.js}

@@ -1,66 +1,72 @@
-const inquirer = require('inquirer');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
-const { STRING_WITH_NO_SPACES_REGEX } = require('./regex');
+const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+
+const i18nKey = 'cli.lib.prompts.createFunctionPrompt';
 
 const FUNCTIONS_FOLDER_PROMPT = {
   name: 'functionsFolder',
-  message: 'Name of the folder where your function will be created',
+  message: i18n(`${i18nKey}.enterFolder`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid name. Please try again.';
+      return i18n(`${i18nKey}.errors.invalid`);
     } else if (!val.length) {
-      return 'The name may not be blank. Please try again.';
+      return i18n(`${i18nKey}.errors.blank`);
     } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return 'The name may not contain spaces. Please try again.';
+      return i18n(`${i18nKey}.errors.space`);
     }
     return true;
   },
 };
-const ENDPOINT_PATH_PROMPT = {
-  name: 'endpointPath',
-  message: 'Path portion of the URL created for the function',
+
+const FUNCTION_FILENAME_PROMPT = {
+  name: 'filename',
+  message: i18n(`${i18nKey}.enterFilename`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid name. Please try again.';
+      return i18n(`${i18nKey}.errors.invalid`);
     } else if (!val.length) {
-      return 'The name may not be blank. Please try again.';
+      return i18n(`${i18nKey}.errors.blank`);
     } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return 'The name may not contain spaces. Please try again.';
+      return i18n(`${i18nKey}.errors.space`);
     }
     return true;
   },
 };
+
 const ENDPOINT_METHOD_PROMPT = {
   type: 'list',
   name: 'endpointMethod',
-  message: 'Select the HTTP method for the endpoint',
+  message: i18n(`${i18nKey}.selectEndpointMethod`),
   default: 'GET',
   choices: ['DELETE', 'GET', 'PATCH', 'POST', 'PUT'],
 };
-const FUNCTION_FILENAME_PROMPT = {
-  name: 'filename',
-  message: 'Name of the JavaScript file for your function',
+
+const ENDPOINT_PATH_PROMPT = {
+  name: 'endpointPath',
+  message: i18n(`${i18nKey}.enterEndpointPath`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid name. Please try again.';
+      return i18n(`${i18nKey}.errors.invalid`);
     } else if (!val.length) {
-      return 'The name may not be blank. Please try again.';
+      return i18n(`${i18nKey}.errors.blank`);
     } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return 'The name may not contain spaces. Please try again.';
+      return i18n(`${i18nKey}.errors.space`);
     }
     return true;
   },
 };
 
 function createFunctionPrompt() {
-  const prompt = inquirer.createPromptModule();
-  return prompt([
+  return promptUser([
     FUNCTIONS_FOLDER_PROMPT,
     FUNCTION_FILENAME_PROMPT,
     ENDPOINT_METHOD_PROMPT,
     ENDPOINT_PATH_PROMPT,
   ]);
 }
+
 module.exports = {
   createFunctionPrompt,
 };

package/lib/{createModulePrompt.js → prompts/createModulePrompt.js}

@@ -1,13 +1,16 @@
-const inquirer = require('inquirer');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.createModulePrompt';
 
 const MODULE_LABEL_PROMPT = {
   name: 'moduleLabel',
-  message: 'What should the module label be?',
+  message: i18n(`${i18nKey}.enterLabel`),
   validate(val) {
     if (typeof val !== 'string') {
-      return 'You entered an invalid name. Please try again.';
+      return i18n(`${i18nKey}.errors.invalidLabel`);
     } else if (!val.length) {
-      return 'The name may not be blank. Please try again.';
+      return i18n(`${i18nKey}.errors.labelRequired`);
     }
     return true;
   },
@@ -15,7 +18,7 @@ const MODULE_LABEL_PROMPT = {
 const CONTENT_TYPES_PROMPT = {
   type: 'checkbox',
   name: 'contentTypes',
-  message: 'What types of content will this module be used in?',
+  message: i18n(`${i18nKey}.selectContentType`),
   default: ['PAGE'],
   choices: [
     { name: 'Page', value: 'PAGE' },
@@ -28,7 +31,7 @@ const CONTENT_TYPES_PROMPT = {
       if (input.length > 0) {
         resolve(true);
       }
-      reject('Please select at least one content type for this module.');
+      reject(i18n(`${i18nKey}.errors.contentTypeRequired`));
     });
   },
 };
@@ -36,14 +39,14 @@ const CONTENT_TYPES_PROMPT = {
 const GLOBAL_PROMPT = {
   type: 'confirm',
   name: 'global',
-  message: 'Is this a global module?',
+  message: i18n(`${i18nKey}.confirmGlobal`),
   default: false,
 };
 
 function createModulePrompt() {
-  const prompt = inquirer.createPromptModule();
-  return prompt([MODULE_LABEL_PROMPT, CONTENT_TYPES_PROMPT, GLOBAL_PROMPT]);
+  return promptUser([MODULE_LABEL_PROMPT, CONTENT_TYPES_PROMPT, GLOBAL_PROMPT]);
 }
+
 module.exports = {
   createModulePrompt,
 };

package/lib/prompts/createProjectPrompt.js

@@ -0,0 +1,68 @@
+const path = require('path');
+const { getCwd } = require('@hubspot/cli-lib/path');
+const { PROJECT_TEMPLATES } = require('@hubspot/cli-lib/lib/constants');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.createProjectPrompt';
+
+const createProjectPrompt = (promptOptions = {}) => {
+  return promptUser([
+    {
+      name: 'name',
+      message: i18n(`${i18nKey}.enterName`),
+      when: !promptOptions.name,
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.nameRequired`);
+        }
+        return true;
+      },
+    },
+    {
+      name: 'location',
+      message: i18n(`${i18nKey}.enterLocation`),
+      when: !promptOptions.location,
+      default: answers => {
+        return path.resolve(getCwd(), answers.name || promptOptions.name);
+      },
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.locationRequired`);
+        }
+        return true;
+      },
+    },
+    {
+      name: 'template',
+      message: () => {
+        return promptOptions.template &&
+          !PROJECT_TEMPLATES.find(t => t.name === promptOptions.template)
+          ? i18n(`${i18nKey}.errors.invalidTemplate`, {
+              template: promptOptions.template,
+            })
+          : i18n(`${i18nKey}.selectTemplate`);
+      },
+      when:
+        !promptOptions.template ||
+        !PROJECT_TEMPLATES.find(t => t.name === promptOptions.template),
+      type: 'list',
+      choices: [
+        {
+          name: i18n(`${i18nKey}.templateOptions.noTemplate`),
+          value: 'none',
+        },
+        ...PROJECT_TEMPLATES.map(template => {
+          return {
+            name: template.label,
+            value: template.name,
+          };
+        }),
+      ],
+    },
+  ]);
+};
+
+module.exports = {
+  createProjectPrompt,
+};

package/lib/{createTemplatePrompt.js → prompts/createTemplatePrompt.js}

@@ -1,9 +1,12 @@
-const inquirer = require('inquirer');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.createTemplatePrompt';
 
 const TEMPLATE_TYPE_PROMPT = {
   type: 'list',
   name: 'templateType',
-  message: 'Select the type of template to create',
+  message: i18n(`${i18nKey}.selectTemplate`),
   default: 'page',
   choices: [
     { name: 'page', value: 'page-template' },
@@ -17,9 +20,9 @@ const TEMPLATE_TYPE_PROMPT = {
 };
 
 function createTemplatePrompt() {
-  const prompt = inquirer.createPromptModule();
-  return prompt([TEMPLATE_TYPE_PROMPT]);
+  return promptUser([TEMPLATE_TYPE_PROMPT]);
 }
+
 module.exports = {
   createTemplatePrompt,
 };

package/lib/prompts/folderOverwritePrompt.js

@@ -0,0 +1,17 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.folderOverwritePrompt';
+
+const folderOverwritePrompt = folderName => {
+  return promptUser({
+    type: 'confirm',
+    name: 'overwrite',
+    message: i18n(`${i18nKey}.overwriteConfirm`, { folderName }),
+    default: false,
+  });
+};
+
+module.exports = {
+  folderOverwritePrompt,
+};

package/lib/{prompts.js → prompts/personalAccessKeyPrompt.js}

@@ -1,4 +1,3 @@
-const inquirer = require('inquirer');
 const open = require('open');
 const {
   OAUTH_SCOPES,
@@ -6,15 +5,11 @@ const {
 } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { API_KEY_REGEX, STRING_WITH_NO_SPACES_REGEX } = require('./regex');
+const { API_KEY_REGEX, STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+const { promptUser } = require('./promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
-const i18nKey = 'cli.lib.prompts';
-
-const promptUser = async promptConfig => {
-  const prompt = inquirer.createPromptModule();
-  return prompt(promptConfig);
-};
+const i18nKey = 'cli.lib.prompts.personalAccessKeyPrompt';
 
 /**
  * Displays notification to user that we are about to open the browser,
@@ -39,7 +34,7 @@ const personalAccessKeyPrompt = async ({ env } = {}) => {
 
 const ACCOUNT_ID = {
   name: 'accountId',
-  message: i18n(`${i18nKey}.accountId`),
+  message: i18n(`${i18nKey}.enterAccountId`),
   type: 'number',
   validate(val) {
     if (!Number.isNaN(val) && val > 0) {
@@ -51,7 +46,7 @@ const ACCOUNT_ID = {
 
 const CLIENT_ID = {
   name: 'clientId',
-  message: i18n(`${i18nKey}.clientId`),
+  message: i18n(`${i18nKey}.enterClientId`),
   validate(val) {
     if (typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidOauthClientId`);
@@ -64,7 +59,7 @@ const CLIENT_ID = {
 
 const CLIENT_SECRET = {
   name: 'clientSecret',
-  message: i18n(`${i18nKey}.clientSecret`),
+  message: i18n(`${i18nKey}.enterClientSecret`),
   validate(val) {
     if (typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidOauthClientSecret`);
@@ -79,7 +74,7 @@ const CLIENT_SECRET = {
 
 const ACCOUNT_NAME = {
   name: 'name',
-  message: i18n(`${i18nKey}.accountName`),
+  message: i18n(`${i18nKey}.enterAccountName`),
   validate(val) {
     if (typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidName`);
@@ -94,7 +89,7 @@ const ACCOUNT_NAME = {
 
 const ACCOUNT_API_KEY = {
   name: 'apiKey',
-  message: i18n(`${i18nKey}.apiKey`),
+  message: i18n(`${i18nKey}.enterApiKey`),
   validate(val) {
     if (!API_KEY_REGEX.test(val)) {
       return i18n(`${i18nKey}.errors.invalidAPIKey`);
@@ -110,7 +105,7 @@ const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
 
 const PERSONAL_ACCESS_KEY = {
   name: 'personalAccessKey',
-  message: i18n(`${i18nKey}.personalAccessKey`),
+  message: i18n(`${i18nKey}.enterPersonalAccessKey`),
   validate(val) {
     if (typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidPersonalAccessKey`);
@@ -124,7 +119,7 @@ const PERSONAL_ACCESS_KEY = {
 const SCOPES = {
   type: 'checkbox',
   name: 'scopes',
-  message: i18n(`${i18nKey}.scopes`),
+  message: i18n(`${i18nKey}.selectScopes`),
   default: DEFAULT_OAUTH_SCOPES,
   choices: OAUTH_SCOPES,
 };
@@ -132,18 +127,7 @@ const SCOPES = {
 const OAUTH_FLOW = [ACCOUNT_NAME, ACCOUNT_ID, CLIENT_ID, CLIENT_SECRET, SCOPES];
 const API_KEY_FLOW = [ACCOUNT_NAME, ACCOUNT_ID, ACCOUNT_API_KEY];
 
-const folderOverwritePrompt = folderName => {
-  return promptUser({
-    type: 'confirm',
-    name: 'overwrite',
-    message: i18n(`${i18nKey}.folderOverwrite`, { folderName }),
-    default: false,
-  });
-};
-
 module.exports = {
-  folderOverwritePrompt,
-  promptUser,
   personalAccessKeyPrompt,
   CLIENT_ID,
   CLIENT_SECRET,

package/lib/prompts/promptUtils.js

@@ -0,0 +1,10 @@
+const inquirer = require('inquirer');
+
+const promptUser = async promptConfig => {
+  const prompt = inquirer.createPromptModule();
+  return prompt(promptConfig);
+};
+
+module.exports = {
+  promptUser,
+};

package/lib/prompts/{sandboxes.js → sandboxesPrompt.js}

@@ -1,11 +1,10 @@
-const inquirer = require('inquirer');
+const { promptUser } = require('./promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
-const i18nKey = 'cli.lib.prompts.sandboxes';
+const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
-const createSandbox = () => {
-  const prompt = inquirer.createPromptModule();
-  return prompt([
+const createSandboxPrompt = () => {
+  return promptUser([
     {
       name: 'name',
       message: i18n(`${i18nKey}.enterName`),
@@ -21,5 +20,5 @@ const createSandbox = () => {
 };
 
 module.exports = {
-  createSandbox,
+  createSandboxPrompt,
 };

package/lib/prompts/secretPrompt.js

@@ -0,0 +1,25 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.secretPrompt';
+
+const SECRET_VALUE_PROMPT = {
+  name: 'secretValue',
+  type: 'password',
+  mask: '*',
+  message: i18n(`${i18nKey}.enterValue`),
+  validate(val) {
+    if (typeof val !== 'string') {
+      return i18n(`${i18nKey}.errors.invalidValue`);
+    }
+    return true;
+  },
+};
+
+function secretValuePrompt() {
+  return promptUser([SECRET_VALUE_PROMPT]);
+}
+
+module.exports = {
+  secretValuePrompt,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.10-beta.14",
+  "version": "3.0.10-beta.18",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^3.0.10-beta.13",
-    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.13",
+    "@hubspot/cli-lib": "^3.0.10-beta.18",
+    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.18",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e77b37281411b7eed123974eefd2b839d92376c8"
+  "gitHead": "c0d4e2201f2e1b8e7f79b549b92eb7845ae7cd71"
 }

package/commands/app/deploy.js

@@ -1,110 +0,0 @@
-const ora = require('ora');
-const { getEnv } = require('@hubspot/cli-lib');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
-const { logger } = require('@hubspot/cli-lib/logger');
-const { deployAppSync } = require('@hubspot/cli-lib/api/appPipeline');
-
-const {
-  getAccountId,
-  addUseEnvironmentOptions,
-} = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { outputBuildLog } = require('../../lib/serverlessLogs');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
-
-const i18nKey = 'cli.commands.app.subcommands.deploy';
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-
-const logServerlessBuildFailures = async errorDetails => {
-  const folderPaths = errorDetails.context.folderPath;
-  const buildLogUrls = errorDetails.context.serverlessBuildLogUrl;
-  for (let i = 0; i < buildLogUrls.length; i++) {
-    logger.log(`Building serverless functions in "${folderPaths[i]}":`);
-    await outputBuildLog(buildLogUrls[i]);
-  }
-  logger.error(
-    'Your app failed to build and deploy due to a problem building the serverless functions.'
-  );
-};
-
-exports.command = 'deploy <path>';
-exports.describe = false;
-
-exports.handler = async options => {
-  await loadAndValidateOptions(options);
-
-  const { path: appPath } = options;
-  const accountId = getAccountId(options);
-
-  trackCommandUsage('app-deploy', {}, accountId);
-
-  let result;
-
-  const spinner = ora(
-    i18n(`${i18nKey}.building`, {
-      accountId,
-      appPath,
-    })
-  ).start();
-  try {
-    result = await deployAppSync(accountId, appPath);
-  } catch (error) {
-    spinner.fail();
-    if (error.response && error.response.body) {
-      const errorDetails = error.response.body;
-      if (
-        errorDetails.subCategory === 'PipelineErrors.SERVERLESS_BUILD_ERROR' &&
-        errorDetails.context &&
-        Array.isArray(errorDetails.context.serverlessBuildLogUrl)
-      ) {
-        await logServerlessBuildFailures(errorDetails);
-      } else {
-        logApiErrorInstance(
-          error,
-          new ApiErrorContext({
-            accountId,
-            request: appPath,
-          })
-        );
-      }
-    } else {
-      logApiErrorInstance(
-        error,
-        new ApiErrorContext({
-          accountId,
-          request: appPath,
-        })
-      );
-    }
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  spinner.succeed();
-  logger.success(
-    i18n(`${i18nKey}.success.deployed`, {
-      appUrl: `${getHubSpotWebsiteOrigin(getEnv())}/private-apps/${accountId}/${
-        result.appId
-      }`,
-    })
-  );
-};
-
-exports.builder = yargs => {
-  yargs.positional('path', {
-    describe: i18n(`${i18nKey}.positionals.path.describe`),
-    type: 'string',
-  });
-
-  yargs.example([
-    ['$0 app deploy /example-app', i18n(`${i18nKey}.examples.default`)],
-  ]);
-
-  addUseEnvironmentOptions(yargs, true);
-
-  return yargs;
-};

package/commands/app.js

@@ -1,14 +0,0 @@
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-const deploy = require('./app/deploy');
-
-exports.command = 'app';
-exports.describe = false;
-
-exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-
-  yargs.command(deploy).demandCommand(1, '');
-
-  return yargs;
-};

package/commands/create/project.js

@@ -1,32 +0,0 @@
-const path = require('path');
-const {
-  createProjectConfig,
-  createProjectTemplateFiles,
-} = require('@hubspot/cli-lib/projects');
-const { logger } = require('@hubspot/cli-lib/logger');
-const { createProjectPrompt } = require('../../lib/prompts/projects');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
-
-const i18nKey = 'cli.commands.create.subcommands.project';
-
-module.exports = {
-  hidden: true,
-  dest: ({ name, dest }) => path.join(dest || './', name),
-  execute: async ({ dest, name }) => {
-    const { label, description, template } = await createProjectPrompt({
-      label: name,
-    });
-
-    createProjectConfig(dest, {
-      label,
-      description,
-    });
-    createProjectTemplateFiles(dest, template);
-
-    logger.success(
-      i18n(`${i18nKey}.success.projectCreated`, {
-        path: dest,
-      })
-    );
-  },
-};

package/lib/prompts/projects.js

@@ -1,43 +0,0 @@
-const inquirer = require('inquirer');
-const { PROJECT_TEMPLATE_TYPES } = require('@hubspot/cli-lib/lib/constants');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
-
-const i18nKey = 'cli.lib.prompts.projects';
-
-const createProjectPrompt = (promptOptions = {}) => {
-  const prompt = inquirer.createPromptModule();
-  return prompt([
-    {
-      type: 'list',
-      name: 'template',
-      message: i18n(`${i18nKey}.selectTemplate`),
-      default: PROJECT_TEMPLATE_TYPES.blank,
-      choices: Object.keys(PROJECT_TEMPLATE_TYPES),
-    },
-    {
-      name: 'label',
-      message: i18n(`${i18nKey}.enterLabel`),
-      validate(val) {
-        if (typeof val !== 'string') {
-          return i18n(`${i18nKey}.errors.invalidLabel`);
-        }
-        return true;
-      },
-      default: promptOptions.label || 'New project',
-    },
-    {
-      name: 'description',
-      message: i18n(`${i18nKey}.enterDescription`),
-      validate(val) {
-        if (typeof val !== 'string') {
-          return i18n(`${i18nKey}.errors.invalidDescription`);
-        }
-        return true;
-      },
-    },
-  ]);
-};
-
-module.exports = {
-  createProjectPrompt,
-};

package/lib/secretPrompt.js

@@ -1,22 +0,0 @@
-const inquirer = require('inquirer');
-
-const SECRET_VALUE_PROMPT = {
-  name: 'secretValue',
-  type: 'password',
-  mask: '*',
-  message: 'Enter a value for your secret',
-  validate(val) {
-    if (typeof val !== 'string') {
-      return 'You entered an invalid value. Please try again.';
-    }
-    return true;
-  },
-};
-
-function secretValuePrompt() {
-  const prompt = inquirer.createPromptModule();
-  return prompt([SECRET_VALUE_PROMPT]);
-}
-module.exports = {
-  secretValuePrompt,
-};