@hubspot/cli 5.1.4-beta.6 → 5.2.0

package/commands/accounts/use.js

@@ -4,7 +4,7 @@ const {
   getConfigPath,
   updateDefaultAccount,
   getAccountId: getAccountIdFromConfig,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');

package/commands/cms/convertFields.js

@@ -9,7 +9,7 @@ const { i18n } = require('../../lib/lang');
 const {
   FieldsJs,
   isConvertableFieldJs,
-} = require('@hubspot/local-dev-lib/cms/handleFieldsJs');
+} = require('@hubspot/local-dev-lib/cms/handleFieldsJS');
 
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');

package/commands/project/watch.js

@@ -125,12 +125,33 @@ exports.handler = async options => {
 
     // Upload all files if no build exists for this project yet
     if (initialUpload || hasNoBuilds) {
-      await handleProjectUpload(
+      const result = await handleProjectUpload(
         accountId,
         projectConfig,
         projectDir,
         startWatching
       );
+
+      if (result.uploadError) {
+        if (
+          isSpecifiedError(result.uploadError, {
+            subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
+          })
+        ) {
+          logger.log();
+          logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+          logger.log();
+        } else {
+          logApiErrorInstance(
+            result.uploadError,
+            new ApiErrorContext({
+              accountId,
+              projectName: projectConfig.name,
+            })
+          );
+        }
+        process.exit(EXIT_CODES.ERROR);
+      }
     } else {
       await startWatching();
     }

package/commands/theme/preview.js

@@ -14,7 +14,9 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { previewPrompt } = require('../../lib/prompts/previewPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { FileUploadResultType } = require('@hubspot/cli-lib/lib/uploadFolder');
+const {
+  FILE_UPLOAD_RESULT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/files');
 const i18nKey = 'cli.commands.preview';
 const cliProgress = require('cli-progress');
 const {
@@ -121,7 +123,7 @@ exports.handler = async options => {
       });
       initialUploadProgressBar.stop();
       results.forEach(result => {
-        if (result.resultType == FileUploadResultType.FAILURE) {
+        if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
           logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
           logApiUploadErrorInstance(
             result.error,

package/lang/en.lyaml

@@ -957,6 +957,7 @@ en:
           srcOutsideProjectDir: "Invalid value for 'srcDir' in {{ projectConfig }}: {{#bold}}srcDir: \"{{ srcDir }}\"{{/bold}}\n\t'srcDir' must be a relative path to a folder under the project root, such as \".\" or \"./src\""
         uploadProjectFiles:
           add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
+          fail: "Failed to upload {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
           succeed: "Uploaded {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
           buildCreated: "Project \"{{ projectName }}\" uploaded and build #{{ buildId }} created"
         handleProjectUpload:

package/lib/commonOpts.js

@@ -2,9 +2,6 @@ const {
   LOG_LEVEL,
   setLogLevel: setLoggerLogLevel,
 } = require('@hubspot/local-dev-lib/logger');
-const {
-  setLogLevel: setCliLibLoggerLogLevel,
-} = require('@hubspot/cli-lib/logger');
 const {
   DEFAULT_MODE,
   MODE,
@@ -74,14 +71,8 @@ const setLogLevel = (options = {}) => {
   const { debug } = options;
   if (debug) {
     setLoggerLogLevel(LOG_LEVEL.DEBUG);
-
-    // TODO remove this when we remove cli-lib as a dep
-    setCliLibLoggerLogLevel(LOG_LEVEL.DEBUG);
   } else {
     setLoggerLogLevel(LOG_LEVEL.LOG);
-
-    // TODO remove this when we remove cli-lib as a dep
-    setCliLibLoggerLogLevel(LOG_LEVEL.LOG);
   }
 };
 

package/lib/errorHandlers/apiErrors.js

@@ -7,9 +7,7 @@ const {
   SCOPE_GROUPS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/local-dev-lib/constants/auth');
-const {
-  fetchScopeData,
-} = require('@hubspot/cli-lib/api/localDevAuth/authenticated');
+const { fetchScopeData } = require('@hubspot/local-dev-lib/api/localDevAuth');
 const {
   debugErrorAndContext,
   logErrorInstance,

package/lib/process.js

@@ -4,7 +4,6 @@ const {
   setLogLevel,
   LOG_LEVEL,
 } = require('@hubspot/local-dev-lib/logger');
-const { setLogLevel: setCliLibLogLevel } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.process';
@@ -33,10 +32,6 @@ const handleExit = callback => {
         // Prevent logs when terminal closes
         if (isSIGHUP) {
           setLogLevel(LOG_LEVEL.NONE);
-
-          // Update the log level in cli-lib's instance of the logger
-          // We can remove this when we remove cli-lib as a dep
-          setCliLibLogLevel(LOG_LEVEL.NONE);
         }
 
         logger.debug(i18n(`${i18nKey}.exitDebug`, { signal }));

package/lib/projects.js

@@ -380,8 +380,12 @@ const uploadProjectFiles = async (
       })
     );
   } catch (err) {
-    SpinniesManager.fail('upload');
-    logApiErrorInstance(err);
+    SpinniesManager.fail('upload', {
+      text: i18n(`${i18nKey}.uploadProjectFiles.fail`, {
+        accountIdentifier,
+        projectName,
+      }),
+    });
 
     error = err;
   }

package/lib/projectsWatch.js

@@ -6,7 +6,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('./errorHandlers/apiErrors');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');

package/lib/prompts/cmsFieldPrompt.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const escapeRegExp = require('@hubspot/cli-lib/lib/escapeRegExp');
+const escapeRegExp = require('@hubspot/local-dev-lib/escapeRegExp');
 const i18nKey = 'cli.lib.prompts.uploadPrompt';
 const FIELDS_FILES = ['fields.json', 'fields.js', 'fields.cjs', 'fields.mjs'];
 

package/lib/serverlessLogs.js

@@ -9,12 +9,20 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('./errorHandlers/apiErrors');
-const { base64EncodeString } = require('@hubspot/cli-lib/lib/encoding');
 
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const TAIL_DELAY = 5000;
 
+const base64EncodeString = valueToEncode => {
+  if (typeof valueToEncode !== 'string') {
+    return valueToEncode;
+  }
+
+  const stringBuffer = Buffer.from(valueToEncode);
+  return encodeURIComponent(stringBuffer.toString('base64'));
+};
+
 const handleUserInput = () => {
   const onTerminate = async () => {
     SpinniesManager.remove('tailLogs');

package/lib/validation.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { Mode } = require('@hubspot/cli-lib');
+const { MODE } = require('@hubspot/local-dev-lib/constants/files');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
@@ -175,10 +175,10 @@ async function validateAccount(options) {
  */
 function validateMode(options) {
   const mode = getMode(options);
-  if (Mode[mode]) {
+  if (MODE[mode]) {
     return true;
   }
-  const modesMessage = `Available modes are: ${Object.values(Mode).join(
+  const modesMessage = `Available modes are: ${Object.values(MODE).join(
     ', '
   )}.`;
   if (mode != null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.4-beta.6",
+  "version": "5.2.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,7 +8,6 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^9.0.0",
     "@hubspot/local-dev-lib": "^0.3.10",
     "@hubspot/serverless-dev-runtime": "5.1.4-beta.6",
     "@hubspot/theme-preview-dev-server": "0.0.4",
@@ -46,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9879ca31bcd37ca2c3b9f6d4d81fa69443d5dca4"
+  "gitHead": "b617fec2c05af70815192d7a41127d90f5c6b6d2"
 }