@hubspot/local-dev-lib 0.5.0-experimental.3 → 0.5.0-experimental.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config/index.js +7 -2
- package/package.json +1 -2
package/config/index.js
CHANGED
|
@@ -135,7 +135,9 @@ exports.getConfigAccountIfExists = getConfigAccountIfExists;
|
|
|
135
135
|
function getConfigDefaultAccount() {
|
|
136
136
|
const { accounts, defaultAccount } = getConfig();
|
|
137
137
|
let defaultAccountToUse = defaultAccount;
|
|
138
|
-
|
|
138
|
+
const currentConfigPath = getConfigFilePath();
|
|
139
|
+
const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
|
|
140
|
+
if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
|
|
139
141
|
const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
|
|
140
142
|
defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
|
|
141
143
|
}
|
|
@@ -154,7 +156,10 @@ exports.getConfigDefaultAccount = getConfigDefaultAccount;
|
|
|
154
156
|
function getConfigDefaultAccountIfExists() {
|
|
155
157
|
const { accounts, defaultAccount } = getConfig();
|
|
156
158
|
let defaultAccountToUse = defaultAccount;
|
|
157
|
-
if
|
|
159
|
+
// Only check for default account override if we're using the global config
|
|
160
|
+
const currentConfigPath = getConfigFilePath();
|
|
161
|
+
const globalConfigPath = (0, utils_1.getGlobalConfigFilePath)();
|
|
162
|
+
if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
|
|
158
163
|
const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
|
|
159
164
|
defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
|
|
160
165
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hubspot/local-dev-lib",
|
|
3
|
-
"version": "0.5.0-experimental.
|
|
3
|
+
"version": "0.5.0-experimental.4",
|
|
4
4
|
"description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -21,7 +21,6 @@
|
|
|
21
21
|
"license": "Apache-2.0",
|
|
22
22
|
"devDependencies": {
|
|
23
23
|
"@hubspot/npm-scripts": "0.0.4",
|
|
24
|
-
"@inquirer/prompts": "^7.0.1",
|
|
25
24
|
"@types/content-disposition": "^0.5.5",
|
|
26
25
|
"@types/cors": "^2.8.15",
|
|
27
26
|
"@types/debounce": "^1.2.1",
|