@hubspot/cli 5.0.2 → 5.0.3-beta.2

package/lib/prompts/downloadProjectPrompt.js

@@ -1,5 +1,5 @@
 const { promptUser } = require('./promptUtils');
-const { getAccountId } = require('@hubspot/cli-lib/lib/config');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { fetchProjects } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,

package/lib/prompts/enterAccountNamePrompt.js

@@ -1,4 +1,4 @@
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');

package/lib/prompts/personalAccessKeyPrompt.js

@@ -3,8 +3,8 @@ const {
   OAUTH_SCOPES,
   DEFAULT_OAUTH_SCOPES,
 } = require('@hubspot/cli-lib/lib/constants');
-const { deleteEmptyConfigFile } = require('@hubspot/cli-lib/lib/config');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { promptUser } = require('./promptUtils');
 const { accountNamePrompt } = require('./enterAccountNamePrompt');

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -2,8 +2,8 @@ const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox, getAccountName } = require('../sandboxes');
-const { getAccountId } = require('@hubspot/cli-lib');
-const { getSandboxUsageLimits } = require('@hubspot/cli-lib/sandboxes');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
+const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
 const { logger } = require('@hubspot/cli-lib/logger');
 
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';

package/lib/prompts/sandboxesPrompt.js

@@ -5,7 +5,7 @@ const {
   STANDARD_SANDBOX,
   DEVELOPER_SANDBOX,
 } = require('../sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,7 +1,7 @@
 const {
   getConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 

package/lib/prompts/uploadPrompt.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { getCwd } = require('@hubspot/cli-lib/path');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 

package/lib/sandbox-create.js

@@ -17,10 +17,10 @@ const {
   isMissingScopeError,
   isSpecifiedError,
 } = require('./errorHandlers/apiErrors');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
-const { getEnv, getAccountId } = require('@hubspot/cli-lib');
-const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
-const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+const { getEnv, getAccountId } = require('@hubspot/local-dev-lib/config');
+const { createSandbox } = require('@hubspot/local-dev-lib/sandboxes');
+const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 
 const i18nKey = 'cli.lib.sandbox.create';
 

package/lib/sandbox-sync.js

@@ -1,5 +1,5 @@
 const SpinniesManager = require('./SpinniesManager');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('./lang');
 const {
@@ -10,7 +10,7 @@ const {
   sandboxTypeMap,
   syncTypes,
 } = require('./sandboxes');
-const { initiateSync } = require('@hubspot/cli-lib/sandboxes');
+const { initiateSync } = require('@hubspot/local-dev-lib/sandboxes');
 const {
   debugErrorAndContext,
   logErrorInstance,
@@ -20,7 +20,7 @@ const {
   isMissingScopeError,
 } = require('./errorHandlers/apiErrors');
 const { getSandboxTypeAsString } = require('./sandboxes');
-const { getAccountId } = require('@hubspot/cli-lib');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');
 
 const i18nKey = 'cli.lib.sandbox.sync';

package/lib/sandboxes.js

@@ -1,9 +1,3 @@
-const {
-  getConfig,
-  writeConfig,
-  updateAccountConfig,
-  getAccountId,
-} = require('@hubspot/cli-lib');
 const chalk = require('chalk');
 const { i18n } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
@@ -17,11 +11,17 @@ const {
   fetchTaskStatus,
   fetchTypes,
   getSandboxUsageLimits,
-} = require('@hubspot/cli-lib/sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/sandboxes');
+const {
+  accountNameExistsInConfig,
+  getConfig,
+  writeConfig,
+  updateAccountConfig,
+  getAccountId,
+} = require('@hubspot/local-dev-lib/config');
 const CliProgressMultibarManager = require('./CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   personalAccessKeyPrompt,
 } = require('./prompts/personalAccessKeyPrompt');

package/lib/schema.js

@@ -27,5 +27,6 @@ const listSchemas = async accountId => {
 };
 
 module.exports = {
+  logSchemas,
   listSchemas,
 };

package/lib/ui.js

@@ -1,7 +1,7 @@
 const chalk = require('chalk');
 const supportsHyperlinks = require('../lib/supportHyperlinks');
 const supportsColor = require('../lib/supportsColor');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 

package/lib/upload.js

@@ -1,16 +1,22 @@
 const path = require('path');
-const { walk } = require('@hubspot/cli-lib/lib/walk');
-const { createIgnoreFilter } = require('@hubspot/cli-lib/ignoreRules');
+const { walk } = require('@hubspot/local-dev-lib/fs');
+const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
 const { fieldsJsPrompt } = require('../lib/prompts/cmsFieldPrompt');
-const { isAllowedExtension } = require('@hubspot/cli-lib/path');
+const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const { isConvertableFieldJs } = require('@hubspot/cli-lib/lib/handleFieldsJs');
+const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 /*
  * 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);
+  let filePaths = [];
+  try {
+    filePaths = await walk(src);
+  } catch (e) {
+    logErrorInstance(e);
+  }
   const allowedFiles = filePaths
     .filter(file => {
       if (!isAllowedExtension(file)) {

package/lib/usageTracking.js

@@ -1,6 +1,8 @@
-const { trackUsage } = require('@hubspot/cli-lib/api/fileMapper');
-const { getAccountConfig } = require('@hubspot/cli-lib');
-const { isTrackingAllowed } = require('@hubspot/cli-lib/lib/config');
+const { trackUsage } = require('@hubspot/local-dev-lib/trackUsage');
+const {
+  isTrackingAllowed,
+  getAccountConfig,
+} = require('@hubspot/local-dev-lib/config');
 const { API_KEY_AUTH_METHOD } = require('@hubspot/cli-lib/lib/constants');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { version } = require('../package.json');
@@ -136,7 +138,7 @@ const trackAuthAction = async (command, authType, step, accountId) => {
     step,
   };
   try {
-    const response = await trackUsage(
+    await trackUsage(
       'cli-interaction',
       EventClass.INTERACTION,
       usageTrackingEvent,
@@ -144,8 +146,6 @@ const trackAuthAction = async (command, authType, step, accountId) => {
     );
 
     logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
-
-    return response;
   } catch (e) {
     logger.debug('Auth action tracking failed: %s', e.message);
   }

package/lib/validation.js

@@ -1,25 +1,24 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  getAccountConfig,
-  loadConfigFromEnvironment,
-  Mode,
-  loadConfig,
-  getConfigPath,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
+const { Mode, checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/cli-lib/lib/constants');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
-const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
+const {
+  loadConfig,
+  getConfigPath,
+  validateConfig,
+  getAccountConfig,
+  loadConfigFromEnvironment,
+} = require('@hubspot/local-dev-lib/config');
+const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
 } = require('@hubspot/cli-lib/personalAccessKey');
-const { getCwd, getExt } = require('@hubspot/cli-lib/path');
+const { getCwd, getExt } = require('@hubspot/local-dev-lib/path');
 const { getAccountId, getMode, setLogLevel } = require('./commonOpts');
 const { logDebugInfo } = require('./debugInfo');
 const fs = require('fs');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.0.2",
+  "version": "5.0.3-beta.2",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,10 +8,10 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^5.0.1",
-    "@hubspot/local-dev-lib": "^0.0.7",
-    "@hubspot/serverless-dev-runtime": "5.0.2",
-    "@hubspot/ui-extensions-dev-server": "^0.8.0",
+    "@hubspot/cli-lib": "^7.0.0",
+    "@hubspot/local-dev-lib": "^0.0.11",
+    "@hubspot/serverless-dev-runtime": "5.0.3-beta.2",
+    "@hubspot/ui-extensions-dev-server": "0.8.4",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44cbdf6dae130e268015d3e9afb612729b539915"
+  "gitHead": "7f80c0ccf8a6b02e0e9be366cff2b418b85e3d3b"
 }