|
@@ -13,17 +13,17 @@ const DefaultSettings = {
|
|
|
module.exports = function MigrateSettings(from_ver, to_ver, settings) {
|
|
module.exports = function MigrateSettings(from_ver, to_ver, settings) {
|
|
|
if (from_ver === undefined) {
|
|
if (from_ver === undefined) {
|
|
|
// Migrate legacy config file
|
|
// Migrate legacy config file
|
|
|
- return DefaultSettings;
|
|
|
|
|
|
|
+ return Object.assign(Object.assign({}, DefaultSettings), settings);
|
|
|
} else if (from_ver === null) {
|
|
} else if (from_ver === null) {
|
|
|
// No config file exists, use default settings
|
|
// No config file exists, use default settings
|
|
|
return DefaultSettings;
|
|
return DefaultSettings;
|
|
|
} else {
|
|
} else {
|
|
|
- if(from + 1 < to) {
|
|
|
|
|
|
|
+ if (from_ver + 1 < to_ver) {
|
|
|
settings = MigrateSettings(from_ver, from_ver + 1, settings);
|
|
settings = MigrateSettings(from_ver, from_ver + 1, settings);
|
|
|
return MigrateSettings(from_ver + 1, to_ver, settings);
|
|
return MigrateSettings(from_ver + 1, to_ver, settings);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- switch (to) {
|
|
|
|
|
|
|
+ switch (to_ver) {
|
|
|
default:
|
|
default:
|
|
|
settings = Object.assign(DefaultSettings, settings);
|
|
settings = Object.assign(DefaultSettings, settings);
|
|
|
break;
|
|
break;
|