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

package/commands/upload.js

@@ -26,6 +26,7 @@ const {
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
+const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getThemePreviewUrl } = require('@hubspot/cli-lib/lib/files');
@@ -34,7 +35,7 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-exports.command = 'upload <src> <dest>';
+exports.command = 'upload [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 const logThemePreview = (filePath, accountId) => {
@@ -50,8 +51,6 @@ const logThemePreview = (filePath, accountId) => {
 };
 
 exports.handler = async options => {
-  const { src, dest } = options;
-
   await loadAndValidateOptions(options);
 
   if (!validateMode(options)) {
@@ -60,6 +59,12 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
   const mode = getMode(options);
+
+  const uploadPromptAnswers = await uploadPrompt(options);
+
+  const src = options.src || uploadPromptAnswers.src;
+  const dest = options.dest || uploadPromptAnswers.dest;
+
   const absoluteSrcPath = path.resolve(getCwd(), src);
   let stats;
   try {

package/commands/watch.js

@@ -13,6 +13,7 @@ const {
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
+const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -20,11 +21,11 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-exports.command = 'watch <src> <dest>';
+exports.command = 'watch [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  const { src, dest, remove, initialUpload, disableInitial, notify } = options;
+  const { remove, initialUpload, disableInitial, notify } = options;
 
   await loadAndValidateOptions(options);
 
@@ -35,6 +36,11 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const mode = getMode(options);
 
+  const uploadPromptAnswers = await uploadPrompt(options);
+
+  const src = options.src || uploadPromptAnswers.src;
+  const dest = options.dest || uploadPromptAnswers.dest;
+
   const absoluteSrcPath = path.resolve(getCwd(), src);
   try {
     const stats = fs.statSync(absoluteSrcPath);

package/lib/prompts/uploadPrompt.js

@@ -0,0 +1,39 @@
+const path = require('path');
+const { getCwd } = require('@hubspot/cli-lib/path');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.uploadPrompt';
+
+const uploadPrompt = (promptOptions = {}) => {
+  return promptUser([
+    {
+      name: 'src',
+      message: i18n(`${i18nKey}.enterSrc`),
+      when: !promptOptions.src,
+      default: '.',
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.srcRequired`);
+        }
+        return true;
+      },
+    },
+    {
+      name: 'dest',
+      message: i18n(`${i18nKey}.enterDest`),
+      when: !promptOptions.dest,
+      default: path.basename(getCwd()),
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.destRequired`);
+        }
+        return true;
+      },
+    },
+  ]);
+};
+
+module.exports = {
+  uploadPrompt,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.13-beta.3",
+  "version": "3.0.13-beta.4",
   "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.13-beta.3",
-    "@hubspot/serverless-dev-runtime": "3.0.13-beta.3",
+    "@hubspot/cli-lib": "3.0.13-beta.4",
+    "@hubspot/serverless-dev-runtime": "3.0.13-beta.4",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "34e55c31dee127f375faaddbbe0f71940c01c860"
+  "gitHead": "470770a002f503df0538286c22e990639033e572"
 }