From eb9bbb676fadab895aad07c63aec3ff1427bb1a1 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:20:40 +0100 Subject: [PATCH 1/3] override dashboard dev env vars with local .env --- packages/cli-v3/src/dev/backgroundWorker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-v3/src/dev/backgroundWorker.ts b/packages/cli-v3/src/dev/backgroundWorker.ts index 24ae8942f8..50a13304ee 100644 --- a/packages/cli-v3/src/dev/backgroundWorker.ts +++ b/packages/cli-v3/src/dev/backgroundWorker.ts @@ -319,9 +319,9 @@ export class BackgroundWorker { const processOptions: TaskRunProcessOptions = { payload, env: { - ...sanitizeEnvVars(this.params.env), // TODO: this needs the stripEmptyValues stuff too ...sanitizeEnvVars(payload.environment ?? {}), + ...sanitizeEnvVars(this.params.env), TRIGGER_WORKER_MANIFEST_PATH: this.workerManifestPath, }, serverWorker: this.serverWorker, From 6ad5f0560f9bcd6ebfb89acaaf8ca753f1a5c9a8 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:23:09 +0100 Subject: [PATCH 2/3] add changeset --- .changeset/gentle-mails-smoke.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/gentle-mails-smoke.md diff --git a/.changeset/gentle-mails-smoke.md b/.changeset/gentle-mails-smoke.md new file mode 100644 index 0000000000..650f80faea --- /dev/null +++ b/.changeset/gentle-mails-smoke.md @@ -0,0 +1,5 @@ +--- +"trigger.dev": patch +--- + +Local env files like `.env` will now correctly override dev env vars configured in the dashboard From 4bed4556b465a6f9fd30b6dd6e8cefdb62111d97 Mon Sep 17 00:00:00 2001 From: nicktrn <55853254+nicktrn@users.noreply.github.com> Date: Mon, 7 Oct 2024 18:35:37 +0100 Subject: [PATCH 3/3] add simple task for testing env vars --- references/v3-catalog/src/trigger/other.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/references/v3-catalog/src/trigger/other.ts b/references/v3-catalog/src/trigger/other.ts index c68af1d399..1aee8136a4 100644 --- a/references/v3-catalog/src/trigger/other.ts +++ b/references/v3-catalog/src/trigger/other.ts @@ -156,3 +156,11 @@ export const returnZeroCharacters = task({ }; }, }); + +export const testEnvVars = task({ + id: "test-env-vars", + run: async (payload: any) => { + console.log(`env.FOO: ${process.env.FOO}`); + console.log(`env.BAR: ${process.env.BAR}`); + }, +});