Depend on upstream WebTorrent #3134
Conversation
feross
force-pushed
the
webtorrent-upstream
branch
from
3129a14 to
a4242c2
Compare
| 'dgram': 'chrome-dgram', | ||
| 'dns': path.resolve(__dirname, '../common/dns.ts'), | ||
| 'net': 'chrome-net', | ||
| 'torrent-discovery': path.resolve(__dirname, '../../node_modules/torrent-discovery') |
There was a problem hiding this comment.
- No more need to depend on
bittorrent-trackerortorrent-discoveryfork. - No more need to specify
nettochrome-netordgramtochrome-dgramalias.
| } | ||
| // 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') |
There was a problem hiding this comment.
I'm going to shim dns as well, but haven't done that yet. Once I publish chrome-dns, I will include it in webtorrent's "chromeapp" field in package.json and then we can remove this line as well :)
| }, | ||
| // For explanation of "chromeapp", see: | ||
| // https://github.com/brave/brave-browser/issues/5587 | ||
| aliasFields: ['chromeapp'] |
There was a problem hiding this comment.
This tells webpack to use "chromeapp" instead of "browser" in package.json.
| "unique-selector": "^0.4.1", | ||
| "webtorrent": "github:brave/webtorrent#652fbeecd6c05076fdfd0f1e64ccb3957d51e21f" | ||
| "webtorrent": "^0.107.2" |
There was a problem hiding this comment.
We're depending on upstream!
feross
force-pushed
the
webtorrent-upstream
branch
from
a4242c2 to
3a3c1e9
Compare
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.
feross
force-pushed
the
webtorrent-upstream
branch
from
3a3c1e9 to
d187598
Compare
|
@feross I think it's more safe to do some manual testing on this PR, could you update the test plan and labelled the main issue as QA/Yes? |
|
@yrliou Done. I updated the test plan and added |
|
The latest CI failure was just |
Of course! I think this is a great improvement. Should be a lot less work to stay on the latest webtorrent now :) |
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.
Submitter Checklist:
npm run lint)git rebase master(if needed).git rebase -ito squash commits (if needed).Test Plan:
Reviewer Checklist:
After-merge Checklist:
changes has landed on.