@hubspot/local-dev-lib 4.0.0-beta.0 → 4.0.1-beta.0

package/api/fireAlarm.d.ts

@@ -1,3 +1,4 @@
 import { FireAlarm } from '../types/FireAlarm';
 import { HubSpotPromise } from '../types/Http';
+export declare const FIREALARM_API_AUTH_PATH = "firealarm/v4/alarm";
 export declare function fetchFireAlarms(accountId: number): HubSpotPromise<Array<FireAlarm>>;

package/api/fireAlarm.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchFireAlarms = void 0;
+exports.fetchFireAlarms = exports.FIREALARM_API_AUTH_PATH = void 0;
 const http_1 = require("../http");
-const FIREALARM_API_AUTH_PATH = 'firealarm/v4/alarm';
+exports.FIREALARM_API_AUTH_PATH = 'firealarm/v4/alarm';
 function fetchFireAlarms(accountId) {
     return http_1.http.get(accountId, {
-        url: `${FIREALARM_API_AUTH_PATH}/hubspot-cli/${accountId}`,
+        url: `${exports.FIREALARM_API_AUTH_PATH}/hubspot-cli/${accountId}`,
     });
 }
 exports.fetchFireAlarms = fetchFireAlarms;

package/api/projects.d.ts

@@ -4,7 +4,7 @@ import { HubSpotPromise, QueryParams } from '../types/Http';
 import { Project, FetchProjectResponse, UploadProjectResponse, ProjectSettings, FetchPlatformVersionResponse, WarnLogsResponse, UploadIRResponse } from '../types/Project';
 import { Build, FetchProjectBuildsResponse } from '../types/Build';
 import { ComponentStructureResponse, ProjectComponentsMetadata } from '../types/ComponentStructure';
-import { Deploy, ProjectDeployResponse } from '../types/Deploy';
+import { Deploy, ProjectDeployResponse, ProjectDeployResponseV1 } from '../types/Deploy';
 import { MigrateAppResponse, CloneAppResponse, PollAppResponse } from '../types/Migration';
 export declare function fetchProjects(accountId: number): HubSpotPromise<FetchProjectResponse>;
 export declare function createProject(accountId: number, name: string): HubSpotPromise<Project>;
@@ -17,7 +17,12 @@ export declare function fetchPlatformVersions(accountId: number): HubSpotPromise
 export declare function fetchProjectBuilds(accountId: number, projectName: string, params?: QueryParams): HubSpotPromise<FetchProjectBuildsResponse>;
 export declare function getBuildStatus(accountId: number, projectName: string, buildId: number): HubSpotPromise<Build>;
 export declare function getBuildStructure(accountId: number, projectName: string, buildId: number): HubSpotPromise<ComponentStructureResponse>;
+/**
+ * @deprecated Use the separate deployProjectV1 and deployProjectV2
+ */
 export declare function deployProject(accountId: number, projectName: string, buildId: number, useNewDeployApi?: boolean, force?: boolean): HubSpotPromise<ProjectDeployResponse>;
+export declare function deployProjectV1(accountId: number, projectName: string, buildId: number, force?: boolean): HubSpotPromise<ProjectDeployResponseV1>;
+export declare function deployProjectV2(accountId: number, projectName: string, buildId: number, force?: boolean): HubSpotPromise<ProjectDeployResponse>;
 export declare function getDeployStatus(accountId: number, projectName: string, deployId: number): HubSpotPromise<Deploy>;
 export declare function getDeployStructure(accountId: number, projectName: string, deployId: number): HubSpotPromise<ComponentStructureResponse>;
 export declare function fetchProjectSettings(accountId: number, projectName: string): HubSpotPromise<ProjectSettings>;

