@hubspot/cli 7.8.12-experimental.0 → 7.9.0-beta.0

package/lib/constants.d.ts

@@ -76,7 +76,6 @@ export declare const APP_AUTH_TYPES: {
     readonly STATIC: "static";
 };
 export declare const FEATURES: {
-    readonly UNIFIED_THEME_PREVIEW: "cms:react:unifiedThemePreview";
     readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
     readonly SANDBOXES_V2: "sandboxes:v2:enabled";
     readonly SANDBOXES_V2_CLI: "sandboxes:v2:cliEnabled";
@@ -96,16 +95,21 @@ export declare const LOCAL_DEV_UI_MESSAGE_SEND_TYPES: {
     UPDATE_PROJECT_DATA: string;
     UPDATE_UPLOAD_WARNINGS: string;
     CLI_METADATA: string;
+    DEV_SERVERS_STARTED: string;
 };
 export declare const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES: {
     UPLOAD: string;
     DEPLOY: string;
     VIEWED_WELCOME_SCREEN: string;
+    APP_INSTALL_SUCCESS: string;
+    APP_INSTALL_INITIATED: string;
+    APP_INSTALL_FAILURE: string;
 };
 export declare const APP_INSTALLATION_STATES: {
     readonly NOT_INSTALLED: "NOT_INSTALLED";
     readonly INSTALLED: "INSTALLED";
     readonly INSTALLED_WITH_OUTDATED_SCOPES: "INSTALLED_WITH_OUTDATED_SCOPES";
+    readonly UNKNOWN: "UNKNOWN";
 };
 export declare const staticAuth = "static";
 export declare const oAuth = "oauth";
@@ -119,9 +123,19 @@ export declare const GET_STARTED_OPTIONS: {
 export declare const LOCAL_DEV_SERVER_MESSAGE_TYPES: {
     readonly INITIAL: "INITIAL";
     readonly WEBSOCKET_SERVER_CONNECTED: "WEBSOCKET_SERVER_CONNECTED";
+    readonly STATIC_AUTH_APP_INSTALL_SUCCESS: "APP_INSTALL_SUCCESS";
+    readonly STATIC_AUTH_APP_INSTALL_FAILURE: "APP_INSTALL_FAILURE";
+    readonly OAUTH_APP_INSTALL_INITIATED: "APP_INSTALL_INITIATED";
 };
+export declare const LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID = "local-dev-ui-websocket-server";
 export declare const CONFIG_LOCAL_STATE_FLAGS: {
     readonly LOCAL_DEV_UI_WELCOME: "LOCAL_DEV_UI_WELCOME";
 };
 export declare const EMPTY_PROJECT = "empty";
 export declare const PROJECT_WITH_APP = "app";
+export declare const LEGACY_SERVERLESS_FILE = "serverless.json";
+export declare const LEGACY_PUBLIC_APP_FILE = "public-app.json";
+export declare const LEGACY_PRIVATE_APP_FILE = "app.json";
+export declare const THEME_FILE = "theme.json";
+export declare const CMS_ASSETS_FILE = "cms-assets.json";
+export declare const LEGACY_CONFIG_FILES: string[];

package/lib/constants.js

@@ -68,7 +68,6 @@ export const APP_AUTH_TYPES = {
     STATIC: 'static',
 };
 export const FEATURES = {
-    UNIFIED_THEME_PREVIEW: 'cms:react:unifiedThemePreview',
     UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
     SANDBOXES_V2: 'sandboxes:v2:enabled',
     SANDBOXES_V2_CLI: 'sandboxes:v2:cliEnabled',
@@ -88,16 +87,21 @@ export const LOCAL_DEV_UI_MESSAGE_SEND_TYPES = {
     UPDATE_PROJECT_DATA: 'server:updateProjectData',
     UPDATE_UPLOAD_WARNINGS: 'server:updateUploadWarnings',
     CLI_METADATA: 'server:cliMetadata',
+    DEV_SERVERS_STARTED: 'server:devServersStarted',
 };
 export const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = {
     UPLOAD: 'client:upload',
     DEPLOY: 'client:deploy',
     VIEWED_WELCOME_SCREEN: 'client:viewedWelcomeScreen',
+    APP_INSTALL_SUCCESS: 'client:installSuccess',
+    APP_INSTALL_INITIATED: 'client:installInitiated',
+    APP_INSTALL_FAILURE: 'client:installFailure',
 };
 export const APP_INSTALLATION_STATES = {
     NOT_INSTALLED: 'NOT_INSTALLED',
     INSTALLED: 'INSTALLED',
     INSTALLED_WITH_OUTDATED_SCOPES: 'INSTALLED_WITH_OUTDATED_SCOPES',
+    UNKNOWN: 'UNKNOWN',
 };
 export const staticAuth = 'static';
 export const oAuth = 'oauth';
@@ -111,9 +115,23 @@ export const GET_STARTED_OPTIONS = {
 export const LOCAL_DEV_SERVER_MESSAGE_TYPES = {
     INITIAL: 'INITIAL',
     WEBSOCKET_SERVER_CONNECTED: 'WEBSOCKET_SERVER_CONNECTED',
+    STATIC_AUTH_APP_INSTALL_SUCCESS: 'APP_INSTALL_SUCCESS',
+    STATIC_AUTH_APP_INSTALL_FAILURE: 'APP_INSTALL_FAILURE',
+    OAUTH_APP_INSTALL_INITIATED: 'APP_INSTALL_INITIATED',
 };
+export const LOCAL_DEV_WEBSOCKET_SERVER_INSTANCE_ID = 'local-dev-ui-websocket-server';
 export const CONFIG_LOCAL_STATE_FLAGS = {
     LOCAL_DEV_UI_WELCOME: 'LOCAL_DEV_UI_WELCOME',
 };
 export const EMPTY_PROJECT = 'empty';
 export const PROJECT_WITH_APP = 'app';
+export const LEGACY_SERVERLESS_FILE = 'serverless.json';
+export const LEGACY_PUBLIC_APP_FILE = 'public-app.json';
+export const LEGACY_PRIVATE_APP_FILE = 'app.json';
+export const THEME_FILE = 'theme.json';
+export const CMS_ASSETS_FILE = 'cms-assets.json';
+export const LEGACY_CONFIG_FILES = [
+    LEGACY_SERVERLESS_FILE,
+    LEGACY_PRIVATE_APP_FILE,
+    LEGACY_PUBLIC_APP_FILE,
+];

package/lib/dependencyManagement.js

@@ -4,16 +4,12 @@ import path from 'path';
 import { exec as execAsync } from 'node:child_process';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import { getProjectConfig } from './projects/config.js';
-import { uiLink } from './ui/index.js';
-import { i18n } from './lang.js';
+import { commands } from '../lang/en.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { isGloballyInstalled, executeInstall, DEFAULT_PACKAGE_MANAGER, } from './npm.js';
 class NoPackageJsonFilesError extends Error {
     constructor(projectName) {
-        super(i18n(`commands.project.subcommands.installDeps.noPackageJsonInProject`, {
-            projectName,
-            link: uiLink('Learn how to create a project from scratch.', 'https://developers.hubspot.com/beta-docs/guides/crm/intro/create-a-project'),
-        }));
+        super(commands.project.installDeps.noPackageJsonInProject(projectName));
     }
 }
 export async function installPackages({ packages, installLocations, }) {
@@ -28,31 +24,20 @@ async function installPackagesInDirectory(directory, packages) {
     SpinniesManager.init();
     SpinniesManager.add(spinner, {
         text: packages && packages.length
-            ? i18n(`commands.project.subcommands.installDeps.addingDependenciesToLocation`, {
-                dependencies: `[${packages.join(', ')}]`,
-                directory: relativeDir,
-            })
-            : i18n(`commands.project.subcommands.installDeps.installingDependencies`, {
-                directory: relativeDir,
-            }),
+            ? commands.project.installDeps.addingDependenciesToLocation(`[${packages.join(', ')}]`, relativeDir)
+            : commands.project.installDeps.installingDependencies(relativeDir),
     });
     try {
         await executeInstall(packages, null, { cwd: directory });
         SpinniesManager.succeed(spinner, {
-            text: i18n(`commands.project.subcommands.installDeps.installationSuccessful`, {
-                directory: relativeDir,
-            }),
+            text: commands.project.installDeps.installationSuccessful(relativeDir),
         });
     }
     catch (e) {
         SpinniesManager.fail(spinner, {
-            text: i18n(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
-                directory: relativeDir,
-            }),
+            text: commands.project.installDeps.installingDependenciesFailed(relativeDir),
         });
-        throw new Error(i18n(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
-            directory: relativeDir,
-        }), {
+        throw new Error(commands.project.installDeps.installingDependenciesFailed(relativeDir), {
             cause: e,
         });
     }
@@ -62,14 +47,11 @@ export async function getProjectPackageJsonLocations(dir) {
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {
-        throw new Error(i18n(`commands.project.subcommands.installDeps.noProjectConfig`));
+        throw new Error(commands.project.installDeps.noProjectConfig);
     }
     const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
     if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
-        throw new Error(i18n(`commands.project.subcommands.installDeps.packageManagerNotInstalled`, {
-            packageManager: DEFAULT_PACKAGE_MANAGER,
-            link: uiLink(DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
-        }));
+        throw new Error(commands.project.installDeps.packageManagerNotInstalled(DEFAULT_PACKAGE_MANAGER));
     }
     if (!fs.existsSync(projectConfig.projectDir) ||
         !fs.existsSync(path.join(projectDir, srcDir))) {

package/lib/developerTestAccounts.js

@@ -3,9 +3,9 @@ import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { isMissingScopeError, isSpecifiedError, } from '@hubspot/local-dev-lib/errors/index';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { i18n } from './lang.js';
+import { lib } from '../lang/en.js';
 import { uiAccountDescription } from './ui/index.js';
 import { logError } from './errorHandlers/index.js';
 export function getHasDevTestAccounts(appDeveloperAccountConfig) {
@@ -39,42 +39,28 @@ export async function validateDevTestAccountUsageLimits(accountConfig) {
     if (count >= limit) {
         const hasDevTestAccounts = getHasDevTestAccounts(accountConfig);
         if (hasDevTestAccounts) {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.alreadyInConfig', {
-                accountName: accountConfig.name || accountId,
-                limit,
-            }));
+            throw new Error(lib.developerTestAccount.create.failure.alreadyInConfig(accountConfig.name || accountId, limit));
         }
         else {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.limit', {
-                accountName: accountConfig.name || accountId,
-                limit,
-            }));
+            throw new Error(lib.developerTestAccount.create.failure.limit(accountConfig.name || accountId, limit));
         }
     }
     return data;
 }
 export function handleDeveloperTestAccountCreateError(err, accountId, env, portalLimit) {
     if (isMissingScopeError(err)) {
-        logger.error(i18n('lib.developerTestAccount.create.failure.scopes.message', {
-            accountName: uiAccountDescription(accountId),
-        }));
+        uiLogger.error(lib.developerTestAccount.create.failure.scopes.message);
         const websiteOrigin = getHubSpotWebsiteOrigin(env);
         const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-        logger.info(i18n('lib.developerTestAccount.create.failure.scopes.instructions', {
-            accountName: uiAccountDescription(accountId),
-            url,
-        }));
+        uiLogger.info(lib.developerTestAccount.create.failure.scopes.instructions(uiAccountDescription(accountId), url));
     }
     else if (isSpecifiedError(err, {
         statusCode: 400,
         errorType: 'TEST_PORTAL_LIMIT_REACHED',
     })) {
-        logger.log('');
-        logger.error(i18n('lib.developerTestAccount.create.failure.limit', {
-            accountName: uiAccountDescription(accountId),
-            limit: portalLimit,
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.error(lib.developerTestAccount.create.failure.limit(uiAccountDescription(accountId), portalLimit));
+        uiLogger.log('');
     }
     else {
         logError(err);

package/lib/doctor/Diagnosis.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { helpers } from '../interpolation.js';
 import { uiAccountDescription } from '../ui/index.js';
 import { indent } from '../ui/index.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 export class Diagnosis {
     prefixes;
     diagnosis;
@@ -18,38 +18,30 @@ export class Diagnosis {
         };
         this.diagnosis = {
             cli: {
-                header: i18n(`lib.doctor.diagnosis.cli.header`),
+                header: lib.doctor.diagnosis.cli.header,
                 sections: [],
             },
             cliConfig: {
-                header: i18n(`lib.doctor.diagnosis.cliConfig.header`),
+                header: lib.doctor.diagnosis.cliConfig.header,
                 sections: [],
             },
             defaultAccountOverrideFile: {
-                header: i18n(`lib.doctor.diagnosis.defaultAccountOverrideFile.header`),
+                header: lib.doctor.diagnosis.defaultAccountOverrideFile.header,
                 sections: [],
             },
             project: {
-                header: i18n(`lib.doctor.diagnosis.projectConfig.header`),
+                header: lib.doctor.diagnosis.projectConfig.header,
                 subheaders: [
-                    i18n(`lib.doctor.diagnosis.projectConfig.projectDirSubHeader`, {
-                        projectDir: diagnosticInfo.project?.config?.projectDir,
-                    }),
-                    i18n(`lib.doctor.diagnosis.projectConfig.projectNameSubHeader`, {
-                        projectName: diagnosticInfo.project?.config?.projectConfig?.name,
-                    }),
+                    lib.doctor.diagnosis.projectConfig.projectDirSubHeader(diagnosticInfo.project?.config?.projectDir || ''),
+                    lib.doctor.diagnosis.projectConfig.projectNameSubHeader(diagnosticInfo.project?.config?.projectConfig?.name || ''),
                 ],
                 sections: [],
             },
         };
         if (diagnosticInfo.config) {
             this.diagnosis.cliConfig.subheaders = [
-                i18n(`lib.doctor.diagnosis.cliConfig.configFileSubHeader`, {
-                    filename: diagnosticInfo.config,
-                }),
-                i18n(`lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader`, {
-                    accountDetails: uiAccountDescription(accountId),
-                }),
+                lib.doctor.diagnosis.cliConfig.configFileSubHeader(diagnosticInfo.config),
+                lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader(uiAccountDescription(accountId)),
             ];
         }
     }
@@ -83,12 +75,8 @@ export class Diagnosis {
             return '';
         }
         output.push('');
-        output.push(i18n(`lib.doctor.diagnosis.counts.errors`, {
-            count: this.errorCount,
-        }));
-        output.push(i18n(`lib.doctor.diagnosis.counts.warnings`, {
-            count: this.warningCount,
-        }));
+        output.push(lib.doctor.diagnosis.counts.errors(this.errorCount));
+        output.push(lib.doctor.diagnosis.counts.warnings(this.warningCount));
         output.push('');
         return output.join('\n');
     }

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -2,22 +2,23 @@ import { getProjectConfig } from '../projects/config.js';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import pkg from '../../package.json' with { type: 'json' };
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { getAccountId, getDefaultAccountOverrideFilePath, isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
 import { getAccountConfig, getConfigPath } from '@hubspot/local-dev-lib/config';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import util from 'util';
 import { exec as execAsync } from 'node:child_process';
+import { CMS_ASSETS_FILE, LEGACY_PRIVATE_APP_FILE, LEGACY_PUBLIC_APP_FILE, LEGACY_SERVERLESS_FILE, PROJECT_CONFIG_FILE, THEME_FILE, } from '../constants.js';
 // This needs to be hardcoded since we are using it in the TS type
 const hubspotCli = '@hubspot/cli';
 const configFiles = [
-    'serverless.json',
-    'hsproject.json',
-    'app.json',
-    'public-app.json',
-    'theme.json',
-    'cms-assets.json',
+    LEGACY_SERVERLESS_FILE,
+    PROJECT_CONFIG_FILE,
+    LEGACY_PRIVATE_APP_FILE,
+    LEGACY_PUBLIC_APP_FILE,
+    THEME_FILE,
+    CMS_ASSETS_FILE,
 ];
 export class DiagnosticInfoBuilder {
     accountId;
@@ -89,7 +90,7 @@ export class DiagnosticInfoBuilder {
             this.projectDetails = data;
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
     }
     async fetchAccessToken() {
@@ -97,7 +98,7 @@ export class DiagnosticInfoBuilder {
             this.accessToken = await getAccessToken(this.personalAccessKey, this.env, this.accountId);
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
         return this.accessToken;
     }
@@ -109,7 +110,7 @@ export class DiagnosticInfoBuilder {
                 .map(filename => path.relative(this._projectConfig.projectDir, filename));
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
         }
     }
     async getNpmVersion() {
@@ -119,7 +120,7 @@ export class DiagnosticInfoBuilder {
             return stdout.toString().trim();
         }
         catch (e) {
-            logger.debug(e);
+            uiLogger.debug(e);
             return null;
         }
     }