From b6fec2971d9ff6e007ce083130003f4776aaca92 Mon Sep 17 00:00:00 2001 From: Will Date: Fri, 18 Oct 2024 10:16:50 -0500 Subject: [PATCH 1/3] build: initial commit initial commit Co-authored-by: Thomas Lane <163203257+tlane25@users.noreply.github.com> --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index ec4c6f772e..f6b97045b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26468,7 +26468,7 @@ }, "devDependencies": { "@bugsnag/source-maps": "^2.3.1", - "@playwright/test": "^1.48.0", + "@playwright/test": "^1.30.0", "@types/node": "^14.18.53", "@types/semver": "^7.3.13", "@vitest/coverage-c8": "^0.33.0", From fc79b2e4025d672338eca4ef14fb4351e8bb898f Mon Sep 17 00:00:00 2001 From: Will Date: Fri, 18 Oct 2024 10:21:52 -0500 Subject: [PATCH 2/3] fix: build getEnvelope context fixed issue where build was not injecting env variables that were not dev or all context Co-authored-by: Thomas Lane <163203257+tlane25@users.noreply.github.com> --- packages/config/src/env/envelope.ts | 6 +++--- packages/config/src/env/main.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/config/src/env/envelope.ts b/packages/config/src/env/envelope.ts index d75e0786ee..3f4d88e1e3 100644 --- a/packages/config/src/env/envelope.ts +++ b/packages/config/src/env/envelope.ts @@ -17,10 +17,10 @@ export const getEnvelope = async function ({ try { const environmentVariables = await (api as any).getEnvVars({ accountId, siteId, context_name: context }) - const sortedEnvVarsFromDevContext = environmentVariables + const sortedEnvVarsFromContext = environmentVariables .sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1)) .reduce((acc, cur) => { - const envVar = cur.values.find((val) => ['dev', 'all'].includes(val.context)) + const envVar = cur.values.find((val) => ['all', context].includes(val.context)) if (envVar && envVar.value) { return { ...acc, @@ -29,7 +29,7 @@ export const getEnvelope = async function ({ } return acc }, {}) - return sortedEnvVarsFromDevContext + return sortedEnvVarsFromContext } catch { return {} } diff --git a/packages/config/src/env/main.ts b/packages/config/src/env/main.ts index ea73911eaf..5ce066ba93 100644 --- a/packages/config/src/env/main.ts +++ b/packages/config/src/env/main.ts @@ -181,7 +181,7 @@ const getAccountEnv = async function ({ context?: string }) { if (siteInfo.use_envelope) { - const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, context }) + const envelope = await getEnvelope({ api, accountId: siteInfo.account_slug, siteId: siteInfo.site_id, context }) return envelope } const { site_env: siteEnv = {} } = accounts.find(({ slug }) => slug === siteInfo.account_slug) || {} From 4f38aebf1eb514cac62851e5c0cc5373785ccc5b Mon Sep 17 00:00:00 2001 From: Will Conrad Date: Tue, 22 Oct 2024 17:13:09 -0500 Subject: [PATCH 3/3] fix: fixed test that was failing Co-authored-by: Thomas Lane <163203257+tlane25@users.noreply.github.com> Co-authored-by: Thomas Lane --- packages/config/tests/env/tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/config/tests/env/tests.js b/packages/config/tests/env/tests.js index 0d82d7f9d9..a8d6463132 100644 --- a/packages/config/tests/env/tests.js +++ b/packages/config/tests/env/tests.js @@ -310,7 +310,7 @@ test('Sets environment variables when configured to use Envelope', async (t) => t.deepEqual(env.URL.sources, ['general']) t.is(env.URL.value, 'test') t.is(env.SHARED_ENV_VAR.value, 'ENVELOPE_TEAM_ALL') - t.is(env.SITE_ENV_VAR.value, 'ENVELOPE_SITE_DEV') + t.is(env.SITE_ENV_VAR.value, 'ENVELOPE_SITE_PROD') t.is(env.MONGO_ENV_VAR, undefined) })