package/api/projects.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadClonedProject = exports.checkCloneStatus = exports.cloneApp = exports.checkMigrationStatus = exports.migrateApp = exports.fetchDeployWarnLogs = exports.fetchBuildWarnLogs = exports.cancelStagedBuild = exports.deleteFileFromBuild = exports.uploadFileToBuild = exports.queueBuild = exports.provisionBuild = exports.fetchProjectSettings = exports.getDeployStructure = exports.getDeployStatus = exports.deployProject = exports.getBuildStructure = exports.getBuildStatus = exports.fetchProjectBuilds = exports.fetchPlatformVersions = exports.deleteProject = exports.downloadProject = exports.fetchProjectComponentsMetadata = exports.fetchProject = exports.uploadProject = exports.createProject = exports.fetchProjects = void 0;
+exports.downloadClonedProject = exports.checkCloneStatus = exports.cloneApp = exports.checkMigrationStatus = exports.migrateApp = exports.fetchDeployWarnLogs = exports.fetchBuildWarnLogs = exports.cancelStagedBuild = exports.deleteFileFromBuild = exports.uploadFileToBuild = exports.queueBuild = exports.provisionBuild = exports.fetchProjectSettings = exports.getDeployStructure = exports.getDeployStatus = exports.deployProjectV2 = exports.deployProjectV1 = exports.deployProject = exports.getBuildStructure = exports.getBuildStatus = exports.fetchProjectBuilds = exports.fetchPlatformVersions = exports.deleteProject = exports.downloadProject = exports.fetchProjectComponentsMetadata = exports.fetchProject = exports.uploadProject = exports.createProject = exports.fetchProjects = void 0;
 const http_1 = require("../http");
 const fs_1 = __importDefault(require("fs"));
 const PROJECTS_API_PATH = 'dfs/v1/projects';
@@ -116,6 +116,9 @@ function getBuildStructure(accountId, projectName, buildId) {
     });
 }
 exports.getBuildStructure = getBuildStructure;
