@hubspot/cli 3.0.10 → 3.0.12-beta.0

package/bin/hubspot

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('./cli');

package/commands/project/upload.js

@@ -1,9 +1,4 @@
 const chalk = require('chalk');
-const fs = require('fs');
-const path = require('path');
-const archiver = require('archiver');
-const tmp = require('tmp');
-const Spinnies = require('spinnies');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -11,84 +6,25 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
 const { uiLine, uiAccountDescription } = require('../../lib/ui');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { uploadProject } = require('@hubspot/cli-lib/api/dfs');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {
+  ensureProjectExists,
   getProjectConfig,
-  validateProjectConfig,
+  handleProjectUpload,
   pollBuildStatus,
-  ensureProjectExists,
   pollDeployStatus,
+  validateProjectConfig,
 } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'upload [path]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
-const uploadProjectFiles = async (accountId, projectName, filePath) => {
-  const spinnies = new Spinnies({
-    succeedColor: 'white',
-  });
-  const accountIdentifier = uiAccountDescription(accountId);
-
-  spinnies.add('upload', {
-    text: i18n(`${i18nKey}.loading.upload.add`, {
-      accountIdentifier,
-      projectName,
-    }),
-  });
-
-  let buildId;
-
-  try {
-    const upload = await uploadProject(accountId, projectName, filePath);
-
-    buildId = upload.buildId;
-
-    spinnies.succeed('upload', {
-      text: i18n(`${i18nKey}.loading.upload.succeed`, {
-        accountIdentifier,
-        projectName,
-      }),
-    });
-
-    logger.debug(
-      i18n(`${i18nKey}.debug.buildCreated`, {
-        buildId,
-        projectName,
-      })
-    );
-  } catch (err) {
-    spinnies.fail('upload', {
-      text: i18n(`${i18nKey}.loading.upload.fail`, {
-        accountIdentifier,
-        projectName,
-      }),
-    });
-
-    logApiErrorInstance(
-      err,
-      new ApiErrorContext({
-        accountId,
-        projectName,
-      })
-    );
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  return { buildId };
-};
-
 exports.handler = async options => {
   await loadAndValidateOptions(options);
 
@@ -103,30 +39,8 @@ exports.handler = async options => {
 
   await ensureProjectExists(accountId, projectConfig.name, forceCreate);
 
-  const tempFile = tmp.fileSync({ postfix: '.zip' });
-
-  logger.debug(
-    i18n(`${i18nKey}.debug.compressing`, {
-      path: tempFile.name,
-    })
-  );
-
-  const output = fs.createWriteStream(tempFile.name);
-  const archive = archiver('zip');
-
-  output.on('close', async function() {
+  const startPolling = async (tempFile, buildId) => {
     let exitCode = EXIT_CODES.SUCCESS;
-    logger.debug(
-      i18n(`${i18nKey}.debug.compressed`, {
-        byteCount: archive.pointer(),
-      })
-    );
-
-    const { buildId } = await uploadProjectFiles(
-      accountId,
-      projectConfig.name,
-      tempFile.name
-    );
 
     const {
       isAutoDeployEnabled,
@@ -183,21 +97,9 @@ exports.handler = async options => {
     }
 
     process.exit(exitCode);
-  });
-
-  archive.on('error', function(err) {
-    throw err;
-  });
-
-  archive.pipe(output);
-
-  archive.directory(
-    path.resolve(projectDir, projectConfig.srcDir),
-    false,
-    file => (shouldIgnoreFile(file.name) ? false : file)
-  );
+  };
 
-  archive.finalize();
+  await handleProjectUpload(accountId, projectConfig, projectDir, startPolling);
 };
 
 exports.builder = yargs => {

package/commands/project/watch.js

@@ -1,6 +1,5 @@
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { createWatcher } = require('@hubspot/cli-lib/projectsWatch');
-const { cancelStagedBuild } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,
   ApiErrorContext,
@@ -14,11 +13,17 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
+  ensureProjectExists,
   getProjectConfig,
-  validateProjectConfig,
+  handleProjectUpload,
   pollBuildStatus,
   pollDeployStatus,
+  validateProjectConfig,
 } = require('../../lib/projects');
+const {
+  cancelStagedBuild,
+  fetchProjectBuilds,
+} = require('@hubspot/cli-lib/api/dfs');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
@@ -76,13 +81,35 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await createWatcher(
+  await ensureProjectExists(accountId, projectConfig.name);
+
+  const { results } = await fetchProjectBuilds(
     accountId,
-    projectConfig,
-    projectDir,
-    handleBuildStatus,
-    handleSigInt
+    projectConfig.name,
+    options
   );
+
+  const startWatching = async () => {
+    await createWatcher(
+      accountId,
+      projectConfig,
+      projectDir,
+      handleBuildStatus,
+      handleSigInt
+    );
+  };
+
+  // Upload all files if no build exists for this project yet
+  if (!results || !results.length) {
+    await handleProjectUpload(
+      accountId,
+      projectConfig,
+      projectDir,
+      startWatching
+    );
+  } else {
+    await startWatching();
+  }
 };
 
 exports.builder = yargs => {

package/lib/projects.js

@@ -1,6 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
-
+const archiver = require('archiver');
+const tmp = require('tmp');
 const chalk = require('chalk');
 const findup = require('findup-sync');
 const Spinnies = require('spinnies');
@@ -22,15 +23,18 @@ const {
   getBuildStatus,
   getDeployStatus,
   fetchProject,
+  uploadProject,
 } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
+const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiAccountDescription } = require('../lib/ui');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const PROJECT_STRINGS = {
   BUILD: {
@@ -232,6 +236,108 @@ const getProjectDetailUrl = (projectName, accountId) => {
   return `${baseUrl}/developer-projects/${accountId}/project/${projectName}`;
 };
 
+const uploadProjectFiles = async (accountId, projectName, filePath) => {
+  const i18nKey = 'cli.commands.project.subcommands.upload';
+  const spinnies = new Spinnies({
+    succeedColor: 'white',
+  });
+  const accountIdentifier = uiAccountDescription(accountId);
+
+  spinnies.add('upload', {
+    text: i18n(`${i18nKey}.loading.upload.add`, {
+      accountIdentifier,
+      projectName,
+    }),
+  });
+
+  let buildId;
+
+  try {
+    const upload = await uploadProject(accountId, projectName, filePath);
+
+    buildId = upload.buildId;
+
+    spinnies.succeed('upload', {
+      text: i18n(`${i18nKey}.loading.upload.succeed`, {
+        accountIdentifier,
+        projectName,
+      }),
+    });
+
+    logger.debug(
+      i18n(`${i18nKey}.debug.buildCreated`, {
+        buildId,
+        projectName,
+      })
+    );
+  } catch (err) {
+    spinnies.fail('upload', {
+      text: i18n(`${i18nKey}.loading.upload.fail`, {
+        accountIdentifier,
+        projectName,
+      }),
+    });
+
+    logApiErrorInstance(
+      err,
+      new ApiErrorContext({
+        accountId,
+        projectName,
+      })
+    );
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  return { buildId };
+};
+
+const handleProjectUpload = async (
+  accountId,
+  projectConfig,
+  projectDir,
+  callbackFunc
+) => {
+  const i18nKey = 'cli.commands.project.subcommands.upload';
+  const tempFile = tmp.fileSync({ postfix: '.zip' });
+
+  logger.debug(
+    i18n(`${i18nKey}.debug.compressing`, {
+      path: tempFile.name,
+    })
+  );
+
+  const output = fs.createWriteStream(tempFile.name);
+  const archive = archiver('zip');
+
+  output.on('close', async function() {
+    logger.debug(
+      i18n(`${i18nKey}.debug.compressed`, {
+        byteCount: archive.pointer(),
+      })
+    );
+
+    const { buildId } = await uploadProjectFiles(
+      accountId,
+      projectConfig.name,
+      tempFile.name
+    );
+
+    if (callbackFunc) {
+      callbackFunc(tempFile, buildId);
+    }
+  });
+
+  archive.pipe(output);
+
+  archive.directory(
+    path.resolve(projectDir, projectConfig.srcDir),
+    false,
+    file => (shouldIgnoreFile(file.name) ? false : file)
+  );
+
+  archive.finalize();
+};
+
 const showWelcomeMessage = () => {
   logger.log('');
   logger.log(chalk.bold('Welcome to HubSpot Developer Projects!'));
@@ -392,6 +498,7 @@ module.exports = {
   writeProjectConfig,
   getProjectConfig,
   getIsInProject,
+  handleProjectUpload,
   createProjectConfig,
   validateProjectConfig,
   showWelcomeMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.10",
+  "version": "3.0.12-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^3.0.10",
-    "@hubspot/serverless-dev-runtime": "^3.0.10",
+    "@hubspot/cli-lib": "^3.0.12-beta.0",
+    "@hubspot/serverless-dev-runtime": "^3.0.12-beta.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cad6c92bb51a24a7958c3c77c3e5ffc4e6418580"
+  "gitHead": "cb056da116cf2f64b7e2f7df69f44e5a19d03527"
 }