From f5651d4c82566df9bab3378fb59db4c3f089f0b6 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Fri, 25 Oct 2019 20:22:00 +0300 Subject: [PATCH] Use 'replaceDefaultOverrides' instead of the deprecated '=overrides' syntax --- src/plugins/GlobalZeppelinPlugin.ts | 4 ++-- src/plugins/ZeppelinPlugin.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/GlobalZeppelinPlugin.ts b/src/plugins/GlobalZeppelinPlugin.ts index 73f21cef..801c2ee3 100644 --- a/src/plugins/GlobalZeppelinPlugin.ts +++ b/src/plugins/GlobalZeppelinPlugin.ts @@ -46,8 +46,8 @@ export class GlobalZeppelinPlugin extend protected static mergeAndDecodeStaticOptions(options: any): IPluginOptions { const defaultOptions: any = this.getStaticDefaultOptions(); const mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {}); - const mergedOverrides = options["=overrides"] - ? options["=overrides"] + const mergedOverrides = options.replaceDefaultOverrides + ? options.overrides : (options.overrides || []).concat(defaultOptions.overrides || []); const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig; diff --git a/src/plugins/ZeppelinPlugin.ts b/src/plugins/ZeppelinPlugin.ts index 595232e8..2cb2aab4 100644 --- a/src/plugins/ZeppelinPlugin.ts +++ b/src/plugins/ZeppelinPlugin.ts @@ -116,8 +116,8 @@ export class ZeppelinPlugin extends Plug protected static mergeAndDecodeStaticOptions(options: any): IPluginOptions { const defaultOptions: any = this.getStaticDefaultOptions(); let mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {}); - const mergedOverrides = options["=overrides"] - ? options["=overrides"] + const mergedOverrides = options.replaceDefaultOverrides + ? options.overrides : (options.overrides || []).concat(defaultOptions.overrides || []); mergedConfig = this.preprocessStaticConfig(mergedConfig);