Merge branch 'main' into ar1s

elysiajs · Aug 6, 2023 · 7b638c3 · 7b638c3
2 parents c7af464 + 6c2e1a7
commit 7b638c3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
 import type { Serve, Server } from 'bun'
+import * as nodeProcess from 'node:process'
 
 import { Memoirist } from 'memoirist'
 
@@ -3335,8 +3336,8 @@ export default class Elysia<
 
 		const fetch = this.fetch
 
-		const development =
-			(Bun?.env.NODE_ENV ?? process.env.ENV ?? process.env.NODE_ENV) !== 'production'
+		const env = (Bun !== null ? Bun.env : process !== null ? process.env : nodeProcess.env)
+		const development = (env?.ENV ?? env?.NODE_ENV) !== 'production'
 
 		const serve: Serve =
 			typeof options === 'object'