From 711d3e0ee99b63d5bf1ef351ea7a6740535f3b04 Mon Sep 17 00:00:00 2001 From: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com> Date: Thu, 20 Jul 2023 16:38:59 +0800 Subject: [PATCH] Adrienne / Fix issues with environment variable not in webpack config for core (#9397) * fix: issues with environment variable not in webpack config for core * chore: updated test cases --- packages/analytics/src/__tests__/rudderstack.spec.tsx | 2 +- packages/analytics/src/rudderstack.ts | 4 ++-- packages/core/build/constants.js | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/analytics/src/__tests__/rudderstack.spec.tsx b/packages/analytics/src/__tests__/rudderstack.spec.tsx index 83a4220e993d..5c25fa0d6e80 100644 --- a/packages/analytics/src/__tests__/rudderstack.spec.tsx +++ b/packages/analytics/src/__tests__/rudderstack.spec.tsx @@ -17,7 +17,7 @@ describe('rudderstack', () => { beforeAll(() => { process.env = { ...originalEnv, - NODE_ENV: 'staging', + CIRCLE_JOB: 'release_staging', RUDDERSTACK_PRODUCTION_KEY: '123456789', RUDDERSTACK_STAGING_KEY: '123456789', RUDDERSTACK_URL: 'http://example.com', diff --git a/packages/analytics/src/rudderstack.ts b/packages/analytics/src/rudderstack.ts index bd15ac8546c8..6ebf72ec510a 100644 --- a/packages/analytics/src/rudderstack.ts +++ b/packages/analytics/src/rudderstack.ts @@ -105,8 +105,8 @@ export class RudderStack { } init() { - const is_production = process.env.NODE_ENV === 'production'; - const is_staging = process.env.NODE_ENV === 'staging'; + const is_production = process.env.CIRCLE_JOB === 'release_production'; + const is_staging = process.env.CIRCLE_JOB === 'release_staging'; if (!is_production && !is_staging) return; diff --git a/packages/core/build/constants.js b/packages/core/build/constants.js index 3e49651cd7ac..e912721d4167 100644 --- a/packages/core/build/constants.js +++ b/packages/core/build/constants.js @@ -135,6 +135,9 @@ const plugins = ({ base, is_test_env }) => { 'process.env.DATADOG_SESSION_SAMPLE_RATE': JSON.stringify(process.env.DATADOG_SESSION_SAMPLE_RATE), 'process.env.CIRCLE_TAG': JSON.stringify(process.env.CIRCLE_TAG), 'process.env.CIRCLE_JOB': JSON.stringify(process.env.CIRCLE_JOB), + 'process.env.RUDDERSTACK_URL': JSON.stringify(process.env.RUDDERSTACK_URL), + 'process.env.RUDDERSTACK_PRODUCTION_KEY': JSON.stringify(process.env.RUDDERSTACK_PRODUCTION_KEY), + 'process.env.RUDDERSTACK_STAGING_KEY': JSON.stringify(process.env.RUDDERSTACK_STAGING_KEY), }), new CleanWebpackPlugin(), new CopyPlugin(copyConfig(base)),