Skip to content

Commit

Permalink
switch repo fork for the websocket package
Browse files Browse the repository at this point in the history
The `michaelsbradleyjr/Websocket-Node#polyfill/globalThis` branch uses a more
robust approach to resolve a browser's `window` object. It also includes all
the latest commits on the upstream's `master` branch, including fixes for the
`.git/` subdir npm bug and Node v12.x compatibility.

The `"preinstall"` script in `packages/web3-providers-ws/package.json` is
removed because it's not helpful and its use of `rm` causes Windows
incompatibility. Closes web3#2971 and web3#2973.

`packages/web3-providers-ws/src/index.js` is refactored since the `websocket`
package already does native WebSocket detection.
  • Loading branch information
michaelsbradleyjr committed Jul 28, 2019
1 parent 15817ac commit 7a80b6a
Show file tree
Hide file tree
Showing 5 changed files with 3,060 additions and 33 deletions.
2 changes: 1 addition & 1 deletion dist/web3.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/web3-eth-accounts/src/scrypt.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (isNode) {
var tryScryptPkg = (function() {
var scryptPkg;
return function() {
if (scryptPkg !== undefined) { return scryptPkg; };
if (scryptPkg !== undefined) { return scryptPkg; }
try {
scryptPkg = (function(m) { return require(m); })('scrypt');
} catch (e) {
Expand Down

0 comments on commit 7a80b6a

Please sign in to comment.