diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-06-11 15:25:36 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-06-11 15:58:27 +0200 |
commit | 294f80f21e8a77d25f6fb5f0f26887fb4618ee2e (patch) | |
tree | 01e0016e7ae7edfc87e2ba9861436aedce89993b /client/config | |
parent | 1840c2f7c91f5f89602a3683d85b0a9df1454855 (diff) | |
download | PeerTube-294f80f21e8a77d25f6fb5f0f26887fb4618ee2e.tar.gz PeerTube-294f80f21e8a77d25f6fb5f0f26887fb4618ee2e.tar.zst PeerTube-294f80f21e8a77d25f6fb5f0f26887fb4618ee2e.zip |
Bundle webtorrent with webpack. Closes https://github.com/Chocobozzz/PeerTube/issues/50
Diffstat (limited to 'client/config')
-rw-r--r-- | client/config/webpack.common.js | 4 | ||||
-rw-r--r-- | client/config/webpack.dev.js | 5 | ||||
-rw-r--r-- | client/config/webpack.prod.js | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 459985880..a81bca9d2 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js | |||
@@ -261,10 +261,6 @@ module.exports = function (options) { | |||
261 | to: 'assets' | 261 | to: 'assets' |
262 | }, | 262 | }, |
263 | { | 263 | { |
264 | from: 'node_modules/webtorrent/webtorrent.min.js', | ||
265 | to: 'assets/webtorrent' | ||
266 | }, | ||
267 | { | ||
268 | from: 'src/standalone', | 264 | from: 'src/standalone', |
269 | to: 'standalone' | 265 | to: 'standalone' |
270 | } | 266 | } |
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js index d6ebed730..42d9ca37e 100644 --- a/client/config/webpack.dev.js +++ b/client/config/webpack.dev.js | |||
@@ -83,10 +83,6 @@ module.exports = function (env) { | |||
83 | libraryTarget: 'var' | 83 | libraryTarget: 'var' |
84 | }, | 84 | }, |
85 | 85 | ||
86 | externals: { | ||
87 | webtorrent: 'WebTorrent' | ||
88 | }, | ||
89 | |||
90 | module: { | 86 | module: { |
91 | 87 | ||
92 | // Too slow, life is short | 88 | // Too slow, life is short |
@@ -246,6 +242,7 @@ module.exports = function (env) { | |||
246 | node: { | 242 | node: { |
247 | global: true, | 243 | global: true, |
248 | crypto: 'empty', | 244 | crypto: 'empty', |
245 | fs: 'empty', | ||
249 | process: true, | 246 | process: true, |
250 | module: false, | 247 | module: false, |
251 | clearImmediate: false, | 248 | clearImmediate: false, |
diff --git a/client/config/webpack.prod.js b/client/config/webpack.prod.js index 3f063c7c6..c27a4f4b0 100644 --- a/client/config/webpack.prod.js +++ b/client/config/webpack.prod.js | |||
@@ -81,10 +81,6 @@ module.exports = function (env) { | |||
81 | publicPath: '/client/' | 81 | publicPath: '/client/' |
82 | }, | 82 | }, |
83 | 83 | ||
84 | externals: { | ||
85 | webtorrent: 'WebTorrent' | ||
86 | }, | ||
87 | |||
88 | /** | 84 | /** |
89 | * Add additional plugins to the compiler. | 85 | * Add additional plugins to the compiler. |
90 | * | 86 | * |
@@ -272,6 +268,7 @@ module.exports = function (env) { | |||
272 | node: { | 268 | node: { |
273 | global: true, | 269 | global: true, |
274 | crypto: 'empty', | 270 | crypto: 'empty', |
271 | fs: 'empty', | ||
275 | process: false, | 272 | process: false, |
276 | module: false, | 273 | module: false, |
277 | clearImmediate: false, | 274 | clearImmediate: false, |