Merge pull request #3134 from brave/webtorrent-upstream

Depend on upstream WebTorrent
brave · Aug 9, 2019 · 32b35ba · 32b35ba
2 parents e86910e + d187598
commit 32b35ba
Show file tree

Hide file tree

Showing 3 changed files with 274 additions and 299 deletions.
diff --git a/components/webpack/webpack.config.js b/components/webpack/webpack.config.js
@@ -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({
@@ -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
       {