@hubspot/cli 7.8.12-experimental.0 → 7.8.12-experimental.1

package/lib/projects/create/__tests__/legacy.test.js

@@ -1,9 +1,9 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../ui/logger.js';
 import * as github from '@hubspot/local-dev-lib/api/github';
 import { EXIT_CODES } from '../../../enums/exitCodes.js';
 import { getProjectComponentListFromRepo, getProjectTemplateListFromRepo, } from '../legacy.js';
 import { PROJECT_COMPONENT_TYPES, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../../../constants.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/github');
 const mockedFetchRepoFile = vi.mocked(github.fetchRepoFile);
 const repoConfig = {
@@ -60,14 +60,14 @@ describe('lib/projects/create/legacy', () => {
         it('Logs an error and exits the process if the request for the template list fails', async () => {
             mockedFetchRepoFile.mockRejectedValue(new Error('Not found'));
             await getProjectTemplateListFromRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Failed to fetch the config.json file from the target repository/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Failed to fetch the config.json file from the target repository/));
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('Logs an error and exits the process if there are no projects listed in the repo config', async () => {
             // @ts-expect-error - Mocking AxiosResponse
             mockedFetchRepoFile.mockResolvedValue({});
             await getProjectTemplateListFromRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to find any projects in the target repository's config.json file/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Unable to find any projects in the target repository's config.json file/));
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('Logs an error and exits the process if any of the projects in the repo config are missing required properties', async () => {
@@ -84,7 +84,7 @@ describe('lib/projects/create/legacy', () => {
                 },
             });
             await getProjectTemplateListFromRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, 'gh-ref');
-            expect(logger.error).toHaveBeenCalledWith(expect.stringMatching(/Found misconfigured projects in the target repository's config.json file/));
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/Found misconfigured projects in the target repository's config.json file/));
             expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
     });

package/lib/projects/create/__tests__/v3.test.js

@@ -1,6 +1,6 @@
 import { calculateComponentTemplateChoices } from '../v3.js';
 import { hasFeature } from '../../../hasFeature.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/github');
 vi.mock('../../../hasFeature.js');
 const mockHasFeature = vi.mocked(hasFeature);

package/lib/projects/create/index.js

@@ -1,7 +1,7 @@
 import { selectProjectTemplatePrompt, } from '../../prompts/selectProjectTemplatePrompt.js';
 import { projectNameAndDestPrompt } from '../../prompts/projectNameAndDestPrompt.js';
 import { DEFAULT_PROJECT_TEMPLATE_BRANCH, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, EMPTY_PROJECT, } from '../../constants.js';
-import { useV3Api } from '../platformVersion.js';
+import { isV2Project } from '../platformVersion.js';
 import { v3ComponentFlow } from './v3.js';
 import { getProjectTemplateListFromRepo } from './legacy.js';
 import { uiLogger } from '../../ui/logger.js';
@@ -11,7 +11,7 @@ export async function handleProjectCreationFlow(args) {
     const { platformVersion, templateSource, projectBase, auth: providedAuth, distribution: providedDistribution, } = args;
     const repo = templateSource || HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
     const projectNameAndDestPromptResponse = await projectNameAndDestPrompt(args);
-    if (useV3Api(platformVersion)) {
+    if (isV2Project(platformVersion)) {
         const { componentTemplateChoices, authType, distribution, repoConfig, projectContents, } = await v3ComponentFlow(platformVersion, projectBase, providedAuth, providedDistribution, args.derivedAccountId);
         const selectProjectTemplatePromptResponse = await selectProjectTemplatePrompt(args, undefined, projectContents !== EMPTY_PROJECT ? componentTemplateChoices : undefined);
         return {

package/lib/projects/create/legacy.js

@@ -3,13 +3,13 @@ import { DEFAULT_PROJECT_TEMPLATE_BRANCH, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { debugError } from '../../errorHandlers/index.js';
 import { uiLogger } from '../../ui/logger.js';
-import { useV3Api } from '../platformVersion.js';
+import { isV2Project } from '../platformVersion.js';
 import { lib } from '../../../lang/en.js';
 const PROJECT_TEMPLATE_PROPERTIES = ['name', 'label', 'path'];
 export const EMPTY_PROJECT_TEMPLATE_NAME = 'no-template';
 export async function getConfigForPlatformVersion(platformVersion) {
     let path = '';
-    if (useV3Api(platformVersion)) {
+    if (isV2Project(platformVersion)) {
         path = `${platformVersion}/`;
     }
     const { data } = await fetchRepoFile(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, `${path}config.json`, DEFAULT_PROJECT_TEMPLATE_BRANCH);

package/lib/projects/create/v3.js

@@ -3,7 +3,7 @@ import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, EMPTY_
 import { commands, lib } from '../../../lang/en.js';
 import { listPrompt } from '../../prompts/promptUtils.js';
 import chalk from 'chalk';
-import { useV3Api } from '../platformVersion.js';
+import { isV2Project } from '../platformVersion.js';
 import path from 'path';
 import { getConfigForPlatformVersion } from './legacy.js';
 import { logError } from '../../errorHandlers/index.js';
@@ -148,7 +148,7 @@ export async function v3ComponentFlow(platformVersion, projectBase, providedAuth
     };
 }
 export function generateComponentPaths({ selectProjectTemplatePromptResponse, platformVersion, repoConfig, projectContents, authType, distribution, }) {
-    if (!useV3Api(platformVersion)) {
+    if (!isV2Project(platformVersion)) {
         return [];
     }
     const components = selectProjectTemplatePromptResponse.componentTemplates?.map((componentTemplate) => {

package/lib/projects/localDev/AppDevModeInterface.d.ts

@@ -15,6 +15,8 @@ declare class AppDevModeInterface {
     private get appNode();
     private get appData();
     private set appData(value);
+    private isStaticAuthApp;
+    private isOAuthApp;
     private getAppInstallUrl;
     private fetchAppData;
     private checkMarketplaceAppInstalls;

package/lib/projects/localDev/AppDevModeInterface.js

@@ -1,5 +1,5 @@
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
-import { fetchPublicAppsForPortal, fetchPublicAppProductionInstallCounts,
+import { fetchAppMetadataByUid, fetchPublicAppProductionInstallCounts,
 // installStaticAuthAppOnTestAccount,
  } from '@hubspot/local-dev-lib/api/appsDev';
 import { DevModeUnifiedInterface as UIEDevModeInterface } from '@hubspot/ui-extensions-dev-server';
@@ -54,6 +54,12 @@ class AppDevModeInterface {
         }
         this.localDevState.setAppDataForUid(this.appNode.uid, appData);
     }
+    isStaticAuthApp() {
+        return (this.appNode?.config.auth.type.toLowerCase() === APP_AUTH_TYPES.STATIC);
+    }
+    isOAuthApp() {
+        return (this.appNode?.config.auth.type.toLowerCase() === APP_AUTH_TYPES.OAUTH);
+    }
     // @TODO: Restore test account auto install functionality
     // private isAutomaticallyInstallable(): boolean {
     //   const targetTestingAccount = getAccountConfig(
@@ -71,11 +77,11 @@ class AppDevModeInterface {
     //   return (
     //     isTestAccount &&
     //     hasCorrectParent &&
-    //     this.appNode?.config.auth.type === APP_AUTH_TYPES.STATIC
+    //     this.isStaticAuthApp()
     //   );
     // }
     async getAppInstallUrl() {
-        if (this.appNode?.config.auth.type.toLowerCase() === APP_AUTH_TYPES.OAUTH) {
+        if (this.appNode && this.isOAuthApp()) {
             return getOauthAppInstallUrl({
                 targetAccountId: this.localDevState.targetTestingAccountId,
                 env: this.localDevState.env,
@@ -84,26 +90,20 @@ class AppDevModeInterface {
                 redirectUrls: this.appNode.config.auth.redirectUrls,
             });
         }
-        const { data: { results }, } = await fetchPublicAppsForPortal(this.localDevState.targetProjectAccountId);
-        const app = results.find(app => app.sourceId === this.appNode?.uid);
-        if (!app) {
-            uiLogger.error(lib.LocalDevManager.appNotFound(this.localDevState.targetProjectAccountId, this.appNode?.uid));
-            process.exit(EXIT_CODES.ERROR);
-        }
         return getStaticAuthAppInstallUrl({
             targetAccountId: this.localDevState.targetTestingAccountId,
             env: this.localDevState.env,
-            appId: app.id,
+            appId: this.appData.id,
         });
     }
     async fetchAppData() {
         SpinniesManager.add('fetchAppData', {
             text: lib.AppDevModeInterface.fetchAppData.checking(this.appNode?.config.name || ''),
         });
-        let portalApps = [];
+        let appData;
         try {
-            const { data: { results }, } = await fetchPublicAppsForPortal(this.localDevState.targetProjectAccountId);
-            portalApps = results;
+            const { data } = await fetchAppMetadataByUid(this.appNode.uid, this.localDevState.targetProjectAccountId);
+            appData = data;
         }
         catch (e) {
             SpinniesManager.fail('fetchAppData', {
@@ -112,7 +112,6 @@ class AppDevModeInterface {
             logError(e);
             process.exit(EXIT_CODES.ERROR);
         }
-        const appData = portalApps.find(({ sourceId }) => sourceId === this.appNode?.uid);
         if (!appData) {
             return;
         }
@@ -177,13 +176,16 @@ class AppDevModeInterface {
         //     );
         //   }
         // }
+        const staticAuthInstallOptions = this.isStaticAuthApp()
+            ? {
+                testingAccountId: this.localDevState.targetTestingAccountId,
+                projectAccountId: this.localDevState.targetProjectAccountId,
+                projectName: this.localDevState.projectConfig.name,
+                appUid: this.appNode.uid,
+            }
+            : undefined;
         const installUrl = await this.getAppInstallUrl();
-        await installAppBrowserPrompt(installUrl, isReinstall, {
-            testingAccountId: this.localDevState.targetTestingAccountId,
-            projectAccountId: this.localDevState.targetProjectAccountId,
-            projectName: this.localDevState.projectConfig.name,
-            appUid: this.appNode.uid,
-        });
+        await installAppBrowserPrompt(installUrl, isReinstall, staticAuthInstallOptions);
     }
     async checkTestAccountAppInstallation() {
         if (!this.appNode || !this.appData) {

package/lib/projects/localDev/LocalDevLogger.js

@@ -1,6 +1,5 @@
 import { getAccountId, hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
 import { getConfigDefaultAccount } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { uiLogger } from '../../ui/logger.js';
 import { uiBetaTag, uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
 import { lib } from '../../../lang/en.js';
@@ -26,7 +25,7 @@ class LocalDevLogger {
     }
     handleError(e, langFunction) {
         if (this.state.debug) {
-            logger.error(e);
+            uiLogger.error(e instanceof Error ? e.message : String(e));
         }
         uiLogger.error(langFunction(e instanceof Error ? e.message : ''));
     }
@@ -119,35 +118,35 @@ class LocalDevLogger {
         uiLogger.log(lib.LocalDevProcess.projectConfigMismatch);
     }
     uploadError(error) {
-        logger.log('');
+        uiLogger.log('');
         logError(error);
         uiLogger.log(lib.LocalDevProcess.uploadFailed);
-        logger.log('');
+        uiLogger.log('');
     }
     uploadSuccess() {
-        logger.log('');
+        uiLogger.log('');
         uiLogger.log(lib.LocalDevProcess.uploadSuccess);
         uiLine();
-        logger.log('');
+        uiLogger.log('');
     }
     uploadSuccessAutoDeployDisabled() {
         uiLogger.warn(lib.LocalDevProcess.uploadSuccessAutoDeployDisabled);
         uiLine();
-        logger.log('');
+        uiLogger.log('');
     }
     deployError(error) {
-        logger.log('');
+        uiLogger.log('');
         if (error) {
             logError(error);
         }
         uiLogger.log(lib.LocalDevProcess.deployFailed);
-        logger.log('');
+        uiLogger.log('');
     }
     deploySuccess() {
-        logger.log('');
+        uiLogger.log('');
         uiLogger.log(lib.LocalDevProcess.deploySuccess);
         uiLine();
-        logger.log('');
+        uiLogger.log('');
     }
     monitorConsoleOutput() {
         const originalStdoutWrite = process.stdout.write.bind(process.stdout);

package/lib/projects/localDev/LocalDevManager.js

@@ -4,7 +4,6 @@ import chalk from 'chalk';
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchPublicAppsForPortal, fetchPublicAppProductionInstallCounts, } from '@hubspot/local-dev-lib/api/appsDev';
 import { getAccountId, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { PROJECT_CONFIG_FILE } from '../../constants.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
 import DevServerManager from './DevServerManager.js';
@@ -324,7 +323,7 @@ class LocalDevManager {
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.setupError(e instanceof Error ? e.message : ''));
             return false;
@@ -339,7 +338,7 @@ class LocalDevManager {
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.startError(e instanceof Error ? e.message : ''));
             process.exit(EXIT_CODES.ERROR);
@@ -351,7 +350,7 @@ class LocalDevManager {
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.fileChangeError(e instanceof Error ? e.message : ''));
         }
@@ -363,7 +362,7 @@ class LocalDevManager {
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.cleanupError(e instanceof Error ? e.message : ''));
             return false;

package/lib/projects/localDev/LocalDevWebsocketServer.d.ts

@@ -3,7 +3,6 @@ declare class LocalDevWebsocketServer {
     private server?;
     private debug?;
     private localDevProcess;
-    private ALLOWED_ORIGINS;
     constructor(localDevProcess: LocalDevProcess, debug?: boolean);
     private log;
     private logError;

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -1,6 +1,6 @@
 import { WebSocketServer } from 'ws';
 import { isPortManagerServerRunning, requestPorts, } from '@hubspot/local-dev-lib/portManager';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../ui/logger.js';
 import { addLocalStateFlag } from '@hubspot/local-dev-lib/config';
 import { LOCAL_DEV_UI_MESSAGE_SEND_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES, CONFIG_LOCAL_STATE_FLAGS, } from '../../constants.js';
 import { lib } from '../../../lang/en.js';
@@ -10,28 +10,25 @@ 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;
     }
     log(message) {
         if (this.debug) {
-            logger.log(LOG_PREFIX, message);
+            uiLogger.log(`${LOG_PREFIX} ${message}`);
         }
     }
     logError(message) {
         if (this.debug) {
-            logger.error(LOG_PREFIX, message);
+            uiLogger.error(`${LOG_PREFIX} ${message}`);
         }
     }
     sendMessage(websocket, message) {
@@ -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/localDev/helpers/project.d.ts

@@ -10,3 +10,4 @@ export declare function compareLocalProjectToDeployed(projectConfig: ProjectConf
 export declare function isDeployedProjectUpToDateWithLocal(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
 }, profile?: string): Promise<boolean>;
+export declare function checkAndInstallDependencies(): Promise<void>;

package/lib/projects/localDev/helpers/project.js

@@ -20,6 +20,7 @@ import { handleProjectUpload } from '../../upload.js';
 import { pollProjectBuildAndDeploy } from '../../pollProjectBuildAndDeploy.js';
 import { debugError, logError } from '../../../errorHandlers/index.js';
 import { ApiErrorContext } from '../../../errorHandlers/index.js';
+import { getProjectPackageJsonLocations, hasMissingPackages, installPackages, } from '../../../dependencyManagement.js';
 // Prompt the user to create a new project if one doesn't exist on their target account
 export async function createNewProjectForLocalDev(projectConfig, targetAccountId, shouldCreateWithoutConfirmation, hasPublicApps) {
     // Create the project without prompting if this is a newly created sandbox
@@ -174,3 +175,39 @@ export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountI
         }
     }
 }
+export async function checkAndInstallDependencies() {
+    SpinniesManager.init();
+    uiLogger.log('');
+    SpinniesManager.add('checkingDependencies', {
+        text: lib.localDevHelpers.project.checkAndInstallDependencies
+            .checkingDependencies,
+    });
+    try {
+        const installLocations = await getProjectPackageJsonLocations();
+        const locationsToInstall = [];
+        for (const location of installLocations) {
+            if (await hasMissingPackages(location)) {
+                locationsToInstall.push(location);
+            }
+        }
+        if (locationsToInstall.length > 0) {
+            SpinniesManager.remove('checkingDependencies');
+            await installPackages({ installLocations: locationsToInstall });
+        }
+        else {
+            SpinniesManager.succeed('checkingDependencies', {
+                text: lib.localDevHelpers.project.checkAndInstallDependencies
+                    .dependenciesUpToDate,
+            });
+        }
+        uiLogger.log('');
+    }
+    catch (e) {
+        logError(e);
+        SpinniesManager.fail('checkingDependencies', {
+            text: lib.localDevHelpers.project.checkAndInstallDependencies
+                .dependenciesFailure,
+        });
+        process.exit(EXIT_CODES.ERROR);
+    }
+}

package/lib/projects/platformVersion.d.ts

@@ -1 +1 @@
-export declare function useV3Api(platformVersion?: string | null): boolean;
+export declare function isV2Project(platformVersion?: string | null): boolean;

package/lib/projects/platformVersion.js

@@ -1,4 +1,4 @@
-export function useV3Api(platformVersion) {
+export function isV2Project(platformVersion) {
     if (!platformVersion || typeof platformVersion !== 'string') {
         return false;
     }

package/lib/projects/structure.d.ts

@@ -1,5 +1,5 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects.js';
-import { IntermediateRepresentationNode, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
+import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
 import { AppIRNode } from '../../types/ProjectComponents.js';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
@@ -15,4 +15,4 @@ export declare function getProjectComponentTypes(components: Array<Component>):
 export declare function getComponentUid(component?: Component | null): string | null;
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
-export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev | IntermediateRepresentationNode): component is AppIRNode;
+export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;

package/lib/projects/structure.js

@@ -1,14 +1,14 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { walk } from '@hubspot/local-dev-lib/fs';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 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;
@@ -27,7 +27,7 @@ export function loadConfigFile(configPath) {
             return parsedConfig;
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
     }
     return null;

package/lib/projects/upload.d.ts

@@ -1,5 +1,4 @@
 import { FileResult } from 'tmp';
-import { IntermediateRepresentation } from '@hubspot/project-parsing-lib';
 import { ProjectConfig } from '../../types/Projects.js';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -19,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<IntermediateRepresentation | undefined>;
+export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
 export {};

package/lib/projects/upload.js

@@ -12,9 +12,11 @@ import util from 'node:util';
 import { lib } from '../../lang/en.js';
 import { ensureProjectExists } from './ensureProjectExists.js';
 import { uiLogger } from '../ui/logger.js';
-import { useV3Api } from './platformVersion.js';
+import { isV2Project } 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,15 +106,23 @@ 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 (isV2Project(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);
-    if (!useV3Api(projectConfig.platformVersion) && hasHsMetaFiles) {
+    if (!isV2Project(projectConfig.platformVersion) && hasHsMetaFiles) {
         throw new ProjectValidationError(lib.projectUpload.wrongPlatformVersionMetaFiles);
     }
 }
@@ -133,5 +142,4 @@ export async function handleTranslate(projectDir, projectConfig, accountId, skip
         }
         throw e;
     }
-    return undefined;
 }

package/lib/prompts/__tests__/downloadProjectPrompt.test.js

@@ -11,6 +11,7 @@ vi.mock('@hubspot/local-dev-lib/api/projects', () => ({
 }));
 vi.mock('@hubspot/local-dev-lib/config', () => ({
     getAccountId: vi.fn().mockImplementation(() => 123456789),
+    configFileExists: vi.fn().mockImplementation(() => true),
 }));
 describe('lib/prompts/downloadProjectPrompt', () => {
     it('should honor the account passed as an option', async () => {