+/**
+ * @deprecated Use the separate deployProjectV1 and deployProjectV2
+ */
 function deployProject(accountId, projectName, buildId, useNewDeployApi = false, force = false) {
     if (useNewDeployApi) {
         return http_1.http.post(accountId, {
@@ -137,6 +140,28 @@ function deployProject(accountId, projectName, buildId, useNewDeployApi = false,
     });
 }
 exports.deployProject = deployProject;
+function deployProjectV1(accountId, projectName, buildId, force = false) {
+    return http_1.http.post(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH}/deploys/queue/async`,
+        data: {
+            projectName,
+            buildId,
+            skipRemovalWarning: force,
+        },
+    });
+}
+exports.deployProjectV1 = deployProjectV1;
+function deployProjectV2(accountId, projectName, buildId, force = false) {
+    return http_1.http.post(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH_V3}/deploys/queue/async`,
+        data: {
+            projectName,
+            targetBuildId: buildId,
+            ignoreWarnings: force,
+        },
+    });
+}
+exports.deployProjectV2 = deployProjectV2;
 function getDeployStatus(accountId, projectName, deployId) {
     return http_1.http.get(accountId, {
         url: `${PROJECTS_DEPLOY_API_PATH}/deploy-status/projects/${encodeURIComponent(projectName)}/deploys/${deployId}`,

package/config/index.d.ts

@@ -3,7 +3,7 @@ import { HubSpotConfig, ConfigFlag, HubSpotConfigValidationResult } from '../typ
 import { CmsPublishMode } from '../types/Files';
 import { Environment } from '../types/Config';
 export declare function getGlobalConfigFilePath(): string;
-export declare function getLocalConfigFilePathIfExists(): string | null;
+export declare function getLocalConfigFilePathIfExists(cwd?: string): string | null;
 export declare function localConfigFileExists(): boolean;
 export declare function globalConfigFileExists(): boolean;
 export declare function configFileExists(): boolean;

package/config/index.js

@@ -22,11 +22,11 @@ function getGlobalConfigFilePath() {
     return config_1.GLOBAL_CONFIG_PATH;
 }
 exports.getGlobalConfigFilePath = getGlobalConfigFilePath;
-function getLocalConfigFilePathIfExists() {
+function getLocalConfigFilePathIfExists(cwd) {
     return (0, findup_sync_1.default)([
         config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
         config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME.replace('.yml', '.yaml'),
-    ], { cwd: (0, path_1.getCwd)() });
+    ], { cwd: cwd || (0, path_1.getCwd)() });
 }
 exports.getLocalConfigFilePathIfExists = getLocalConfigFilePathIfExists;
 function localConfigFileExists() {

package/errors/index.d.ts

@@ -13,9 +13,9 @@ export declare function isMissingScopeError(err: unknown): err is HubSpotHttpErr
 export declare function isGatingError(err: unknown): err is HubSpotHttpError;
 export declare function isTimeoutError(err: unknown): err is HubSpotHttpError;
 export declare function isAuthError(err: unknown): err is HubSpotHttpError;
-export declare function isValidationError(err: unknown): boolean;
+export declare function isValidationError(err: unknown): err is HubSpotHttpError;
 export declare function isHubSpotHttpError(error?: unknown): error is HubSpotHttpError;
-export declare function isGithubRateLimitError(err: unknown): boolean;
+export declare function isGithubRateLimitError(err: unknown): err is HubSpotHttpError;
 export declare function isSystemError(err: unknown): err is BaseError;
 export declare function isFileSystemError(err: unknown): err is FileSystemError;
 export declare function isHubSpotConfigError(err: unknown): err is HubSpotConfigError;

package/errors/index.js

@@ -45,7 +45,7 @@ function isValidationError(err) {
 }
 exports.isValidationError = isValidationError;
 function isHubSpotHttpError(error) {
-    return !!error && error instanceof HubSpotHttpError_1.HubSpotHttpError;
+    return (!!error && error instanceof Error && error.name === HubSpotHttpError_1.HubSpotHttpErrorName);
 }
 exports.isHubSpotHttpError = isHubSpotHttpError;
 function isGithubRateLimitError(err) {
@@ -68,7 +68,7 @@ function isSystemError(err) {
 }
 exports.isSystemError = isSystemError;
 function isFileSystemError(err) {
-    return err instanceof FileSystemError_1.FileSystemError;
+    return err instanceof Error && err.name === FileSystemError_1.FilerSystemErrorName;
 }
 exports.isFileSystemError = isFileSystemError;
 function isHubSpotConfigError(err) {

package/http/getAxiosConfig.d.ts

@@ -6,4 +6,6 @@ export declare const USER_AGENTS: {
 export declare function getDefaultUserAgentHeader(): {
     'User-Agent': string;
 };
+export declare function hostnameMatchesNoProxyPattern(hostname: string, pattern: string): boolean;
+export declare function shouldUseProxy(baseURL: string): boolean;
 export declare function getAxiosConfig(options: HttpOptions): AxiosRequestConfig;

package/http/getAxiosConfig.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAxiosConfig = exports.getDefaultUserAgentHeader = exports.USER_AGENTS = void 0;
+exports.getAxiosConfig = exports.shouldUseProxy = exports.hostnameMatchesNoProxyPattern = exports.getDefaultUserAgentHeader = exports.USER_AGENTS = void 0;
 const package_json_1 = require("../package.json");
 const config_1 = require("../config");
 const urls_1 = require("../lib/urls");
-const https_1 = __importDefault(require("https"));
 const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
+const http_proxy_agent_1 = require("http-proxy-agent");
+const https_proxy_agent_1 = require("https-proxy-agent");
 // Total number of sockets across all hosts
 const MAX_TOTAL_SOCKETS = 25;
 // Total number of sockets per each host
@@ -23,6 +25,39 @@ const httpsAgent = new https_1.default.Agent({
     maxTotalSockets: MAX_TOTAL_SOCKETS,
     maxSockets: MAX_SOCKETS_PER_HOST,
 });
+function getHttpProxyEnvVariable() {
+    return process.env.HTTP_PROXY || process.env.http_proxy;
+}
+function getHttpsProxyEnvVariable() {
+    return process.env.HTTPS_PROXY || process.env.https_proxy;
+}
+function getAllProxyEnvVariable() {
+    return process.env.ALL_PROXY || process.env.all_proxy;
+}
+function getHttpProxyAgent() {
+    const proxyUrl = getHttpProxyEnvVariable() || getAllProxyEnvVariable();
+    if (!proxyUrl) {
+        return httpAgent;
+    }
+    return new http_proxy_agent_1.HttpProxyAgent(proxyUrl, {
+        keepAlive: true,
+        maxTotalSockets: MAX_TOTAL_SOCKETS,
+        maxSockets: MAX_SOCKETS_PER_HOST,
+    });
+}
+function getHttpsProxyAgent() {
+    const proxyUrl = getHttpProxyEnvVariable() ||
+        getHttpsProxyEnvVariable() ||
+        getAllProxyEnvVariable();
+    if (!proxyUrl) {
+        return httpsAgent;
+    }
+    return new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, {
+        keepAlive: true,
+        maxTotalSockets: MAX_TOTAL_SOCKETS,
+        maxSockets: MAX_SOCKETS_PER_HOST,
+    });
+}
 exports.USER_AGENTS = {
     'HubSpot Local Dev Lib': package_json_1.version,
 };
@@ -39,6 +74,37 @@ exports.getDefaultUserAgentHeader = getDefaultUserAgentHeader;
 const DEFAULT_TRANSITIONAL = {
     clarifyTimeoutError: true,
 };
+function hostnameMatchesNoProxyPattern(hostname, pattern) {
+    const hostnameNormalized = hostname.toLowerCase();
+    const patternNormalized = pattern.trim().toLowerCase();
+    if (patternNormalized === '*') {
+        return true;
+    }
+    if (patternNormalized.startsWith('.')) {
+        return hostnameNormalized.endsWith(patternNormalized);
+    }
+    return (hostnameNormalized === patternNormalized || // exact match (e.g. "api.hubapi.com" matches "api.hubapi.com")
+        hostnameNormalized.endsWith(`.${patternNormalized}`) // domain suffix match (e.g. "api.hubapi.com" matches ".hubapi.com")
+    );
+}
+exports.hostnameMatchesNoProxyPattern = hostnameMatchesNoProxyPattern;
+function shouldUseProxy(baseURL) {
+    if (!getHttpProxyEnvVariable() &&
+        !getHttpsProxyEnvVariable() &&
+        !getAllProxyEnvVariable()) {
+        return false;
+    }
+    const noProxy = process.env.NO_PROXY || process.env.no_proxy;
+    if (noProxy) {
+        const hostname = new URL(baseURL).hostname;
+        const noProxyList = noProxy.split(',').filter(Boolean);
+        if (noProxyList.some(pattern => hostnameMatchesNoProxyPattern(hostname, pattern))) {
+            return false;
+        }
+    }
+    return true;
+}
+exports.shouldUseProxy = shouldUseProxy;
 function getAxiosConfig(options) {
     const { env, localHostOverride, headers, ...rest } = options;
     let config;
@@ -56,16 +122,19 @@ function getAxiosConfig(options) {
     if (config && config.httpUseLocalhost) {
         httpUseLocalhost = config.httpUseLocalhost;
     }
+    const baseURL = (0, urls_1.getHubSpotApiOrigin)(env, localHostOverride ? false : httpUseLocalhost);
     return {
-        baseURL: (0, urls_1.getHubSpotApiOrigin)(env, localHostOverride ? false : httpUseLocalhost),
+        baseURL,
         headers: {
             ...getDefaultUserAgentHeader(),
             ...(headers || {}),
         },
         timeout: httpTimeout,
         transitional: DEFAULT_TRANSITIONAL,
-        httpAgent,
-        httpsAgent,
+        // Disable axios's built-in proxy handling - we use custom agents instead
+        proxy: false,
+        httpAgent: shouldUseProxy(baseURL) ? getHttpProxyAgent() : httpAgent,
+        httpsAgent: shouldUseProxy(baseURL) ? getHttpsProxyAgent() : httpsAgent,
         ...rest,
     };
 }

package/http/index.js

@@ -41,6 +41,7 @@ const lang_1 = require("../utils/lang");
 const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
 const auth_1 = require("../constants/auth");
 const localDevAuth_1 = require("../api/localDevAuth");
+const fireAlarm_1 = require("../api/fireAlarm");
 const util = __importStar(require("util"));
 const trackUsage_1 = require("../lib/trackUsage");
 const i18nKey = 'http.index';
@@ -48,14 +49,15 @@ const IGNORE_URLS_NETWORK_DEBUG = [
     localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH,
     trackUsage_1.CMS_CLI_USAGE_PATH,
     trackUsage_1.VSCODE_USAGE_PATH,
+    fireAlarm_1.FIREALARM_API_AUTH_PATH,
 ];
 function logRequest(response) {
     try {
         if (!process.env.HUBSPOT_NETWORK_LOGGING) {
             return;
         }
-        if (response?.config?.url &&
-            IGNORE_URLS_NETWORK_DEBUG.includes(response.config.url)) {
+        if (!process.env.HUBSPOT_DEBUG_LOGGING_VERBOSE &&
+            IGNORE_URLS_NETWORK_DEBUG.some(url => response?.config?.url && response.config.url.includes(url))) {
             return;
         }
         logger_1.logger.debug(util.inspect({

package/lib/portManager.d.ts

@@ -1,4 +1,4 @@
-import { RequestPortsData } from '../types/PortManager';
+import { RequestPortsData, ServerPortMap } from '../types/PortManager';
 export declare const BASE_URL: string;
 export declare function isPortManagerPortAvailable(): Promise<boolean>;
 export declare function isPortManagerServerRunning(): Promise<boolean>;
@@ -7,6 +7,7 @@ export declare function stopPortManagerServer(): Promise<void>;
 export declare function requestPorts(portData: Array<RequestPortsData>): Promise<{
     [instanceId: string]: number;
 }>;
+export declare function getActiveServers(): Promise<ServerPortMap>;
 export declare function getServerPortByInstanceId(serverInstanceId: string): Promise<number>;
 export declare function deleteServerInstance(serverInstanceId: string): Promise<void>;
 export declare function portManagerHasActiveServers(): Promise<boolean>;

package/lib/portManager.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.getServerPortByInstanceId = exports.requestPorts = exports.stopPortManagerServer = exports.startPortManagerServer = exports.isPortManagerServerRunning = exports.isPortManagerPortAvailable = exports.BASE_URL = void 0;
+exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.getServerPortByInstanceId = exports.getActiveServers = exports.requestPorts = exports.stopPortManagerServer = exports.startPortManagerServer = exports.isPortManagerServerRunning = exports.isPortManagerPortAvailable = exports.BASE_URL = void 0;
 const axios_1 = __importDefault(require("axios"));
 const PortManagerServer_1 = require("../utils/PortManagerServer");
 const ports_1 = require("../constants/ports");
@@ -45,6 +45,11 @@ async function requestPorts(portData) {
     return data.ports;
 }
 exports.requestPorts = requestPorts;
+async function getActiveServers() {
+    const { data } = await axios_1.default.get(`${exports.BASE_URL}/servers`);
+    return data.servers;
+}
+exports.getActiveServers = getActiveServers;
 async function getServerPortByInstanceId(serverInstanceId) {
     const { data } = await axios_1.default.get(`${exports.BASE_URL}/servers/${serverInstanceId}`);
     return data.port;

package/models/FileSystemError.d.ts

@@ -1,4 +1,5 @@
 import { FileSystemErrorContext } from '../types/Error';
+export declare const FilerSystemErrorName = "FilerSystemError";
 export declare class FileSystemError extends Error {
     private context;
     constructor(options?: ErrorOptions, context?: FileSystemErrorContext);

package/models/FileSystemError.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileSystemError = void 0;
+exports.FileSystemError = exports.FilerSystemErrorName = void 0;
 const lang_1 = require("../utils/lang");
 const errors_1 = require("../errors");
 const i18nKey = 'errors.fileSystemErrors';
+exports.FilerSystemErrorName = 'FilerSystemError';
 class FileSystemError extends Error {
     context;
     constructor(options, context) {
         super('', options);
-        this.name = 'FileSystemError';
+        this.name = exports.FilerSystemErrorName;
         this.context = context;
         if (context) {
             let fileAction = '';

package/models/HubSpotHttpError.d.ts

@@ -1,4 +1,5 @@
 import { HubSpotHttpErrorContext } from '../types/Error';
+export declare const HubSpotHttpErrorName = "HubSpotHttpError";
 export declare class HubSpotHttpError<T = any> extends Error {
     status?: number;
     code?: string;
@@ -17,7 +18,7 @@ export declare class HubSpotHttpError<T = any> extends Error {
     timeout?: number;
     correlationId?: string;
     constructor(message?: string, options?: ErrorOptions, context?: HubSpotHttpErrorContext);
-    updateContext(context: Partial<HubSpotHttpErrorContext>): void;
+    updateContext(context: Partial<HubSpotHttpErrorContext>, additionalDebugContext?: string): void;
     toString(): string;
     formattedValidationErrors(): string;
     private extractDerivedContext;

package/models/HubSpotHttpError.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HubSpotHttpError = void 0;
+exports.HubSpotHttpError = exports.HubSpotHttpErrorName = void 0;
 const axios_1 = require("axios");
 const api_1 = require("../constants/api");
 const lang_1 = require("../utils/lang");
+exports.HubSpotHttpErrorName = 'HubSpotHttpError';
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 class HubSpotHttpError extends Error {
     status;
@@ -22,7 +23,7 @@ class HubSpotHttpError extends Error {
     correlationId;
     constructor(message, options, context) {
         super(message, options);
-        this.name = 'HubSpotHttpError';
+        this.name = exports.HubSpotHttpErrorName;
         this.context = context;
         this.cause = options?.cause;
         if (options && (0, axios_1.isAxiosError)(options.cause)) {
@@ -60,11 +61,11 @@ class HubSpotHttpError extends Error {
             this.message = messages.join(' ');
         }
     }
-    updateContext(context) {
+    updateContext(context, additionalDebugContext) {
         this.context = { ...this.context, ...context };
         // Update the error messages when the context is updated
         if ((0, axios_1.isAxiosError)(this.cause)) {
-            this.message = this.joinErrorMessages(this.cause, this.context);
+            this.message = this.joinErrorMessages(this.cause, this.context, additionalDebugContext);
         }
     }
     toString() {
@@ -137,8 +138,7 @@ class HubSpotHttpError extends Error {
         }
         this.validationErrors = errorMessages;
     }
-    joinErrorMessages(error, context = {}) {
-        const i18nKey = 'errors.apiErrors';
+    joinErrorMessages(error, context = {}, additionalDebugContext) {
         const status = error.response?.status;
         const method = error.config?.method;
         let messageDetail;
@@ -149,48 +149,68 @@ class HubSpotHttpError extends Error {
             const requestName = context.request
                 ? `${action} ${preposition} '${context.request}'`
                 : action;
-            messageDetail = (0, lang_1.i18n)(`${i18nKey}.messageDetail`, {
+            messageDetail = (0, lang_1.i18n)(`errors.apiErrors.messageDetail`, {
                 accountId: context.accountId,
                 requestName,
             });
         }
         else {
-            messageDetail = (0, lang_1.i18n)(`${i18nKey}.genericMessageDetail`);
+            messageDetail = (0, lang_1.i18n)(`errors.apiErrors.genericMessageDetail`);
         }
         const errorMessage = [];
         if ((method === 'put' || method === 'post') && context.payload) {
-            errorMessage.push((0, lang_1.i18n)(`${i18nKey}.unableToUpload`, { payload: context.payload }));
+            errorMessage.push((0, lang_1.i18n)(`errors.apiErrors.unableToUpload`, { payload: context.payload }));
         }
+        let statusBasedMessage;
         switch (status) {
             case 400:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.400`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.400`, {
+                    messageDetail,
+                });
                 break;
             case 401:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.401`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.401`, {
+                    messageDetail,
+                });
                 break;
             case 403:
                 break;
             case 404:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.404`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.404`, {
+                    messageDetail,
+                });
                 break;
             case 429:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.429`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.429`, {
+                    messageDetail,
+                });
                 break;
             case 503:
-                errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.503`, { messageDetail }));
+                statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.503`, {
+                    messageDetail,
+                });
                 break;
             default:
                 if (status && status >= 500 && status < 600) {
-                    errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.500Generic`, { messageDetail }));
+                    statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.500Generic`, {
+                        messageDetail,
+                    });
                 }
                 else if (status && status >= 400 && status < 500) {
-                    errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.400Generic`, { messageDetail }));
+                    statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.400Generic`, {
+                        messageDetail,
+                    });
                 }
                 else {
-                    errorMessage.push((0, lang_1.i18n)(`${i18nKey}.codes.generic`, { messageDetail }));
+                    statusBasedMessage = (0, lang_1.i18n)(`errors.apiErrors.codes.generic`, {
+                        messageDetail,
+                    });
                 }
                 break;
         }
+        if (statusBasedMessage) {
+            errorMessage.push(`${statusBasedMessage}${additionalDebugContext ? ` ${additionalDebugContext}` : ''}`);
+        }
         if (error?.response?.data) {
             const { message, errors } = error.response.data;
             if (message) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "4.0.0-beta.0",
+    "version": "4.0.1-beta.0",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -73,6 +73,8 @@
         "findup-sync": "5.0.0",
         "form-data": "^4.0.4",
         "fs-extra": "11.2.0",
+        "http-proxy-agent": "7.0.2",
+        "https-proxy-agent": "7.0.6",
         "ignore": "5.3.1",
         "js-yaml": "4.1.0",
         "moment": "2.30.1",

package/types/Deploy.d.ts

@@ -35,13 +35,6 @@ export type DeployStatusTaskLocator = {
         status: string;
     }>;
 };
-export type ProjectDeployResponseQueued = {
-    id: string;
-    buildResultType: 'DEPLOY_QUEUED';
-    links: {
-        status: string;
-    };
-};
 export type SubdeployValidationIssue = {
     uid: string;
     componentTypeName: string;
@@ -51,8 +44,20 @@ export type SubdeployValidationIssue = {
         isWarning: boolean;
     }[];
 };
+export type DeployResponseLinks = {
+    status: string;
+};
+export type ProjectDeployResponseQueued = {
+    id: string;
+    buildResultType: 'DEPLOY_QUEUED';
+    links: DeployResponseLinks;
+};
 export type ProjectDeployResponseBlocked = {
     buildResultType: 'DEPLOY_BLOCKED';
     issues: SubdeployValidationIssue[];
 };
 export type ProjectDeployResponse = ProjectDeployResponseQueued | ProjectDeployResponseBlocked;
+export type ProjectDeployResponseV1 = {
+    id: string;
+    links: DeployResponseLinks;
+};

package/utils/git.js

@@ -12,8 +12,9 @@ const GITIGNORE_FILE = '.gitignore';
 function makeComparisonDir(filepath) {
     if (typeof filepath !== 'string')
         return null;
+    let dir = path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase();
     // Append sep to make comparisons easier e.g. 'foos'.startsWith('foo')
-    return path_1.default.dirname(path_1.default.resolve(filepath)).toLowerCase() + path_1.default.sep;
+    return dir + (!dir.endsWith(path_1.default.sep) ? path_1.default.sep : '');
 }
 function getGitComparisonDir() {
     return makeComparisonDir((0, findup_sync_1.default)('.git'));