@hubspot/cli 5.1.4-beta.5 → 5.1.4-beta.7

package/commands/create/api-sample.js

@@ -8,10 +8,10 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');
 const ora = require('ora');
-const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
-// TODO: Swap to local-dev-lib after swapping github utils dep
-const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
-const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
+const {
+  fetchFileFromRepository,
+  cloneGithubRepo,
+} = require('@hubspot/local-dev-lib/github');
 const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.create.subcommands.apiSample';
@@ -39,7 +39,7 @@ module.exports = {
     }
     const downloadSpinner = ora(i18n(`${i18nKey}.loading.apiSamples`));
     downloadSpinner.start();
-    const samplesConfig = await fetchJsonFromRepository(
+    const samplesConfig = await fetchFileFromRepository(
       'HubSpot/sample-apps-list',
       'samples.json',
       'main'
@@ -62,16 +62,11 @@ module.exports = {
         sampleLanguage,
       })
     );
-    const created = await cloneGitHubRepo(
-      filePath,
-      assetType,
-      `HubSpot/${sampleType}`,
-      sampleLanguage,
-      {
-        ...options,
-        releaseType: GITHUB_RELEASE_TYPES.REPOSITORY,
-      }
-    );
+    const created = await cloneGithubRepo(`HubSpot/${sampleType}`, filePath, {
+      type: assetType,
+      sourceDir: sampleLanguage,
+      ...options,
+    });
     if (created) {
       if (fs.existsSync(`${filePath}/.env.template`)) {
         fs.copySync(`${filePath}/.env.template`, `${filePath}/.env`);

package/commands/create/app.js

@@ -1,14 +1,11 @@
-const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
+const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
 
 module.exports = {
   hidden: true,
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(
-      dest,
-      assetType,
-      'HubSpot/crm-card-weather-app',
-      '',
-      options
-    ),
+    cloneGithubRepo('HubSpot/crm-card-weather-app', dest, {
+      type: assetType,
+      ...options,
+    }),
 };

package/commands/create/react-app.js

@@ -1,13 +1,10 @@
-const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
+const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(
-      dest,
-      assetType,
-      'HubSpot/cms-react-boilerplate',
-      '',
-      options
-    ),
+    cloneGithubRepo('HubSpot/cms-react-boilerplate', dest, {
+      type: assetType,
+      ...options,
+    }),
 };

package/commands/create/vue-app.js

@@ -1,13 +1,10 @@
-const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
+const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(
-      dest,
-      assetType,
-      'HubSpot/cms-vue-boilerplate',
-      '',
-      options
-    ),
+    cloneGithubRepo('HubSpot/cms-vue-boilerplate', dest, {
+      type: assetType,
+      ...options,
+    }),
 };

package/commands/create/webpack-serverless.js

@@ -1,13 +1,10 @@
-const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
+const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(
-      dest,
-      assetType,
-      'HubSpot/cms-webpack-serverless-boilerplate',
-      '',
-      options
-    ),
+    cloneGithubRepo('HubSpot/cms-webpack-serverless-boilerplate', dest, {
+      type: assetType,
+      ...options,
+    }),
 };

package/commands/create/website-theme.js

@@ -1,9 +1,7 @@
-const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
-// TODO: Swap to local-dev-lib after swapping github utils dep
-const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const { cloneGithubRepo } = require('@hubspot/local-dev-lib/github');
 const { getIsInProject } = require('../../lib/projects');
 
-const PROJECT_BOILERPLATE_REF = 'cms-boilerplate-developer-projects';
+const PROJECT_BOILERPLATE_BRANCH = 'cms-boilerplate-developer-projects';
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
@@ -11,16 +9,12 @@ module.exports = {
     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;
+      options.branch = PROJECT_BOILERPLATE_BRANCH;
     }
-    cloneGitHubRepo(
-      dest,
-      assetType,
-      'HubSpot/cms-theme-boilerplate',
-      'src',
-      options
-    );
+    cloneGithubRepo('HubSpot/cms-theme-boilerplate', dest, {
+      type: assetType,
+      sourceDir: 'src',
+      ...options,
+    });
   },
 };

