From 8c8edca1ed9ea4b696cd81a3b1ca72e3e6358eee Mon Sep 17 00:00:00 2001 From: Dmitry Fesenko Date: Thu, 26 Aug 2021 10:50:23 +0300 Subject: [PATCH] fix: catch env detect error --- docs/api/modules/utils_detectEnvironment.md | 4 ++-- src/utils/detectEnvironment.ts | 4 ++-- test/utils/{isBrowser.test.ts => detectEnvironment.ts} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename test/utils/{isBrowser.test.ts => detectEnvironment.ts} (76%) diff --git a/docs/api/modules/utils_detectEnvironment.md b/docs/api/modules/utils_detectEnvironment.md index b5d19c77..7a224dd3 100644 --- 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 index 425f479c..ce24b436 100644 --- 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 b/test/utils/detectEnvironment.ts similarity index 76% rename from test/utils/isBrowser.test.ts rename to test/utils/detectEnvironment.ts index 66f619ae..9aa12a95 100644 --- a/test/utils/isBrowser.test.ts +++ b/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); }); });