From baa671a3895acde31ea4433023e90ca72a7ae933 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Thu, 28 Mar 2019 18:02:56 +0100 Subject: [PATCH] Extract IS_EE config helper --- config/helpers/is_ee_env.js | 9 +++++++++ config/webpack.config.js | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 config/helpers/is_ee_env.js diff --git a/config/helpers/is_ee_env.js b/config/helpers/is_ee_env.js new file mode 100644 index 00000000000..1fdbca591c0 --- /dev/null +++ b/config/helpers/is_ee_env.js @@ -0,0 +1,9 @@ +const fs = require('fs'); +const path = require('path'); + +const ROOT_PATH = path.resolve(__dirname, '../..'); + +module.exports = + process.env.EE !== undefined + ? JSON.parse(process.env.EE) + : fs.existsSync(path.join(ROOT_PATH, 'ee')); diff --git a/config/webpack.config.js b/config/webpack.config.js index 20b3f4c0264..9a37856a99e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -1,4 +1,3 @@ -const fs = require('fs'); const path = require('path'); const glob = require('glob'); const webpack = require('webpack'); @@ -12,10 +11,7 @@ const ROOT_PATH = path.resolve(__dirname, '..'); const CACHE_PATH = process.env.WEBPACK_CACHE_PATH || path.join(ROOT_PATH, 'tmp/cache'); const IS_PRODUCTION = process.env.NODE_ENV === 'production'; const IS_DEV_SERVER = process.argv.join(' ').indexOf('webpack-dev-server') !== -1; -const IS_EE = - process.env.EE !== undefined - ? JSON.parse(process.env.EE) - : fs.existsSync(path.join(ROOT_PATH, 'ee')); +const IS_EE = require('./helpers/is_ee_env'); const DEV_SERVER_HOST = process.env.DEV_SERVER_HOST || 'localhost'; const DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808; const DEV_SERVER_LIVERELOAD = IS_DEV_SERVER && process.env.DEV_SERVER_LIVERELOAD !== 'false'; -- GitLab