diff options
author | ThibG <thib@sitedethib.com> | 2018-09-21 08:39:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-21 08:39:07 +0200 |
commit | 17464c10ad1693095a05fe445587804589d627e1 (patch) | |
tree | ecd2a077b038b864ac7912cba72dd59990fb6258 /config/webpack | |
parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
parent | 343acd96cccb16b1ecdc3a52a8733359d4a92633 (diff) |
Merge pull request #739 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/webpack')
-rw-r--r-- | config/webpack/loaders/babel.js | 1 | ||||
-rw-r--r-- | config/webpack/production.js | 1 |
2 files changed, 0 insertions, 2 deletions
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)$/, }), |