From 8a55b9e81b3e16262a199e04e499c205ff03fe69 Mon Sep 17 00:00:00 2001
From: Vincent Martinez <eykosioux@gmail.com>
Date: Wed, 11 Apr 2018 13:56:01 +0100
Subject: [PATCH] Update environment.js config (dotenv)

---
 config/webpack/environment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 56a94a45e..e45f3d774 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -5,8 +5,8 @@ const custom = require('./custom.js');
 
 const dotenvFiles = [
   `.env.${process.env.NODE_ENV}.local`,
-  '.env.local',
   `.env.${process.env.NODE_ENV}`,
+  '.env.local',
   '.env',
 ];
 
@@ -15,7 +15,7 @@ dotenvFiles.forEach(dotenvFile => {
 });
 
 environment.config.merge(custom);
-environment.plugins.set(
+environment.plugins.append(
   'Environment',
   new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(process.env)))
 );