diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /client/webpack.config.js | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'client/webpack.config.js')
| -rw-r--r-- | client/webpack.config.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/webpack.config.js b/client/webpack.config.js index 8f54d88e5..3d3af91ad 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js | |||
| @@ -1,16 +1,16 @@ | |||
| 1 | switch (process.env.NODE_ENV) { | 1 | switch (process.env.NODE_ENV) { |
| 2 | case 'prod': | 2 | case 'prod': |
| 3 | case 'production': | 3 | case 'production': |
| 4 | module.exports = require('./config/webpack.prod') | 4 | module.exports = require('./config/webpack.prod')({env: 'production'}) |
| 5 | break | 5 | break |
| 6 | 6 | ||
| 7 | case 'test': | 7 | case 'test': |
| 8 | case 'testing': | 8 | case 'testing': |
| 9 | module.exports = require('./config/webpack.test') | 9 | module.exports = require('./config/webpack.test')({env: 'test'}) |
| 10 | break | 10 | break |
| 11 | 11 | ||
| 12 | case 'dev': | 12 | case 'dev': |
| 13 | case 'development': | 13 | case 'development': |
| 14 | default: | 14 | default: |
| 15 | module.exports = require('./config/webpack.dev') | 15 | module.exports = require('./config/webpack.dev')({env: 'development'}) |
| 16 | } | 16 | } |