From 356dad1932c3404f581b747127ae251dbe165bb3 Mon Sep 17 00:00:00 2001 From: dan Date: Fri, 13 Dec 2024 17:16:53 +0000 Subject: Remove the environment indirections (#7089) * Use raw underlying globals for environment * Set dev EXPO_PUBLIC_ENV by exclusion --- src/logger/README.md | 4 ++-- src/logger/__tests__/logger.test.ts | 2 -- src/logger/index.ts | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'src/logger') diff --git a/src/logger/README.md b/src/logger/README.md index 17dd61cb3..8da7deb14 100644 --- a/src/logger/README.md +++ b/src/logger/README.md @@ -17,8 +17,8 @@ logger.error(error[, metadata]) #### Modes -The "modes" referred to here are inferred from the values exported from `#/env`. -Basically, the booleans `IS_DEV` and `IS_PROD`. +The "modes" referred to here are inferred from `process.env.NODE_ENV`, +which matches how React Native sets the `__DEV__` global. #### Log Levels diff --git a/src/logger/__tests__/logger.test.ts b/src/logger/__tests__/logger.test.ts index 02039d26e..be2391e12 100644 --- a/src/logger/__tests__/logger.test.ts +++ b/src/logger/__tests__/logger.test.ts @@ -5,8 +5,6 @@ import {nanoid} from 'nanoid/non-secure' import {Logger, LogLevel, sentryTransport} from '#/logger' jest.mock('#/env', () => ({ - IS_DEV: false, - IS_PROD: false, /* * Forces debug mode for tests using the default logger. Most tests create * their own logger instance. diff --git a/src/logger/index.ts b/src/logger/index.ts index d99bfeb13..102bccef7 100644 --- a/src/logger/index.ts +++ b/src/logger/index.ts @@ -270,13 +270,14 @@ if (process.env.NODE_ENV !== 'test') { logger.addTransport(createBitdriftTransport()) } -if (env.IS_DEV && process.env.NODE_ENV !== 'test') { - logger.addTransport(consoleTransport) - - /* - * Comment this out to disable Sentry transport in dev - */ - // logger.addTransport(sentryTransport) -} else if (env.IS_PROD) { - logger.addTransport(sentryTransport) +if (process.env.NODE_ENV !== 'test') { + if (__DEV__) { + logger.addTransport(consoleTransport) + /* + * Comment this out to enable Sentry transport in dev + */ + // logger.addTransport(sentryTransport) + } else { + logger.addTransport(sentryTransport) + } } -- cgit 1.4.1