StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 22:21:51 +00:00
Code Releases Activity

Apply default overrides *before* custom overrides

Browse source
This commit is contained in:
Dragory 2019-10-25 21:44:39 +03:00
parent 82c65ca44e
commit 6a1ec188a6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/GlobalZeppelinPlugin.ts
View file

@ -48,7 +48,7 @@ export class GlobalZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extend
const mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {}); const mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {});
const mergedOverrides = options.replaceDefaultOverrides const mergedOverrides = options.replaceDefaultOverrides
? options.overrides ? options.overrides
: (options.overrides || []).concat(defaultOptions.overrides || []); : (defaultOptions.overrides || []).concat(options.overrides || []);
const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig; const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;
if (decodedConfig instanceof StrictValidationError) { if (decodedConfig instanceof StrictValidationError) {

2
src/plugins/ZeppelinPlugin.ts
View file

@ -118,7 +118,7 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
let mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {}); let mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {});
const mergedOverrides = options.replaceDefaultOverrides const mergedOverrides = options.replaceDefaultOverrides
? options.overrides ? options.overrides
: (options.overrides || []).concat(defaultOptions.overrides || []); : (defaultOptions.overrides || []).concat(options.overrides || []);
mergedConfig = this.preprocessStaticConfig(mergedConfig); mergedConfig = this.preprocessStaticConfig(mergedConfig);