mirror of
https://github.com/ZeppelinBot/Zeppelin.git
synced 2025-03-16 14:11:50 +00:00
Apply default overrides *before* custom overrides
This commit is contained in:
parent
82c65ca44e
commit
6a1ec188a6
2 changed files with 2 additions and 2 deletions
|
@ -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) {
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue