From 17b9e43c14c924168d731a96feabb9577e46abf6 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Tue, 9 May 2017 16:53:30 -0600 Subject: [PATCH] moved webpack config --- webpack.config.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 5aade15a1..3a54e85c0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,18 +9,13 @@ const webpack = require('webpack'); // Possibly load the config from the .env file (if there is one). require('dotenv').config(); -// Load the config after dotenv has does it's thing. -const { - PLUGINS_JSON -} = require('./config'); - let pluginsConfigPath; let envPlugins = path.join(__dirname, 'plugins.env.js'); let customPlugins = path.join(__dirname, 'plugins.json'); let defaultPlugins = path.join(__dirname, 'plugins.default.json'); -if (PLUGINS_JSON && PLUGINS_JSON.length > 0) { +if (process.env.TALK_PLUGINS_JSON && process.env.TALK_PLUGINS_JSON.length > 0) { pluginsConfigPath = envPlugins; } else if (fs.existsSync(customPlugins)) { pluginsConfigPath = customPlugins;