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

Use 'replaceDefaultOverrides' instead of the deprecated '=overrides' syntax

Browse source
This commit is contained in:
Dragory 2019-10-25 20:22:00 +03:00
parent 94756faa5d
commit f5651d4c82
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/GlobalZeppelinPlugin.ts
View file

@ -46,8 +46,8 @@ export class GlobalZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extend
protected static mergeAndDecodeStaticOptions(options: any): IPluginOptions { protected static mergeAndDecodeStaticOptions(options: any): IPluginOptions {
const defaultOptions: any = this.getStaticDefaultOptions(); const defaultOptions: any = this.getStaticDefaultOptions();
const mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {}); const mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {});
const mergedOverrides = options["=overrides"] const mergedOverrides = options.replaceDefaultOverrides
? options["=overrides"] ? options.overrides
: (options.overrides || []).concat(defaultOptions.overrides || []); : (options.overrides || []).concat(defaultOptions.overrides || []);
const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig; const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;

4
src/plugins/ZeppelinPlugin.ts
View file

@ -116,8 +116,8 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
protected static mergeAndDecodeStaticOptions(options: any): IPluginOptions { protected static mergeAndDecodeStaticOptions(options: any): IPluginOptions {
const defaultOptions: any = this.getStaticDefaultOptions(); const defaultOptions: any = this.getStaticDefaultOptions();
let mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {}); let mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {});
const mergedOverrides = options["=overrides"] const mergedOverrides = options.replaceDefaultOverrides
? options["=overrides"] ? options.overrides
: (options.overrides || []).concat(defaultOptions.overrides || []); : (options.overrides || []).concat(defaultOptions.overrides || []);
mergedConfig = this.preprocessStaticConfig(mergedConfig); mergedConfig = this.preprocessStaticConfig(mergedConfig);