@hubspot/cli 7.6.2 → 7.7.0-beta.0

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -10,16 +10,13 @@ import pkg from '../../../package.json' with { type: 'json' };
 const SERVER_INSTANCE_ID = 'local-dev-ui-websocket-server';
 const LOCAL_DEV_WEBSOCKET_SERVER_VERSION = 1;
 const LOG_PREFIX = '[LocalDevWebsocketServer]';
+const DOMAINS = ['hubspot.com', 'hubspotqa.com'];
+const SUBDOMAINS = ['local', 'app', 'app-na2', 'app-na3', 'app-ap1', 'app-eu1'];
+const ALLOWED_ORIGIN_REGEX = new RegExp(`^https://(${SUBDOMAINS.join('|')})\\.(${DOMAINS.join('|')})$`);
 class LocalDevWebsocketServer {
     server;
     debug;
     localDevProcess;
-    ALLOWED_ORIGINS = [
-        'https://app.hubspot.com',
-        'https://app.hubspotqa.com',
-        'https://local.hubspot.com',
-        'https://local.hubspotqa.com',
-    ];
     constructor(localDevProcess, debug) {
         this.localDevProcess = localDevProcess;
         this.debug = debug;
@@ -166,7 +163,7 @@ class LocalDevWebsocketServer {
         this.log(lib.LocalDevWebsocketServer.logs.startup(port));
         this.server.on('connection', (ws, req) => {
             const origin = req.headers.origin;
-            if (!origin || !this.ALLOWED_ORIGINS.includes(origin)) {
+            if (!origin || !ALLOWED_ORIGIN_REGEX.test(origin)) {
                 ws.close(1008, lib.LocalDevWebsocketServer.errors.originNotAllowed(origin));
                 return;
             }

package/lib/projects/structure.js

@@ -4,11 +4,11 @@ import { walk } from '@hubspot/local-dev-lib/fs';
 import { logger } from '@hubspot/local-dev-lib/logger';
 import { logError } from '../errorHandlers/index.js';
 import { ComponentTypes, } from '../../types/Projects.js';
-import { IR_COMPONENT_TYPES } from '../constants.js';
+import { IR_COMPONENT_TYPES, LEGACY_PRIVATE_APP_FILE, LEGACY_PUBLIC_APP_FILE, THEME_FILE, } from '../constants.js';
 export const CONFIG_FILES = {
-    [ComponentTypes.PrivateApp]: 'app.json',
-    [ComponentTypes.PublicApp]: 'public-app.json',
-    [ComponentTypes.HublTheme]: 'theme.json',
+    [ComponentTypes.PrivateApp]: LEGACY_PRIVATE_APP_FILE,
+    [ComponentTypes.PublicApp]: LEGACY_PUBLIC_APP_FILE,
+    [ComponentTypes.HublTheme]: THEME_FILE,
 };
 export function getComponentTypeFromConfigFile(configFile) {
     let key;

package/lib/projects/upload.d.ts

@@ -18,7 +18,7 @@ type HandleProjectUploadArg<T> = {
     profile?: string;
 };
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
-export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
+export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig, projectDir: string): Promise<void>;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
 export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
 export {};

package/lib/projects/upload.js

@@ -15,6 +15,8 @@ import { uiLogger } from '../ui/logger.js';
 import { useV3Api } from './platformVersion.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import ProjectValidationError from '../errors/ProjectValidationError.js';
+import { walk } from '@hubspot/local-dev-lib/fs';
+import { LEGACY_CONFIG_FILES } from '../constants.js';
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager.init({});
     const accountIdentifier = uiAccountDescription(accountId) || `${accountId}`;
@@ -45,7 +47,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
 export async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
     try {
-        validateSourceDirectory(srcDir, projectConfig);
+        await validateSourceDirectory(srcDir, projectConfig, projectDir);
     }
     catch (e) {
         logError(e);
@@ -70,8 +72,7 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
                 intermediateRepresentation = await handleTranslate(projectDir, projectConfig, accountId, skipValidation, profile);
             }
             catch (e) {
-                logError(e);
-                process.exit(EXIT_CODES.ERROR);
+                resolve({ uploadError: e });
             }
         }
         await ensureProjectExists(accountId, projectConfig.name, {
@@ -105,11 +106,19 @@ export async function handleProjectUpload({ accountId, projectConfig, projectDir
     archive.finalize();
     return result;
 }
-export function validateSourceDirectory(srcDir, projectConfig) {
-    const filenames = fs.readdirSync(srcDir);
-    if (!filenames || filenames.length === 0) {
+export async function validateSourceDirectory(srcDir, projectConfig, projectDir) {
+    const projectFilePaths = await walk(srcDir, ['node_modules']);
+    if (!projectFilePaths || projectFilePaths.length === 0) {
         throw new ProjectValidationError(lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
     }
+    if (useV3Api(projectConfig.platformVersion)) {
+        projectFilePaths.forEach(filePath => {
+            const filename = path.basename(filePath);
+            if (LEGACY_CONFIG_FILES.includes(filename)) {
+                uiLogger.warn(lib.projectUpload.handleProjectUpload.legacyFileDetected(path.relative(projectDir, filePath), projectConfig.platformVersion));
+            }
+        });
+    }
 }
 export async function validateNoHSMetaMismatch(srcDir, projectConfig) {
     const hasHsMetaFiles = await projectContainsHsMetaFiles(srcDir);

package/lib/prompts/createDeveloperTestAccountConfigPrompt.js

@@ -94,7 +94,16 @@ export async function createDeveloperTestAccountConfigPrompt(args = {}, supportF
             },
         ],
     });
-    if (useDefaultAccountLevelsPromptResult.useDefaultAccountLevels === 'manual') {
+    if (useDefaultAccountLevelsPromptResult.useDefaultAccountLevels === 'default') {
+        accountLevelsArray = [
+            { hub: 'MARKETING', tier: AccountTiers.ENTERPRISE },
+            { hub: 'OPS', tier: AccountTiers.ENTERPRISE },
+            { hub: 'SERVICE', tier: AccountTiers.ENTERPRISE },
+            { hub: 'SALES', tier: AccountTiers.ENTERPRISE },
+            { hub: 'CONTENT', tier: AccountTiers.ENTERPRISE },
+        ];
+    }
+    else {
         const accountLevelsPromptResult = await promptUser({
             name: 'testAccountLevels',
             message: lib.prompts.createDeveloperTestAccountConfigPrompt.tiersPrompt,

package/lib/prompts/promptUtils.js

@@ -139,8 +139,10 @@ function handleCheckboxPrompt(config) {
     }).then(resp => ({ [config.name]: resp }));
 }
 function handleConfirmPrompt(config) {
-    return confirmPrompt(config.message, {
-        defaultAnswer: config.default,
+    return confirm({
+        message: config.message,
+        default: config.default,
+        theme: PROMPT_THEME,
     }).then(resp => ({ [config.name]: resp }));
 }
 function handleInputPrompt(config) {
@@ -165,12 +167,13 @@ function handleSelectPrompt(config) {
 }
 export async function confirmPrompt(message, options = {}) {
     const { defaultAnswer = true } = options;
-    const choice = await confirm({
+    const { confirm: result } = await promptUser({
+        name: 'confirm',
+        type: 'confirm',
         message,
         default: defaultAnswer,
-        theme: PROMPT_THEME,
     });
-    return choice;
+    return result;
 }
 export async function listPrompt(message, { choices, when, defaultAnswer, validate, loop, }) {
     const { choice } = await promptUser({

package/lib/yargsUtils.d.ts

@@ -13,4 +13,4 @@ export declare function makeYargsBuilder<T>(callback: (yargs: Argv) => Argv<T>,
     };
     useJSONOutputOptions?: boolean;
 }): (yargs: Argv) => Promise<Argv<T>>;
-export declare function getExclusiveConflicts(options: string[]): Record<string, string[]>;
+export declare function strictEnforceBoolean(rawArgs: string[], booleanOptions: string[]): boolean;

package/lib/yargsUtils.js

@@ -1,5 +1,6 @@
 import { addCustomHelpOutput, addTestingOptions, addAccountOptions, addConfigOptions, addGlobalOptions, addUseEnvironmentOptions, addCmsPublishModeOptions, addJSONOutputOptions, } from './commonOpts.js';
 import { hasFlag } from './utils/hasFlag.js';
+import { commands } from '../lang/en.js';
 // Re-export for backwards compatibility
 export { hasFlag };
 export function makeYargsBuilder(callback, command, describe, options = {}) {
@@ -34,9 +35,15 @@ export function makeYargsBuilder(callback, command, describe, options = {}) {
         return result;
     };
 }
-export function getExclusiveConflicts(options) {
-    return options.reduce((acc, curr) => {
-        acc[curr] = options.filter(s => s !== curr);
-        return acc;
-    }, {});
+export function strictEnforceBoolean(rawArgs, booleanOptions) {
+    for (const option of booleanOptions) {
+        const argIndex = rawArgs.findIndex(arg => arg.startsWith(`--${option}=`));
+        if (argIndex !== -1) {
+            const value = rawArgs[argIndex].split('=')[1];
+            if (value && !['true', 'false'].includes(value.toLowerCase())) {
+                throw new Error(commands.config.subcommands.set.errors.invalidBoolean(option, value));
+            }
+        }
+    }
+    return true;
 }

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.6.2",
+    "version": "7.7.0-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
     "dependencies": {
         "@hubspot/local-dev-lib": "3.19.1",
-        "@hubspot/project-parsing-lib": "0.8.6",
+        "@hubspot/project-parsing-lib": "0.9.0",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.10.0",