Fixes for dist builds without injected XMLHttpRequest (ethers-io#789, e…

…thers-io#506).
michaeltout · Apr 18, 2020 · c04bc9f · c04bc9f
1 parent 3f2c012
commit c04bc9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "Richard Moore <me@ricmoo.com>",
   "browser": {
-    "./ipc-provider": "./lib/browser-ipc-provider.js",
+    "./lib/ipc-provider": "./lib/browser-ipc-provider.js",
     "net": "./lib/browser-net.js",
     "ws": "./lib/browser-ws.js"
   },

diff --git a/src.ts/browser-ws.ts b/src.ts/browser-ws.ts
@@ -3,9 +3,12 @@
 import { Logger } from "@ethersproject/logger";
 import { version } from "./_version";
 
-let WS = (WebSocket as any);
+let WS: any = null;
 
-if (WS == null) {
+try {
+    WS = (WebSocket as any);
+    if (WS == null) { throw new Error("inject please"); }
+} catch (error) {
     const logger = new Logger(version);
     WS = function() {
         logger.throwError("WebSockets not supported in this environment", Logger.errors.UNSUPPORTED_OPERATION, {