Merge pull request #2976 from michaelsbradleyjr/fix/websocket

switch repo fork for the websocket package
web3 · Jul 31, 2019 · ecb2ad3 · ecb2ad3
2 parents fe269fb + a78399a
commit ecb2ad3
Show file tree

Hide file tree

Showing 6 changed files with 3,062 additions and 35 deletions.
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -25,7 +25,7 @@ var packages = [{
     fileName: 'web3',
     expose: 'Web3',
     src: './packages/web3/src/index.js',
-    ignore: ['xmlhttprequest', 'websocket']
+    ignore: ['xmlhttprequest']
 }, {
     fileName: 'web3-utils',
     expose: 'Web3Utils',
@@ -83,7 +83,6 @@ var packages = [{
     fileName: 'web3-providers-ws',
     expose: 'Web3WsProvider',
     src: './packages/web3-providers-ws/src/index.js',
-    ignore: ['websocket']
 }, {
     fileName: 'web3-core-subscriptions',
     expose: 'Web3Subscriptions',

diff --git a/packages/web3-eth-accounts/src/scrypt.js b/packages/web3-eth-accounts/src/scrypt.js
@@ -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) {