@hubspot/local-dev-lib 0.5.0-experimental.3 → 0.5.0-experimental.5

package/config/index.d.ts

@@ -4,6 +4,7 @@ import { CmsPublishMode } from '../types/Files';
 import { Environment } from '../types/Config';
 export declare function localConfigFileExists(): boolean;
 export declare function globalConfigFileExists(): boolean;
+export declare function configFileExists(): boolean;
 export declare function getConfigFilePath(): string;
 export declare function getConfig(): HubSpotConfig;
 export declare function isConfigValid(): boolean;

package/config/index.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.removeLocalStateFlag = exports.addLocalStateFlag = exports.hasLocalStateFlag = exports.isConfigFlagEnabled = exports.updateDefaultCmsPublishMode = exports.updateAutoOpenBrowser = exports.updateAllowAutoUpdates = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.removeAccountFromConfig = exports.renameConfigAccount = exports.setConfigAccountAsDefault = exports.updateConfigAccount = exports.addConfigAccount = exports.getConfigAccountEnvironment = exports.getAllConfigAccounts = exports.getConfigDefaultAccountIfExists = exports.getConfigDefaultAccount = exports.getConfigAccountIfExists = exports.getConfigAccountByName = exports.getConfigAccountById = exports.deleteConfigFile = exports.createEmptyConfigFile = exports.isConfigValid = exports.getConfig = exports.getConfigFilePath = exports.globalConfigFileExists = exports.localConfigFileExists = void 0;
+exports.removeLocalStateFlag = exports.addLocalStateFlag = exports.hasLocalStateFlag = exports.isConfigFlagEnabled = exports.updateDefaultCmsPublishMode = exports.updateAutoOpenBrowser = exports.updateAllowAutoUpdates = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.removeAccountFromConfig = exports.renameConfigAccount = exports.setConfigAccountAsDefault = exports.updateConfigAccount = exports.addConfigAccount = exports.getConfigAccountEnvironment = exports.getAllConfigAccounts = exports.getConfigDefaultAccountIfExists = exports.getConfigDefaultAccount = exports.getConfigAccountIfExists = exports.getConfigAccountByName = exports.getConfigAccountById = exports.deleteConfigFile = exports.createEmptyConfigFile = exports.isConfigValid = exports.getConfig = exports.getConfigFilePath = exports.configFileExists = exports.globalConfigFileExists = exports.localConfigFileExists = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const config_1 = require("../constants/config");
 const logger_1 = require("../lib/logger");
@@ -22,6 +22,15 @@ function globalConfigFileExists() {
     return fs_extra_1.default.existsSync((0, utils_1.getGlobalConfigFilePath)());
 }
 exports.globalConfigFileExists = globalConfigFileExists;
+function configFileExists() {
+    try {
+        return fs_extra_1.default.existsSync(getConfigFilePath());
+    }
+    catch (error) {
+        return false;
+    }
+}
+exports.configFileExists = configFileExists;
 function getConfigDefaultFilePath() {
     const globalConfigFilePath = (0, utils_1.getGlobalConfigFilePath)();
     if (fs_extra_1.default.existsSync(globalConfigFilePath)) {
@@ -135,7 +144,9 @@ exports.getConfigAccountIfExists = getConfigAccountIfExists;
 function getConfigDefaultAccount() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    if (globalConfigFileExists()) {
+    const currentConfigPath = getConfigFilePath();
+    const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
+    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
     }
@@ -154,7 +165,10 @@ exports.getConfigDefaultAccount = getConfigDefaultAccount;
 function getConfigDefaultAccountIfExists() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    if (globalConfigFileExists()) {
+    // Only check for default account override if we're using the global config
+    const currentConfigPath = getConfigFilePath();
+    const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
+    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.5.0-experimental.3",
+    "version": "0.5.0-experimental.5",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -21,7 +21,6 @@
     "license": "Apache-2.0",
     "devDependencies": {
         "@hubspot/npm-scripts": "0.0.4",
-        "@inquirer/prompts": "^7.0.1",
         "@types/content-disposition": "^0.5.5",
         "@types/cors": "^2.8.15",
         "@types/debounce": "^1.2.1",