aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/config
diff options
context:
space:
mode:
Diffstat (limited to 'client/config')
-rw-r--r--client/config/webpack.common.js9
-rw-r--r--client/config/webpack.prod.js1
2 files changed, 7 insertions, 3 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index abbf84fb0..a48518a35 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -68,7 +68,9 @@ module.exports = {
68 root: helpers.root('src'), 68 root: helpers.root('src'),
69 69
70 // remove other default values 70 // remove other default values
71 modulesDirectories: [ 'node_modules' ] 71 modulesDirectories: [ 'node_modules', 'node_modules/blueimp-file-upload/js/vendor' ],
72
73 packageAlias: 'browser'
72 74
73 }, 75 },
74 76
@@ -243,7 +245,8 @@ module.exports = {
243 new webpack.ProvidePlugin({ 245 new webpack.ProvidePlugin({
244 jQuery: 'jquery', 246 jQuery: 'jquery',
245 $: 'jquery', 247 $: 'jquery',
246 jquery: 'jquery' 248 jquery: 'jquery',
249 WebTorrent: 'webtorrent/webtorrent.min'
247 }) 250 })
248 251
249 ], 252 ],
@@ -257,6 +260,8 @@ module.exports = {
257 node: { 260 node: {
258 global: 'window', 261 global: 'window',
259 crypto: 'empty', 262 crypto: 'empty',
263 fs: 'empty',
264 events: true,
260 module: false, 265 module: false,
261 clearImmediate: false, 266 clearImmediate: false,
262 setImmediate: false 267 setImmediate: false
diff --git a/client/config/webpack.prod.js b/client/config/webpack.prod.js
index 23e2fabfe..8827888a3 100644
--- a/client/config/webpack.prod.js
+++ b/client/config/webpack.prod.js
@@ -9,7 +9,6 @@ const commonConfig = require('./webpack.common.js') // the settings that are com
9/** 9/**
10 * Webpack Plugins 10 * Webpack Plugins
11 */ 11 */
12const ProvidePlugin = require('webpack/lib/ProvidePlugin')
13const DefinePlugin = require('webpack/lib/DefinePlugin') 12const DefinePlugin = require('webpack/lib/DefinePlugin')
14const DedupePlugin = require('webpack/lib/optimize/DedupePlugin') 13const DedupePlugin = require('webpack/lib/optimize/DedupePlugin')
15const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin') 14const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin')