@hubspot/cli 7.0.12-experimental.0 → 7.1.0

package/commands/project/deploy.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const { useV3Api } = require('../../lib/projects/buildAndDeploy');
 const chalk = require('chalk');
 const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -84,7 +84,7 @@ exports.handler = async (options) => {
             logger.error(i18n(`${i18nKey}.errors.noBuildId`));
             return process.exit(EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion));
+        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy, useV3Api(projectConfig?.platformVersion));
         if (!deployResp || deployResp.error) {
             logger.error(i18n(`${i18nKey}.errors.deploy`, {
                 details: deployResp.error.message,

package/commands/project/upload.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const { useV3Api } = require('../../lib/projects/buildAndDeploy');
 const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
@@ -31,7 +31,7 @@ exports.handler = async (options) => {
         uploadCommand: true,
     });
     try {
-        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion));
+        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, useV3Api(projectConfig?.platformVersion));
         if (uploadError) {
             if (isSpecifiedError(uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,

package/lang/en.lyaml

@@ -1262,7 +1262,7 @@ en:
         selectScopes: "Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)"
         personalAccessKeySetupTitle: "HubSpot Personal Access Key Setup"
         personalAccessKeyBrowserOpenPrep: "A personal access key is required to authenticate the CLI to interact with your HubSpot account. We'll open a secure page in your default browser where you can view and copy your personal access key."
-        personalAccessKeyBrowserOpenPrompt: "Open hubspot.com to copy your personal access key?"
+        personalAccessKeyBrowserOpenPrompt: "Open HubSpot to copy your personal access key?"
         logs:
           openingWebBrowser: "Opening {{ url }} in your web browser"
         errors:
@@ -1372,8 +1372,8 @@ en:
       installPublicAppPrompt:
         explanation: "Local development requires this app to be installed in the target test account"
         reinstallExplanation: "This app's required scopes have been updated since it was last installed on the target test account. To avoid issues with local development, we recommend reinstalling the app with the updated scopes."
-        prompt: "Open hubspot.com to install this app?"
-        reinstallPrompt: "Open hubspot.com to reinstall this app?"
+        prompt: "Open HubSpot to install this app?"
+        reinstallPrompt: "Open HubSpot to reinstall this app?"
         decline: "To continue local development of this app, install it in your target test account and re-run {{#bold}}`hs project dev`{{/bold}}"
       selectHubDBTablePrompt:
         selectTable: "Select a HubDB table:"
@@ -1517,6 +1517,8 @@ en:
         inactiveSecondary: "Run {{ command }} to remove inactive accounts from your CLI config"
         unableToDetermine: "Unable to determine if the portal is active"
         pak:
+          incomplete: "Personal access key is valid, but there are more scopes available to your user that are not included in your key."
+          incompleteSecondary: "To add the available scopes, run {{ command }} and re-authenticate your account with a new key that has those scopes. Visit HubSpot to view selected and available scopes for your personal access key. {{ link }}"
           invalid: "Personal access key is invalid"
           invalidSecondary: "To get a new key, run {{ command }}, deactivate your access key, and generate a new one. Then use that new key to authenticate your account."
           valid: "Personal Access Key is valid. {{ link }}"

package/lib/doctor/Doctor.js

@@ -91,16 +91,29 @@ class Doctor {
         const localI18nKey = `${i18nKey}.accountChecks`;
         try {
             await (0, personalAccessKey_1.accessTokenForPersonalAccessKey)(this.accountId, true);
+            const pakScopes = new Set(await (0, personalAccessKey_1.scopesOnAccessToken)(this.accountId));
+            const missingScopes = (await (0, personalAccessKey_1.authorizedScopesForPortalAndUser)(this.accountId)).filter((data) => data.userAuthorized && !pakScopes.has(data.scopeGroup.name));
             this.diagnosis?.addCLIConfigSection({
                 type: 'success',
                 message: i18n(`${localI18nKey}.active`),
             });
-            this.diagnosis?.addCLIConfigSection({
-                type: 'success',
-                message: i18n(`${localI18nKey}.pak.valid`, {
-                    link: uiLink(i18n(`${localI18nKey}.pak.viewScopes`), `${(0, urls_1.getHubSpotWebsiteOrigin)(this.diagnosticInfoBuilder?.env || 'PROD')}/personal-access-key/${this.diagnosticInfo?.account.accountId}`),
-                }),
-            });
+            const linkToPakUI = uiLink(i18n(`${localI18nKey}.pak.viewScopes`), `${(0, urls_1.getHubSpotWebsiteOrigin)(this.diagnosticInfoBuilder?.env || 'PROD')}/personal-access-key/${this.diagnosticInfo?.account.accountId}`);
+            if (missingScopes.length > 0) {
+                this.diagnosis?.addCLIConfigSection({
+                    type: 'warning',
+                    message: i18n(`${localI18nKey}.pak.incomplete`),
+                    secondaryMessaging: i18n(`${localI18nKey}.pak.incompleteSecondary`, {
+                        command: (0, ui_1.uiCommandReference)(`hs auth`),
+                        link: linkToPakUI,
+                    }),
+                });
+            }
+            else {
+                this.diagnosis?.addCLIConfigSection({
+                    type: 'success',
+                    message: i18n(`${localI18nKey}.pak.valid`, { link: linkToPakUI }),
+                });
+            }
         }
         catch (error) {
             const portalNotActive = (0, index_1.isSpecifiedError)(error, {

package/lib/projects/buildAndDeploy.d.ts

@@ -2,7 +2,7 @@ import { FileResult } from 'tmp';
 import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { Deploy } from '@hubspot/local-dev-lib/types/Deploy';
 import { ProjectConfig, ProjectTask, ProjectPollResult } from '../../types/Projects';
-export declare function useV3Api(platformVersion?: string | null): platformVersion is "2025.1";
+export declare function useV3Api(platformVersion?: string | null): boolean;
 type PollTaskStatusFunction<T extends ProjectTask> = (accountId: number, taskName: string, taskId: number, deployedBuildId: number | null, silenceLogs: boolean) => Promise<T>;
 export declare const pollBuildStatus: PollTaskStatusFunction<Build>;
 export declare const pollDeployStatus: PollTaskStatusFunction<Deploy>;

package/lib/projects/buildAndDeploy.js

@@ -21,7 +21,11 @@ const SPINNER_STATUS = {
     SPINNING: 'spinning',
 };
 function useV3Api(platformVersion) {
-    return platformVersion === '2025.1';
+    if (!platformVersion || typeof platformVersion !== 'string') {
+        return false;
+    }
+    const [year, minor] = platformVersion.split('.');
+    return Number(year) >= 2025 && Number(minor) >= 1;
 }
 function getSubtasks(task) {
     if ('subbuildStatuses' in task) {

package/lib/projects/structure.d.ts

@@ -1,8 +1,11 @@
-import { ComponentTypes, Component, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
+import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
 };
+export declare function getComponentTypeFromConfigFile(configFile: string): ComponentTypes | null;
+export declare function loadConfigFile(configPath: string): GenericComponentConfig | null;
 export declare function getAppCardConfigs(appConfig: PublicAppComponentConfig | PrivateAppComponentConfig, appPath: string): Array<AppCardComponentConfig>;
+export declare function getIsLegacyApp(appConfig: GenericComponentConfig, appPath: string): boolean;
 export declare function findProjectComponents(projectSourceDir: string): Promise<Array<Component>>;
 export declare function getProjectComponentTypes(components: Array<Component>): {
     [key in ComponentTypes]?: boolean;

package/lib/projects/structure.js

@@ -34,7 +34,10 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONFIG_FILES = void 0;
+exports.getComponentTypeFromConfigFile = getComponentTypeFromConfigFile;
+exports.loadConfigFile = loadConfigFile;
 exports.getAppCardConfigs = getAppCardConfigs;
+exports.getIsLegacyApp = getIsLegacyApp;
 exports.findProjectComponents = findProjectComponents;
 exports.getProjectComponentTypes = getProjectComponentTypes;
 exports.getComponentUid = getComponentUid;

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.12-experimental.0",
+    "version": "7.1.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.2.0",
+        "@hubspot/local-dev-lib": "3.3.0",
         "@hubspot/project-parsing-lib": "0.0.4",
         "@hubspot/serverless-dev-runtime": "7.0.2",
         "@hubspot/theme-preview-dev-server": "0.0.10",