From 294f80f21e8a77d25f6fb5f0f26887fb4618ee2e Mon Sep 17 00:00:00 2001 From: Chocobozzz <florian.bigard@gmail.com> Date: Sun, 11 Jun 2017 15:25:36 +0200 Subject: Bundle webtorrent with webpack. Closes https://github.com/Chocobozzz/PeerTube/issues/50 --- client/config/webpack.common.js | 4 ---- client/config/webpack.dev.js | 5 +---- client/config/webpack.prod.js | 5 +---- 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'client/config') 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 @@ -260,10 +260,6 @@ module.exports = function (options) { from: 'src/assets', to: 'assets' }, - { - from: 'node_modules/webtorrent/webtorrent.min.js', - to: 'assets/webtorrent' - }, { from: 'src/standalone', to: 'standalone' 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) { libraryTarget: 'var' }, - externals: { - webtorrent: 'WebTorrent' - }, - module: { // Too slow, life is short @@ -246,6 +242,7 @@ module.exports = function (env) { node: { global: true, crypto: 'empty', + fs: 'empty', process: true, module: false, 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) { publicPath: '/client/' }, - externals: { - webtorrent: 'WebTorrent' - }, - /** * Add additional plugins to the compiler. * @@ -272,6 +268,7 @@ module.exports = function (env) { node: { global: true, crypto: 'empty', + fs: 'empty', process: false, module: false, clearImmediate: false, -- cgit v1.2.3