@hubspot/cli 3.0.10-beta.15 → 3.0.10-beta.16

package/commands/project/watch.js

@@ -0,0 +1,103 @@
+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,
+} = require('@hubspot/cli-lib/errorHandlers');
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  addAccountOptions,
+  addConfigOptions,
+  getAccountId,
+  addUseEnvironmentOptions,
+} = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const {
+  getProjectConfig,
+  validateProjectConfig,
+  pollBuildStatus,
+  pollDeployStatus,
+} = require('../../lib/projects');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+const i18nKey = 'cli.commands.project.subcommands.watch';
+
+exports.command = 'watch [path]';
+exports.describe = false;
+
+const handleBuildStatus = async (accountId, projectName, buildId) => {
+  const {
+    isAutoDeployEnabled,
+    deployStatusTaskLocator,
+  } = await pollBuildStatus(accountId, projectName, buildId);
+
+  if (isAutoDeployEnabled && deployStatusTaskLocator) {
+    await pollDeployStatus(
+      accountId,
+      projectName,
+      deployStatusTaskLocator.id,
+      buildId
+    );
+  }
+};
+
+const handleSigInt = (accountId, projectName, currentBuildId) => {
+  process.removeAllListeners('SIGINT');
+  process.on('SIGINT', async () => {
+    if (currentBuildId) {
+      try {
+        await cancelStagedBuild(accountId, projectName);
+        logger.debug(i18n(`${i18nKey}.debug.buildCancelled`));
+        process.exit(EXIT_CODES.SUCCESS);
+      } catch (err) {
+        logApiErrorInstance(
+          err,
+          new ApiErrorContext({ accountId, projectName: projectName })
+        );
+        process.exit(EXIT_CODES.ERROR);
+      }
+    } else {
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+  });
+};
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  const { path: projectPath } = options;
+  const accountId = getAccountId(options);
+
+  trackCommandUsage('project-watch', { projectPath }, accountId);
+
+  const { projectConfig, projectDir } = await getProjectConfig(projectPath);
+
+  validateProjectConfig(projectConfig, projectDir);
+
+  await createWatcher(
+    accountId,
+    projectConfig,
+    projectDir,
+    handleBuildStatus,
+    handleSigInt
+  );
+};
+
+exports.builder = yargs => {
+  yargs.positional('path', {
+    describe: i18n(`${i18nKey}.describe`),
+    type: 'string',
+  });
+
+  yargs.example([
+    ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
+  ]);
+
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+
+  return yargs;
+};

package/commands/project.js

@@ -4,6 +4,7 @@ const create = require('./project/create');
 const upload = require('./project/upload');
 const listBuilds = require('./project/listBuilds');
 const logs = require('./project/logs');
+const watch = require('./project/watch');
 
 exports.command = 'project';
 exports.describe = false; //'Commands for working with projects';
@@ -16,6 +17,7 @@ exports.builder = yargs => {
   yargs.command(deploy).demandCommand(1, '');
   yargs.command(create).demandCommand(0, '');
   yargs.command(upload).demandCommand(0, '');
+  yargs.command(watch).demandCommand(0, '');
   yargs.command(listBuilds).demandCommand(0, '');
   yargs.command(logs).demandCommand(1, '');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.10-beta.15",
+  "version": "3.0.10-beta.16",
   "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-beta.15",
-    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.15",
+    "@hubspot/cli-lib": "^3.0.10-beta.16",
+    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.16",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "314c0c53c64f45e0eb7663db46808d7265361a0a"
+  "gitHead": "cd0fc0a7beb927badc615ac4b8060f65bda851f4"
 }

package/bin/hubspot

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