fix: catch env detect error

energywebfoundation · Aug 26, 2021 · 8c8edca · 8c8edca
1 parent 2cd356f
commit 8c8edca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/api/modules/utils_detectEnvironment.md b/docs/api/modules/utils_detectEnvironment.md
@@ -14,8 +14,8 @@
 
 ### detectExecutionEnvironment
 
-▸ `Const` **detectExecutionEnvironment**(): [`ExecutionEnvironment`](../enums/utils_detectEnvironment.ExecutionEnvironment.md)
+▸ `Const` **detectExecutionEnvironment**(): `any`
 
 #### Returns
 
-[`ExecutionEnvironment`](../enums/utils_detectEnvironment.ExecutionEnvironment.md)
+`any`
diff --git a/src/utils/detectEnvironment.ts b/src/utils/detectEnvironment.ts
@@ -6,6 +6,6 @@ export enum ExecutionEnvironment {
 export const detectExecutionEnvironment = () =>
     (isNode() && ExecutionEnvironment.NODE) || (isBrowser() && ExecutionEnvironment.BROWSER);
 
-const isNode = () => new Function("return this===global");
+const isNode = new Function("try { return this === global } catch(e) { return false; }");
 
-const isBrowser = () => new Function("return this===window");
+const isBrowser = new Function("try { return this === window } catch(e) { return false; }");
diff --git a/test/utils/isBrowser.test.ts → test/utils/detectEnvironment.ts b/test/utils/isBrowser.test.ts → test/utils/detectEnvironment.ts
@@ -1,7 +1,7 @@
 import { detectExecutionEnvironment, ExecutionEnvironment } from "../../src/utils/detectEnvironment";
 
 describe("Execution environment tests", () => {
-    it("tests are running in node env", () => {
-        expect(detectExecutionEnvironment()).toBe(ExecutionEnvironment.NODE);
+    it("tests are running in browser env", () => {
+        expect(detectExecutionEnvironment()).toBe(ExecutionEnvironment.BROWSER);
     });
 });