package/commands/project/add.js

@@ -1,7 +1,7 @@
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const { fetchReleaseData } = require('@hubspot/cli-lib/github');
+const { fetchReleaseData } = require('@hubspot/local-dev-lib/github');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');

package/commands/project/create.js

@@ -19,7 +19,7 @@ const {
   HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
 } = require('../../lib/constants');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { fetchReleaseData } = require('@hubspot/cli-lib/github');
+const { fetchReleaseData } = require('@hubspot/local-dev-lib/github');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
 

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/lib/projects.js

@@ -30,7 +30,7 @@ const {
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getCwd, getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
-const { downloadGitHubRepoContents } = require('@hubspot/cli-lib/github');
+const { downloadGithubRepoContents } = require('@hubspot/local-dev-lib/github');
 const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiLink, uiAccountDescription } = require('../lib/ui');
@@ -137,11 +137,11 @@ const createProjectConfig = async (
 
   const hasCustomTemplateSource = Boolean(templateSource);
 
-  await downloadGitHubRepoContents(
+  await downloadGithubRepoContents(
     templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
     template.path,
     projectPath,
-    hasCustomTemplateSource ? {} : { ref: githubRef }
+    hasCustomTemplateSource ? undefined : githubRef
   );
   const _config = JSON.parse(fs.readFileSync(projectConfigPath));
   writeProjectConfig(projectConfigPath, {
@@ -861,13 +861,11 @@ const createProjectComponent = async (
     componentName
   );
 
-  await downloadGitHubRepoContents(
+  await downloadGithubRepoContents(
     HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
     component.path,
     componentPath,
-    {
-      ref: projectComponentsVersion,
-    }
+    projectComponentsVersion
   );
 };
 

package/lib/prompts/createProjectPrompt.js

@@ -2,7 +2,7 @@ const path = require('path');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { PROJECT_COMPONENT_TYPES } = require('../../lib/constants');
 const { promptUser } = require('./promptUtils');
-const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
+const { fetchFileFromRepository } = require('@hubspot/local-dev-lib/github');
 const { i18n } = require('../lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -29,11 +29,10 @@ const createTemplateOptions = async (templateSource, githubRef) => {
     ? DEFAULT_PROJECT_TEMPLATE_BRANCH
     : githubRef;
 
-  const config = await fetchJsonFromRepository(
+  const config = await fetchFileFromRepository(
     templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
     'config.json',
-    branch,
-    hasCustomTemplateSource
+    branch
   );
 
   if (!config || !config[PROJECT_COMPONENT_TYPES.PROJECTS]) {

package/lib/prompts/projectAddPrompt.js

@@ -1,5 +1,5 @@
 const { promptUser } = require('./promptUtils');
-const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
+const { fetchFileFromRepository } = require('@hubspot/local-dev-lib/github');
 const { i18n } = require('../lang');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('../constants');
 const { PROJECT_COMPONENT_TYPES } = require('../constants');
@@ -7,7 +7,7 @@ const { PROJECT_COMPONENT_TYPES } = require('../constants');
 const i18nKey = 'cli.lib.prompts.projectAddPrompt';
 
 const createTypeOptions = async projectComponentsVersion => {
-  const config = await fetchJsonFromRepository(
+  const config = await fetchFileFromRepository(
     HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
     'config.json',
     projectComponentsVersion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.4-beta.5",
+  "version": "5.1.4-beta.7",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@hubspot/cli-lib": "^9.0.0",
-    "@hubspot/local-dev-lib": "^0.3.9",
-    "@hubspot/serverless-dev-runtime": "5.1.4-beta.4",
+    "@hubspot/local-dev-lib": "^0.3.10",
+    "@hubspot/serverless-dev-runtime": "5.1.4-beta.6",
     "@hubspot/theme-preview-dev-server": "0.0.4",
     "@hubspot/ui-extensions-dev-server": "0.8.11",
     "archiver": "^5.3.0",
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dc62da1131e837df474dcac43252f3b1f67139f5"
+  "gitHead": "8e157c07923d5efa727a44f7ac542e9d13eac113"
 }