fix: detecting execution environment, when browser have declared glob…

…al property.
energywebfoundation · Oct 1, 2021 · 4d11e58 · 4d11e58
1 parent c387f21
commit 4d11e58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/api/modules/utils_detectEnvironment.md b/docs/api/modules/utils_detectEnvironment.md
@@ -14,8 +14,8 @@
 
 ### detectExecutionEnvironment
 
-▸ `Const` **detectExecutionEnvironment**(): `any`
+▸ `Const` **detectExecutionEnvironment**(): `ExecutionEnvironment`
 
 #### Returns
 
-`any`
+`ExecutionEnvironment`
diff --git a/src/utils/detectEnvironment.ts b/src/utils/detectEnvironment.ts
@@ -4,8 +4,8 @@ export enum ExecutionEnvironment {
 }
 
 export const detectExecutionEnvironment = () =>
-    (isNode() && ExecutionEnvironment.NODE) || (isBrowser() && ExecutionEnvironment.BROWSER);
+    isNode() && !isBrowser() ? ExecutionEnvironment.NODE : ExecutionEnvironment.BROWSER;
 
-const isNode = new Function("try { return this === global } catch(e) { return false; }");
+const isNode = () => typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 
-const isBrowser = new Function("try { return this === window } catch(e) { return false; }");
+const isBrowser = () => typeof window !== "undefined" && typeof window.document !== "undefined";