@hubspot/cli 5.0.1-beta.0 → 5.0.2-beta.0

package/commands/create/api-sample.js

@@ -40,7 +40,8 @@ module.exports = {
     downloadSpinner.start();
     const samplesConfig = await fetchJsonFromRepository(
       'HubSpot/sample-apps-list',
-      'main/samples.json'
+      'samples.json',
+      'main'
     );
     downloadSpinner.stop();
     if (!samplesConfig) {
@@ -63,7 +64,7 @@ module.exports = {
     const created = await cloneGitHubRepo(
       filePath,
       assetType,
-      sampleType,
+      `HubSpot/${sampleType}`,
       sampleLanguage,
       {
         ...options,

package/commands/create/app.js

@@ -4,5 +4,11 @@ module.exports = {
   hidden: true,
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(dest, assetType, 'crm-card-weather-app', '', options),
+    cloneGitHubRepo(
+      dest,
+      assetType,
+      'HubSpot/crm-card-weather-app',
+      '',
+      options
+    ),
 };

package/commands/create/react-app.js

@@ -3,5 +3,11 @@ const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(dest, assetType, 'cms-react-boilerplate', '', options),
+    cloneGitHubRepo(
+      dest,
+      assetType,
+      'HubSpot/cms-react-boilerplate',
+      '',
+      options
+    ),
 };

package/commands/create/vue-app.js

@@ -3,5 +3,11 @@ const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    cloneGitHubRepo(dest, assetType, 'cms-vue-boilerplate', '', options),
+    cloneGitHubRepo(
+      dest,
+      assetType,
+      'HubSpot/cms-vue-boilerplate',
+      '',
+      options
+    ),
 };

package/commands/create/webpack-serverless.js

@@ -6,7 +6,7 @@ module.exports = {
     cloneGitHubRepo(
       dest,
       assetType,
-      'cms-webpack-serverless-boilerplate',
+      'HubSpot/cms-webpack-serverless-boilerplate',
       '',
       options
     ),

package/commands/create/website-theme.js

@@ -14,6 +14,12 @@ module.exports = {
       // releaseType has to be 'REPOSITORY' to download a specific branch
       options.releaseType = GITHUB_RELEASE_TYPES.REPOSITORY;
     }
-    cloneGitHubRepo(dest, assetType, 'cms-theme-boilerplate', 'src', options);
+    cloneGitHubRepo(
+      dest,
+      assetType,
+      'HubSpot/cms-theme-boilerplate',
+      'src',
+      options
+    );
   },
 };

package/commands/project/add.js

@@ -1,6 +1,7 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getAccountId } = require('@hubspot/cli-lib/lib/config');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const { fetchReleaseData } = require('@hubspot/cli-lib/github');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
@@ -8,6 +9,9 @@ const { projectAddPrompt } = require('../../lib/prompts/projectAddPrompt');
 const { createProjectComponent } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiBetaTag } = require('../../lib/ui');
+const {
+  HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+} = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.project.subcommands.add';
 
