@hubspot/local-dev-lib 3.4.0-beta.0 → 3.4.0
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/migrate.js +10 -5
- package/package.json +1 -1
package/config/migrate.js
CHANGED
|
@@ -120,11 +120,16 @@ function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
|
|
|
120
120
|
if (config_1.DEFAULT_ACCOUNT in globalConfig &&
|
|
121
121
|
config_1.DEFAULT_PORTAL in deprecatedConfig &&
|
|
122
122
|
globalConfig.defaultAccount !== deprecatedConfig.defaultPortal) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
123
|
+
if (force) {
|
|
124
|
+
globalConfig.defaultAccount = deprecatedConfig.defaultPortal;
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
conflicts.push({
|
|
128
|
+
property: config_1.DEFAULT_ACCOUNT,
|
|
129
|
+
oldValue: deprecatedConfig.defaultPortal,
|
|
130
|
+
newValue: globalConfig.defaultAccount,
|
|
131
|
+
});
|
|
132
|
+
}
|
|
128
133
|
}
|
|
129
134
|
else if (config_1.DEFAULT_PORTAL in deprecatedConfig) {
|
|
130
135
|
globalConfig.defaultAccount = deprecatedConfig.defaultPortal;
|
package/package.json
CHANGED