diff options
Diffstat (limited to 'config/webpack')
| -rw-r--r-- | config/webpack/configuration.js | 2 | ||||
| -rw-r--r-- | config/webpack/loaders/babel.js | 1 | ||||
| -rw-r--r-- | config/webpack/production.js | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index 4d0d28582..f81d23dd4 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -8,7 +8,7 @@ const glob = require('glob'); const configPath = resolve('config', 'webpacker.yml'); const loadersDir = join(__dirname, 'loaders'); -const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV]; +const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV]; const flavourFiles = glob.sync('app/javascript/flavours/*/theme.yml'); const skinFiles = glob.sync('app/javascript/skins/*/*'); const flavours = {}; diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js index 770c89aa7..d8d785b98 100644 --- a/config/webpack/loaders/babel.js +++ b/config/webpack/loaders/babel.js @@ -7,7 +7,6 @@ module.exports = { exclude: /node_modules/, loader: 'babel-loader', options: { - forceEnv: process.env.NODE_ENV || 'development', sourceRoot: 'app/javascript', cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'), }, diff --git a/config/webpack/production.js b/config/webpack/production.js index 27a78108b..aca37059e 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -69,7 +69,6 @@ module.exports = merge(sharedConfig, { plugins: [ new CompressionPlugin({ - asset: '[path].gz[query]', algorithm: compressionAlgorithm, test: /\.(js|css|html|json|ico|svg|eot|otf|ttf)$/, }), |