@hubspot/cli 5.1.4-beta.4 → 5.1.4-beta.6

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/dev.js

@@ -27,7 +27,6 @@ const {
   ensureProjectExists,
   handleProjectUpload,
   pollProjectBuildAndDeploy,
-  showPlatformVersionWarning,
   validateProjectConfig,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -264,8 +263,6 @@ exports.handler = async options => {
     }
 
     if (shouldCreateProject) {
-      await showPlatformVersionWarning(accountId, projectConfig);
-
       SpinniesManager.add('createProject', {
         text: i18n(`${i18nKey}.status.creatingProject`, {
           accountIdentifier: uiAccountDescription(targetAccountId),

package/commands/project/upload.js

@@ -16,7 +16,6 @@ const {
   logFeedbackMessage,
   validateProjectConfig,
   pollProjectBuildAndDeploy,
-  showPlatformVersionWarning,
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
@@ -47,8 +46,6 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await showPlatformVersionWarning(accountId, projectConfig);
-
   await ensureProjectExists(accountId, projectConfig.name, {
     forceCreate,
     uploadCommand: true,

package/commands/project/watch.js

@@ -22,7 +22,6 @@ const {
   pollDeployStatus,
   validateProjectConfig,
   logFeedbackMessage,
-  showPlatformVersionWarning,
 } = require('../../lib/projects');
 const {
   cancelStagedBuild,
@@ -104,8 +103,6 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await showPlatformVersionWarning(accountId, projectConfig);
-
   await ensureProjectExists(accountId, projectConfig.name);
 
   try {

package/lang/en.lyaml

@@ -957,7 +957,6 @@ 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:
@@ -983,10 +982,6 @@ en:
         logFeedbackMessage:
           feedbackHeader: "We'd love to hear your feedback!"
           feedbackMessage: "How are you liking the new projects and developer tools? \n > Run `{{#yellow}}hs feedback{{/yellow}}` to let us know what you think!\n"
-        showPlatformVersionWarning:
-          docsLink: "Projects platform versioning (BETA)"
-          noPlatformVersion: "No platformVersion found in hsproject.json. Falling back to default version. Starting Mar 31, 2024, new project builds without a specified version will no longer be supported. To update your project to the latest version, see {{ docsLink }}."
-          deprecatedVersion: "Starting Mar 31, 2024, new project builds with platformVersion 2023.1 or unspecified versions will no longer be supported. It's recommended that you update your project to the latest version. For more info, see {{ docsLink }}."
       ui:
         betaTag: "{{#bold}}[BETA]{{/bold}}"
         betaWarning:
@@ -1357,7 +1352,7 @@ en:
         overrideErrors:
           platformVersionErrors:
             header: "Platform version update required"
-            unspecifiedPlatformVersion: "Projects with {{#bold}}unspecified platformVersion{{/bold}} are no longer supported."
+            unspecifiedPlatformVersion: "Projects with an {{#bold}}{{platformVersion}}{{/bold}} are no longer supported."
             platformVersionRetired: "Projects with {{#bold}} platformVersion {{ platformVersion }}{{/bold}} are no longer supported."
             nonExistentPlatformVersion: "Projects with {{#bold}} platformVersion {{ platformVersion }}{{/bold}} are not supported."
             updateProject: "Please update your project to the latest version and try again."

package/lib/errorHandlers/overrideErrors.js

@@ -7,13 +7,21 @@ const { uiLine, uiLink } = require('../ui');
 
 const i18nKey = 'cli.lib.errorHandlers.overrideErrors';
 
-function createPlatformVersionError(subCategory, errorData) {
-  const platformVersion = errorData.context.PLATFORM_VERSION[0];
+function createPlatformVersionError(subCategory, errData) {
   const docsLink = uiLink(
     i18n(`${i18nKey}.platformVersionErrors.docsLink`),
     'https://developers.hubspot.com/docs/platform/platform-versioning'
   );
 
+  const platformVersionKey = {
+    [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED]:
+      'unspecified platformVersion',
+    [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED]:
+      errData.context.RETIRED_PLATFORM_VERSION,
+    [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST]:
+      errData.context.PLATFORM_VERSION,
+  };
+
   const errorTypeToTranslationKey = {
     [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED]:
       'unspecifiedPlatformVersion',
@@ -23,6 +31,7 @@ function createPlatformVersionError(subCategory, errorData) {
       'nonExistentPlatformVersion',
   };
 
+  const platformVersion = platformVersionKey[subCategory] || '';
   const translationKey = errorTypeToTranslationKey[subCategory];
 
   uiLine();

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, {
@@ -380,12 +380,8 @@ const uploadProjectFiles = async (
       })
     );
   } catch (err) {
-    SpinniesManager.fail('upload', {
-      text: i18n(`${i18nKey}.uploadProjectFiles.fail`, {
-        accountIdentifier,
-        projectName,
-      }),
-    });
+    SpinniesManager.fail('upload');
+    logApiErrorInstance(err);
 
     error = err;
   }
@@ -861,40 +857,12 @@ const createProjectComponent = async (
     componentName
   );
 
-  await downloadGitHubRepoContents(
+  await downloadGithubRepoContents(
     HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
     component.path,
     componentPath,
-    {
-      ref: projectComponentsVersion,
-    }
-  );
-};
-
-const showPlatformVersionWarning = async (accountId, projectConfig) => {
-  const platformVersion = projectConfig.platformVersion;
-  const docsLink = uiLink(
-    i18n(`${i18nKey}.showPlatformVersionWarning.docsLink`),
-    'https://developers.hubspot.com/docs/platform/platform-versioning'
+    projectComponentsVersion
   );
-
-  if (!platformVersion) {
-    logger.log('');
-    logger.warn(
-      i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersion`, {
-        docsLink,
-      })
-    );
-    logger.log('');
-  } else if (platformVersion === '2023.1') {
-    logger.log('');
-    logger.warn(
-      i18n(`${i18nKey}.showPlatformVersionWarning.deprecatedVersion`, {
-        docsLink,
-      })
-    );
-    logger.log('');
-  }
 };
 
 module.exports = {
@@ -913,5 +881,4 @@ module.exports = {
   ensureProjectExists,
   logFeedbackMessage,
   createProjectComponent,
-  showPlatformVersionWarning,
 };

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.4",
+  "version": "5.1.4-beta.6",
   "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": "ae2685fbfe44d8f2570787b9e1f818202c98f70a"
+  "gitHead": "9879ca31bcd37ca2c3b9f6d4d81fa69443d5dca4"
 }