@hubspot/cli 7.0.2 → 7.0.3-experimental.0

package/commands/function/deploy.js

@@ -38,7 +38,7 @@ exports.handler = async (options) => {
     });
     try {
         const { data: buildId } = await buildPackage(derivedAccountId, functionPath);
-        const successResp = await poll(() => getBuildStatus(derivedAccountId, buildId));
+        const successResp = await poll(getBuildStatus, derivedAccountId, buildId);
         const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
         SpinniesManager.succeed('loading');
         await outputBuildLog(successResp.cdnUrl);

package/commands/project/cloneApp.js

@@ -68,7 +68,7 @@ exports.handler = async (options) => {
             text: i18n(`${i18nKey}.cloneStatus.inProgress`),
         });
         const { data: { exportId }, } = await cloneApp(derivedAccountId, appId);
-        const { status } = await poll(() => checkCloneStatus(derivedAccountId, exportId));
+        const { status } = await poll(checkCloneStatus, derivedAccountId, exportId);
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
             const baseDestPath = path.resolve(getCwd(), projectDest);

package/commands/project/migrateApp.js

@@ -126,7 +126,7 @@ exports.handler = async (options) => {
         });
         const { data: migrateResponse } = await migrateApp(derivedAccountId, appId, projectName);
         const { id } = migrateResponse;
