diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-09-12 20:43:44 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-09-12 20:43:44 +0200 |
commit | 2e92c10b6cdb32e5170aab0b4c0ff3e4c27e30d5 (patch) | |
tree | 104ff4077318ebd489f2ef30a332835d1deb13c4 /client/config/webpack.dev.js | |
parent | 772b47e36a1e63eedeaafe6cd7b1771dfb441ba7 (diff) | |
download | PeerTube-2e92c10b6cdb32e5170aab0b4c0ff3e4c27e30d5.tar.gz PeerTube-2e92c10b6cdb32e5170aab0b4c0ff3e4c27e30d5.tar.zst PeerTube-2e92c10b6cdb32e5170aab0b4c0ff3e4c27e30d5.zip |
Client: update a webpack configs
Diffstat (limited to 'client/config/webpack.dev.js')
-rw-r--r-- | client/config/webpack.dev.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js index fede16932..5e4c708d6 100644 --- a/client/config/webpack.dev.js +++ b/client/config/webpack.dev.js | |||
@@ -15,7 +15,7 @@ const ENV = process.env.ENV = process.env.NODE_ENV = 'development' | |||
15 | const HOST = process.env.HOST || 'localhost' | 15 | const HOST = process.env.HOST || 'localhost' |
16 | const PORT = process.env.PORT || 3000 | 16 | const PORT = process.env.PORT || 3000 |
17 | const HMR = helpers.hasProcessFlag('hot') | 17 | const HMR = helpers.hasProcessFlag('hot') |
18 | const METADATA = webpackMerge(commonConfig.metadata, { | 18 | const METADATA = webpackMerge(commonConfig({env: ENV}).metadata, { |
19 | host: HOST, | 19 | host: HOST, |
20 | port: PORT, | 20 | port: PORT, |
21 | ENV: ENV, | 21 | ENV: ENV, |
@@ -27,7 +27,7 @@ const METADATA = webpackMerge(commonConfig.metadata, { | |||
27 | * | 27 | * |
28 | * See: http://webpack.github.io/docs/configuration.html#cli | 28 | * See: http://webpack.github.io/docs/configuration.html#cli |
29 | */ | 29 | */ |
30 | module.exports = webpackMerge(commonConfig, { | 30 | module.exports = webpackMerge(commonConfig({env: ENV}), { |
31 | /** | 31 | /** |
32 | * Merged metadata from webpack.common.js for index.html | 32 | * Merged metadata from webpack.common.js for index.html |
33 | * | 33 | * |