@hubspot/cli 4.1.6-beta.0 → 4.1.6-beta.1

package/commands/upload.js

@@ -1,7 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const { walk } = require('@hubspot/cli-lib/lib/walk');
-const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
 const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
 const { getFileMapperQueryValues } = require('@hubspot/cli-lib/fileMapper');
 const { upload } = require('@hubspot/cli-lib/api/fileMapper');
@@ -28,9 +26,9 @@ const {
   getMode,
 } = require('../lib/commonOpts');
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
-const { fieldsJsPrompt } = require('../lib/prompts/cmsFieldPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
+const { getUploadableFileList } = require('../lib/upload');
 const {
   getThemePreviewUrl,
   getThemeJSONPath,
@@ -248,46 +246,6 @@ exports.handler = async options => {
   }
 };
 
-/*
- * Walks the src folder for files, filters them based on ignore filter.
- * If convertFields is true then will check for any JS fields conflicts (i.e., JS fields file and fields.json file) and prompt to resolve
- */
-const getUploadableFileList = async (src, convertFields) => {
-  const filePaths = await walk(src);
-  const allowedFiles = filePaths
-    .filter(file => {
-      if (!isAllowedExtension(file)) {
-        return false;
-      }
-      return true;
-    })
-    .filter(createIgnoreFilter());
-  if (!convertFields) {
-    return allowedFiles;
-  }
-
-  let uploadableFiles = [];
-  let skipFiles = [];
-  for (const filePath of allowedFiles) {
-    const fileName = path.basename(filePath);
-    if (skipFiles.includes(filePath)) continue;
-    const isConvertable = isConvertableFieldJs(src, filePath, convertFields);
-    if (isConvertable || fileName == 'fields.json') {
-      // This prompt checks if there are multiple field files in the folder and gets user to choose.
-      const [choice, updatedSkipFiles] = await fieldsJsPrompt(
-        filePath,
-        src,
-        skipFiles
-      );
-      skipFiles = updatedSkipFiles;
-      // If they chose something other than the current file, move on.
-      if (choice !== filePath) continue;
-    }
-    uploadableFiles.push(filePath);
-  }
-  return uploadableFiles;
-};
-
 exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);

package/commands/watch.js

@@ -17,6 +17,7 @@ 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');
+const { getUploadableFileList } = require('../lib/upload');
 
 const i18nKey = 'cli.commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -66,6 +67,8 @@ exports.handler = async options => {
     return;
   }
 
+  let filesToUpload = [];
+
   if (disableInitial) {
     logger.info(i18n(`${i18nKey}.warnings.disableInitial`));
   } else {
@@ -76,6 +79,13 @@ exports.handler = async options => {
     }
   }
 
+  if (initialUpload) {
+    filesToUpload = await getUploadableFileList(
+      absoluteSrcPath,
+      options.convertFields
+    );
+  }
+
   trackCommandUsage('watch', { mode }, accountId);
   watch(accountId, absoluteSrcPath, dest, {
     mode,
@@ -83,6 +93,7 @@ exports.handler = async options => {
     disableInitial: initialUpload ? false : true,
     notify,
     commandOptions: options,
+    filePaths: filesToUpload,
   });
 };
 
@@ -117,7 +128,6 @@ exports.builder = yargs => {
     type: 'boolean',
   });
   yargs.option('disable-initial', {
-    alias: 'd',
     describe: i18n(`${i18nKey}.options.disableInitial.describe`),
     type: 'boolean',
     hidden: true,

package/lib/upload.js

@@ -0,0 +1,50 @@
+const path = require('path');
+const { walk } = require('@hubspot/cli-lib/lib/walk');
+const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
+const { fieldsJsPrompt } = require('../lib/prompts/cmsFieldPrompt');
+const { isAllowedExtension } = require('@hubspot/cli-lib/path');
+const { isConvertableFieldJs } = require('@hubspot/cli-lib/lib/handleFieldsJs');
+
+/*
+ * Walks the src folder for files, filters them based on ignore filter.
+ * If convertFields is true then will check for any JS fields conflicts (i.e., JS fields file and fields.json file) and prompt to resolve
+ */
+const getUploadableFileList = async (src, convertFields) => {
+  const filePaths = await walk(src);
+  const allowedFiles = filePaths
+    .filter(file => {
+      if (!isAllowedExtension(file)) {
+        return false;
+      }
+      return true;
+    })
+    .filter(createIgnoreFilter());
+  if (!convertFields) {
+    return allowedFiles;
+  }
+
+  let uploadableFiles = [];
+  let skipFiles = [];
+  for (const filePath of allowedFiles) {
+    const fileName = path.basename(filePath);
+    if (skipFiles.includes(filePath)) continue;
+    const isConvertable = isConvertableFieldJs(src, filePath, convertFields);
+    if (isConvertable || fileName == 'fields.json') {
+      // This prompt checks if there are multiple field files in the folder and gets user to choose.
+      const [choice, updatedSkipFiles] = await fieldsJsPrompt(
+        filePath,
+        src,
+        skipFiles
+      );
+      skipFiles = updatedSkipFiles;
+      // If they chose something other than the current file, move on.
+      if (choice !== filePath) continue;
+    }
+    uploadableFiles.push(filePath);
+  }
+  return uploadableFiles;
+};
+
+module.exports = {
+  getUploadableFileList,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.6-beta.0",
+  "version": "4.1.6-beta.1",
   "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": "4.1.6-beta.0",
-    "@hubspot/serverless-dev-runtime": "4.1.6-beta.0",
+    "@hubspot/cli-lib": "4.1.6-beta.1",
+    "@hubspot/serverless-dev-runtime": "4.1.6-beta.1",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e6b7f76604de27bb0932671deb390a985176467b"
+  "gitHead": "886b32d3fd4385be85dfb118e58b61a24a7ac568"
 }