From d3d81b3cb94cc0731c439652d4d575eb3e1b6333 Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Mon, 31 Mar 2025 09:45:21 +0200 Subject: [PATCH 1/3] fix(cjs): Use `module` instead of `require` for CJS check --- packages/node/src/utils/commonjs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node/src/utils/commonjs.ts b/packages/node/src/utils/commonjs.ts index 9b5e5b531d73..ba204bd5265a 100644 --- a/packages/node/src/utils/commonjs.ts +++ b/packages/node/src/utils/commonjs.ts @@ -1,4 +1,4 @@ /** Detect CommonJS. */ export function isCjs(): boolean { - return typeof require !== 'undefined'; + return typeof module !== 'undefined' && typeof module.exports !== 'undefined'; } From 01c83742c1bd75e662b288b3a42dd1614f6c0967 Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Mon, 31 Mar 2025 10:00:32 +0200 Subject: [PATCH 2/3] add additional checks --- packages/node/src/utils/commonjs.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/node/src/utils/commonjs.ts b/packages/node/src/utils/commonjs.ts index ba204bd5265a..7e14f34d1663 100644 --- a/packages/node/src/utils/commonjs.ts +++ b/packages/node/src/utils/commonjs.ts @@ -1,4 +1,8 @@ /** Detect CommonJS. */ export function isCjs(): boolean { - return typeof module !== 'undefined' && typeof module.exports !== 'undefined'; + try { + return typeof module !== 'undefined' && module && typeof module.exports !== 'undefined'; + } catch { + return false; + } } From 1d30f257821ec5adf5838e696a0d8cf8fa8b715b Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Mon, 31 Mar 2025 10:18:24 +0200 Subject: [PATCH 3/3] remove && module --- packages/node/src/utils/commonjs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node/src/utils/commonjs.ts b/packages/node/src/utils/commonjs.ts index 7e14f34d1663..23a9b97f9fc1 100644 --- a/packages/node/src/utils/commonjs.ts +++ b/packages/node/src/utils/commonjs.ts @@ -1,7 +1,7 @@ /** Detect CommonJS. */ export function isCjs(): boolean { try { - return typeof module !== 'undefined' && module && typeof module.exports !== 'undefined'; + return typeof module !== 'undefined' && typeof module.exports !== 'undefined'; } catch { return false; }