-        const pollResponse = await poll(() => checkMigrationStatus(derivedAccountId, id));
+        const pollResponse = await poll(checkMigrationStatus, derivedAccountId, id);
         const { status, project } = pollResponse;
         if (status === 'SUCCESS') {
             const absoluteDestPath = path.resolve(getCwd(), projectDest);

package/lang/en.lyaml

@@ -1113,6 +1113,7 @@ en:
         notFound: "Your project {{#bold}}{{ projectName }}{{/bold}} could not be found in {{#bold}}{{ accountIdentifier }}{{/bold}}."
       pollFetchProject:
         checkingProject: "Checking if project exists in {{ accountIdentifier }}"
+        unableToFindAutodeployStatus: "Unable to find the auto deploy for build #{{ buildId }}. This deploy may have been skipped. {{ viewDeploysLink }}."
       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"
@@ -1128,7 +1129,6 @@ en:
         buildSucceededAutomaticallyDeploying: "Build #{{ buildId }} succeeded. {{#bold}}Automatically deploying{{/bold}} to {{ accountIdentifier }}\n"
         cleanedUpTempFile: "Cleaned up temporary file {{ path }}"
         viewDeploys: "View all deploys for this project in HubSpot"
-        unableToFindAutodeployStatus: "Unable to find the auto deploy for build #{{ buildId }}. This deploy may have been skipped. {{ viewDeploysLink }}."
     projectUpload:
       uploadProjectFiles:
         add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"

package/lib/constants.d.ts

@@ -6,7 +6,13 @@ export declare const MARKETPLACE_FOLDER: "@marketplace";
 export declare const CONFIG_FLAGS: {
     readonly USE_CUSTOM_OBJECT_HUBFILE: "useCustomObjectHubfile";
 };
-export declare const DEFAULT_POLLING_DELAY = 2000;
+export declare const POLLING_DELAY = 2000;
+export declare const POLLING_STATUS: {
+    readonly SUCCESS: "SUCCESS";
+    readonly ERROR: "ERROR";
+    readonly REVERTED: "REVERTED";
+    readonly FAILURE: "FAILURE";
+};
 export declare const PROJECT_CONFIG_FILE: "hsproject.json";
 export declare const PROJECT_BUILD_STATES: {
     readonly BUILDING: "BUILDING";

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.CONFIG_FLAGS = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
+exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.POLLING_STATUS = exports.POLLING_DELAY = exports.CONFIG_FLAGS = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
 exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
 exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 exports.FEEDBACK_INTERVAL = 10;
@@ -9,7 +9,13 @@ exports.MARKETPLACE_FOLDER = '@marketplace';
 exports.CONFIG_FLAGS = {
     USE_CUSTOM_OBJECT_HUBFILE: 'useCustomObjectHubfile',
 };
-exports.DEFAULT_POLLING_DELAY = 2000;
+exports.POLLING_DELAY = 2000;
+exports.POLLING_STATUS = {
+    SUCCESS: 'SUCCESS',
+    ERROR: 'ERROR',
+    REVERTED: 'REVERTED',
+    FAILURE: 'FAILURE',
+};
 exports.PROJECT_CONFIG_FILE = 'hsproject.json';
 exports.PROJECT_BUILD_STATES = {
     BUILDING: 'BUILDING',

package/lib/polling.d.ts

@@ -1,17 +1,9 @@
 import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
-export declare const DEFAULT_POLLING_STATES: {
-    readonly STARTED: "STARTED";
-    readonly SUCCESS: "SUCCESS";
-    readonly ERROR: "ERROR";
-    readonly REVERTED: "REVERTED";
-    readonly FAILURE: "FAILURE";
-};
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+import { POLLING_STATUS } from './constants';
 type GenericPollingResponse = {
-    status: string;
+    status: ValueOf<typeof POLLING_STATUS>;
 };
-type PollingCallback<T extends GenericPollingResponse> = () => HubSpotPromise<T>;
-export declare function poll<T extends GenericPollingResponse>(callback: PollingCallback<T>, statusLookup?: {
-    successStates: string[];
-    errorStates: string[];
-}): Promise<T>;
+type PollingCallback<T extends GenericPollingResponse> = (accountId: number, taskId: number | string) => HubSpotPromise<T>;
+export declare function poll<T extends GenericPollingResponse>(callback: PollingCallback<T>, accountId: number, taskId: number | string): Promise<T>;
 export {};

package/lib/polling.js

@@ -1,34 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_POLLING_STATES = void 0;
 exports.poll = poll;
 const constants_1 = require("./constants");
-exports.DEFAULT_POLLING_STATES = {
-    STARTED: 'STARTED',
-    SUCCESS: 'SUCCESS',
-    ERROR: 'ERROR',
-    REVERTED: 'REVERTED',
-    FAILURE: 'FAILURE',
-};
-const DEFAULT_POLLING_STATUS_LOOKUP = {
-    successStates: [exports.DEFAULT_POLLING_STATES.SUCCESS],
-    errorStates: [
-        exports.DEFAULT_POLLING_STATES.ERROR,
-        exports.DEFAULT_POLLING_STATES.REVERTED,
-        exports.DEFAULT_POLLING_STATES.FAILURE,
-    ],
-};
-function poll(callback, statusLookup = DEFAULT_POLLING_STATUS_LOOKUP) {
+function poll(callback, accountId, taskId) {
     return new Promise((resolve, reject) => {
         const pollInterval = setInterval(async () => {
             try {
-                const { data: pollResp } = await callback();
+                const { data: pollResp } = await callback(accountId, taskId);
                 const { status } = pollResp;
-                if (statusLookup.successStates.includes(status)) {
+                if (status === constants_1.POLLING_STATUS.SUCCESS) {
                     clearInterval(pollInterval);
                     resolve(pollResp);
                 }
-                else if (statusLookup.errorStates.includes(status)) {
+                else if (status === constants_1.POLLING_STATUS.ERROR ||
+                    status === constants_1.POLLING_STATUS.REVERTED ||
+                    status === constants_1.POLLING_STATUS.FAILURE) {
                     clearInterval(pollInterval);
                     reject(pollResp);
                 }
@@ -37,6 +23,6 @@ function poll(callback, statusLookup = DEFAULT_POLLING_STATUS_LOOKUP) {
                 clearInterval(pollInterval);
                 reject(error);
             }
-        }, constants_1.DEFAULT_POLLING_DELAY);
+        }, constants_1.POLLING_DELAY);
     });
 }

package/lib/projects/buildAndDeploy.js

@@ -197,13 +197,13 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
                         resolve(taskStatus);
                     }
                 }
-            }, constants_1.DEFAULT_POLLING_DELAY);
+            }, constants_1.POLLING_DELAY);
         });
     };
 }
 function pollBuildAutodeployStatus(accountId, taskName, buildId) {
     return new Promise((resolve, reject) => {
-        let maxIntervals = (30 * 1000) / constants_1.DEFAULT_POLLING_DELAY; // Num of intervals in ~30s
+        let maxIntervals = (30 * 1000) / constants_1.POLLING_DELAY; // Num of intervals in ~30s
         const pollInterval = setInterval(async () => {
             let build;
             try {
@@ -224,7 +224,7 @@ function pollBuildAutodeployStatus(accountId, taskName, buildId) {
             else {
                 maxIntervals -= 1;
             }
-        }, constants_1.DEFAULT_POLLING_DELAY);
+        }, constants_1.POLLING_DELAY);
     });
 }
 exports.pollBuildStatus = makePollTaskStatusFunc({

package/lib/projects/index.js

@@ -171,7 +171,7 @@ async function pollFetchProject(accountId, projectName) {
                     reject(err);
                 }
             }
-        }, constants_1.DEFAULT_POLLING_DELAY);
+        }, constants_1.POLLING_DELAY);
     });
 }
 async function ensureProjectExists(accountId, projectName, { forceCreate = false, allowCreate = true, noLogs = false, withPolling = false, uploadCommand = false, } = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.2",
+    "version": "7.0.3-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -8,7 +8,7 @@
         "@hubspot/local-dev-lib": "3.1.3",
         "@hubspot/serverless-dev-runtime": "7.0.1",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.8.42",
+        "@hubspot/ui-extensions-dev-server": "0.8.40",
         "archiver": "^7.0.1",
         "chalk": "^4.1.2",
         "chokidar": "^3.0.1",