@@ -22,12 +26,25 @@ exports.handler = async options => {
   logger.log('');
   logger.log(i18n(`${i18nKey}.creatingComponent.message`));
   logger.log('');
-  const { type, name } = await projectAddPrompt(options);
+
+  const releaseData = await fetchReleaseData(
+    HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH
+  );
+  const projectComponentsVersion = releaseData.tag_name;
+
+  const { type, name } = await projectAddPrompt(
+    projectComponentsVersion,
+    options
+  );
 
   trackCommandUsage('project-add', null, accountId);
 
   try {
-    await createProjectComponent(options.type || type, options.name || name);
+    await createProjectComponent(
+      options.type || type,
+      options.name || name,
+      projectComponentsVersion
+    );
     logger.log('');
     logger.log(
       i18n(`${i18nKey}.success.message`, {

package/commands/project/create.js

@@ -15,7 +15,11 @@ const {
 const { createProjectConfig } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');
+const {
+  HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+} = require('../../lib/constants');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { fetchReleaseData } = require('@hubspot/cli-lib/github');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
 
@@ -27,7 +31,21 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  const { name, template, location } = await createProjectPrompt(options);
+  const hasCustomTemplateSource = Boolean(options.templateSource);
+
+  let githubRef = '';
+
+  if (!hasCustomTemplateSource) {
+    const releaseData = await fetchReleaseData(
+      HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH
+    );
+    githubRef = releaseData.tag_name;
+  }
+
+  const { name, template, location } = await createProjectPrompt(
+    githubRef,
+    options
+  );
 
   trackCommandUsage(
     'project-create',
@@ -39,7 +57,8 @@ exports.handler = async options => {
     path.resolve(getCwd(), options.location || location),
     options.name || name,
     template || { path: options.template },
-    options.templateSource
+    options.templateSource,
+    githubRef
   );
 
   logger.log('');

package/lib/constants.js

@@ -0,0 +1,8 @@
+const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH =
+  'HubSpot/hubspot-project-components';
+const DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
+
+module.exports = {
+  HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+  DEFAULT_PROJECT_TEMPLATE_BRANCH,
+};

package/lib/interpolation.js

@@ -19,8 +19,11 @@ const isHelperIdentifier = identifier => {
 
 const generateReplaceFn = (matchedText, startIndex, replacementString) => {
   return currentStringValue =>
-    `${currentStringValue.slice(0, startIndex)}${replacementString ||
-      ''}${currentStringValue.slice(startIndex + matchedText.length)}`;
+    `${currentStringValue.slice(0, startIndex)}${
+      replacementString !== null && replacementString !== undefined
+        ? replacementString
+        : ''
+    }${currentStringValue.slice(startIndex + matchedText.length)}`;
 };
 
 /**

package/lib/projectStructure.js

@@ -32,11 +32,13 @@ function getAppCardConfigs(appConfig, appPath) {
 
   if (cards) {
     cards.forEach(({ file }) => {
-      const cardConfigPath = path.join(appPath, file);
-      const cardConfig = loadConfigFile(cardConfigPath);
+      if (typeof file === 'string') {
+        const cardConfigPath = path.join(appPath, file);
+        const cardConfig = loadConfigFile(cardConfigPath);
 
-      if (cardConfig) {
-        cardConfigs.push(cardConfig);
+        if (cardConfig) {
+          cardConfigs.push(cardConfig);
+        }
       }
     });
   }
@@ -84,14 +86,16 @@ async function findProjectComponents(projectSourceDir) {
           0,
           projectFile.indexOf(APP_COMPONENT_CONFIG)
         );
-        const isLegacy = getIsLegacyApp(parsedAppConfig, appPath);
-
-        components.push({
-          type: COMPONENT_TYPES.app,
-          config: parsedAppConfig,
-          runnable: !isLegacy,
-          path: appPath,
-        });
+        if (typeof appPath === 'string') {
+          const isLegacy = getIsLegacyApp(parsedAppConfig, appPath);
+
+          components.push({
+            type: COMPONENT_TYPES.app,
+            config: parsedAppConfig,
+            runnable: !isLegacy,
+            path: appPath,
+          });
+        }
       }
     }
   });

package/lib/projects.js

@@ -45,6 +45,7 @@ const {
   isSpecifiedError,
   isSpecifiedHubSpotAuthError,
 } = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('./constants');
 
 const i18nKey = 'cli.lib.projects';
 
@@ -96,7 +97,8 @@ const createProjectConfig = async (
   projectPath,
   projectName,
   template,
-  templateSource
+  templateSource,
+  githubRef
 ) => {
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 
@@ -133,7 +135,14 @@ const createProjectConfig = async (
     }`
   );
 
-  await downloadGitHubRepoContents(templateSource, template.path, projectPath);
+  const hasCustomTemplateSource = Boolean(templateSource);
+
+  await downloadGitHubRepoContents(
+    templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+    template.path,
+    projectPath,
+    hasCustomTemplateSource ? {} : { ref: githubRef }
+  );
   const _config = JSON.parse(fs.readFileSync(projectConfigPath));
   writeProjectConfig(projectConfigPath, {
     ..._config,
@@ -796,7 +805,11 @@ const logFeedbackMessage = buildId => {
   }
 };
 
-const createProjectComponent = async (component, name) => {
+const createProjectComponent = async (
+  component,
+  name,
+  projectComponentsVersion
+) => {
   const i18nKey = 'cli.commands.project.subcommands.add';
   let componentName = name;
 
@@ -815,9 +828,12 @@ const createProjectComponent = async (component, name) => {
   );
 
   await downloadGitHubRepoContents(
-    'HubSpot/hubspot-project-components',
+    HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
     component.path,
-    componentPath
+    componentPath,
+    {
+      ref: projectComponentsVersion,
+    }
   );
 };
 

package/lib/prompts/createProjectPrompt.js

@@ -9,6 +9,10 @@ const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { i18n } = require('../lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const {
+  HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+  DEFAULT_PROJECT_TEMPLATE_BRANCH,
+} = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.createProjectPrompt';
 
@@ -20,12 +24,17 @@ const hasAllProperties = projectList => {
   );
 };
 
-const createTemplateOptions = async templateSource => {
-  const isTemplateSource = !!templateSource;
+const createTemplateOptions = async (templateSource, githubRef) => {
+  const hasCustomTemplateSource = Boolean(templateSource);
+  let branch = hasCustomTemplateSource
+    ? DEFAULT_PROJECT_TEMPLATE_BRANCH
+    : githubRef;
+
   const config = await fetchJsonFromRepository(
-    templateSource,
-    'main/config.json',
-    isTemplateSource
+    templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+    'config.json',
+    branch,
+    hasCustomTemplateSource
   );
 
   if (!config || !config[PROJECT_COMPONENT_TYPES.PROJECTS]) {
@@ -41,9 +50,10 @@ const createTemplateOptions = async templateSource => {
   return config[PROJECT_COMPONENT_TYPES.PROJECTS];
 };
 
-const createProjectPrompt = async (promptOptions = {}) => {
+const createProjectPrompt = async (githubRef, promptOptions = {}) => {
   const projectTemplates = await createTemplateOptions(
-    promptOptions.templateSource
+    promptOptions.templateSource,
+    githubRef
   );
 
   return promptUser([

package/lib/prompts/projectAddPrompt.js

@@ -1,21 +1,26 @@
 const { promptUser } = require('./promptUtils');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { i18n } = require('../lang');
+const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('../constants');
 const { PROJECT_COMPONENT_TYPES } = require('@hubspot/cli-lib/lib/constants');
 
 const i18nKey = 'cli.lib.prompts.projectAddPrompt';
 
-const createTypeOptions = async () => {
+const createTypeOptions = async projectComponentsVersion => {
   const config = await fetchJsonFromRepository(
-    'HubSpot/hubspot-project-components',
-    'main/config.json'
+    HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
+    'config.json',
+    projectComponentsVersion
   );
 
   return config[PROJECT_COMPONENT_TYPES.COMPONENTS];
 };
 
-const projectAddPrompt = async (promptOptions = {}) => {
-  const components = await createTypeOptions();
+const projectAddPrompt = async (
+  projectComponentsVersion,
+  promptOptions = {}
+) => {
+  const components = await createTypeOptions(projectComponentsVersion);
   return promptUser([
     {
       name: 'type',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.0.1-beta.0",
+  "version": "5.0.2-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^4.2.2",
+    "@hubspot/cli-lib": "^5.0.1",
     "@hubspot/serverless-dev-runtime": "4.2.1-beta.3",
     "@hubspot/ui-extensions-dev-server": "^0.7.2",
     "archiver": "^5.3.0",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "50781b4dba44aef14d5357a25692e46689141aa3"
+  "gitHead": "539e279526f9554f840b857bf4873a3b856684a3"
 }