From 6a1ec188a6b8bdbf320d12b4bf6d8e07103a33ce Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Fri, 25 Oct 2019 21:44:39 +0300
Subject: [PATCH] Apply default overrides *before* custom overrides

---
 src/plugins/GlobalZeppelinPlugin.ts | 2 +-
 src/plugins/ZeppelinPlugin.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/GlobalZeppelinPlugin.ts b/src/plugins/GlobalZeppelinPlugin.ts
index 801c2ee3..8698bdb1 100644
--- a/src/plugins/GlobalZeppelinPlugin.ts
+++ b/src/plugins/GlobalZeppelinPlugin.ts
@@ -48,7 +48,7 @@ export class GlobalZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extend
     const mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {});
     const mergedOverrides = options.replaceDefaultOverrides
       ? options.overrides
-      : (options.overrides || []).concat(defaultOptions.overrides || []);
+      : (defaultOptions.overrides || []).concat(options.overrides || []);
 
     const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;
     if (decodedConfig instanceof StrictValidationError) {
diff --git a/src/plugins/ZeppelinPlugin.ts b/src/plugins/ZeppelinPlugin.ts
index 2cb2aab4..7d604d31 100644
--- a/src/plugins/ZeppelinPlugin.ts
+++ b/src/plugins/ZeppelinPlugin.ts
@@ -118,7 +118,7 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
     let mergedConfig = mergeConfig({}, defaultOptions.config || {}, options.config || {});
     const mergedOverrides = options.replaceDefaultOverrides
       ? options.overrides
-      : (options.overrides || []).concat(defaultOptions.overrides || []);
+      : (defaultOptions.overrides || []).concat(options.overrides || []);
 
     mergedConfig = this.preprocessStaticConfig(mergedConfig);