aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/config/webpack.common.js
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-06-04 10:05:17 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-06-04 10:05:17 +0200
commitc21f59d334b748be99188688c9578c9cd5432874 (patch)
tree9e8f29e63e92ed3a9bc4c077ace939211cea06ec /client/config/webpack.common.js
parentb20b5fed405f0ab24d24709d7db65625a79f3b37 (diff)
downloadPeerTube-c21f59d334b748be99188688c9578c9cd5432874.tar.gz
PeerTube-c21f59d334b748be99188688c9578c9cd5432874.tar.zst
PeerTube-c21f59d334b748be99188688c9578c9cd5432874.zip
Add webtorrent and jquery to webpack
Diffstat (limited to 'client/config/webpack.common.js')
-rw-r--r--client/config/webpack.common.js9
1 files changed, 7 insertions, 2 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