From a55c61a3ba63cdbb6dad64ada146e6640515d25e Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 13 Apr 2017 12:10:42 -0700
Subject: [PATCH] Use local var `environment` rather than `NODE_ENV`

Traditionally, NODE_ENV refers to an environment variable. For clarity,
let's keep it that way and don't reuse it in the renderer. Also, add a
note about explicitly overriding env vars for node-config.

// FREEBIE
---
 js/background.js | 2 +-
 main.js          | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/js/background.js b/js/background.js
index bd8f109035a..204c5afddeb 100644
--- a/js/background.js
+++ b/js/background.js
@@ -9,7 +9,7 @@
     };
 
     console.log('background page reloaded');
-    console.log('NODE_ENV', window.config.NODE_ENV);
+    console.log('environment:', window.config.environment);
     extension.notification.init();
 
     var initialLoadComplete = false;
diff --git a/main.js b/main.js
index 6650559bab4..0d9b97c0ca4 100644
--- a/main.js
+++ b/main.js
@@ -27,7 +27,10 @@ if (shouldQuit) {
 }
 
 const package_json = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8'))
-process.env.NODE_ENV = package_json.environment || process.env.NODE_ENV || 'development';
+const environment = package_json.environment || process.env.NODE_ENV || 'development';
+
+// Set environment vars to configure node-config before requiring it
+process.env.NODE_ENV = environment;
 process.env.NODE_CONFIG_DIR = path.join(__dirname, 'config');
 const config = require('config');
 
@@ -70,7 +73,7 @@ function createWindow () {
       version: package_json.version,
       buildExpiration: config.get('buildExpiration'),
       serverUrl: config.get('serverUrl'),
-      NODE_ENV: process.env.NODE_ENV
+      environment: environment
     }
   }))