Skip to content

Commit

Permalink
Depend on upstream WebTorrent
Browse files Browse the repository at this point in the history
Fixes: brave/brave-browser#5587
Fixes: brave/brave-browser#856
Fixes: brave/brave-browser#5489

This makes Brave depend on upstream WebTorrent instead of the fork. This also removes the need for forks of torrent-discovery and bittorrent-tracker.
  • Loading branch information
feross committed Aug 9, 2019
1 parent 7e5a252 commit d187598
Show file tree
Hide file tree
Showing 3 changed files with 280 additions and 305 deletions.
15 changes: 8 additions & 7 deletions components/webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ module.exports = (env, argv) => ({
resolve: {
extensions: ['.js', '.tsx', '.ts', '.json'],
alias: {
'bittorrent-tracker': path.resolve(__dirname, '../../node_modules/bittorrent-tracker'),
'brave-ui': path.resolve(__dirname, '../../node_modules/brave-ui/src'),
'dgram': 'chrome-dgram',
'dns': path.resolve(__dirname, '../common/dns.ts'),
'net': 'chrome-net',
'torrent-discovery': path.resolve(__dirname, '../../node_modules/torrent-discovery')
}
// TODO(feross): Publish chrome-dns and add to "chromeapp" package.json
// field so this isn't required anymore
dns: path.resolve(__dirname, '../common/dns.ts')
},
// For explanation of "chromeapp", see:
// https://github.com/brave/brave-browser/issues/5587
aliasFields: ['chromeapp']
},
plugins: [
new GenerateDepfilePlugin({
Expand All @@ -33,7 +34,7 @@ module.exports = (env, argv) => ({
},
{
test: /\.css$/,
loader: ['style-loader', 'css-loader'],
loader: ['style-loader', 'css-loader']
},
// Loads font files for Font Awesome
{
Expand Down
Loading

0 comments on commit d187598

Please sign in to comment.