From f948ad3415f18185e8a6e785f930fd3a6e3af90d Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Mon, 11 Aug 2025 11:52:26 -0600 Subject: [PATCH] web load env --- apps/trigger/package.json | 2 +- apps/trigger/trigger.config.ts | 4 ++++ apps/web/next.config.mjs | 1 - apps/web/package.json | 3 ++- apps/web/src/config/env.mjs | 5 +++- pnpm-lock.yaml | 43 ++++++++++++++++++---------------- 6 files changed, 34 insertions(+), 24 deletions(-) diff --git a/apps/trigger/package.json b/apps/trigger/package.json index 5cfc54f45..0b99dc92e 100644 --- a/apps/trigger/package.json +++ b/apps/trigger/package.json @@ -41,4 +41,4 @@ "devDependencies": { "@trigger.dev/build": "4.0.0-v4-beta.27" } -} +} \ No newline at end of file diff --git a/apps/trigger/trigger.config.ts b/apps/trigger/trigger.config.ts index 508d42bd0..869abd84f 100644 --- a/apps/trigger/trigger.config.ts +++ b/apps/trigger/trigger.config.ts @@ -2,6 +2,10 @@ import * as path from 'node:path'; import { esbuildPlugin } from '@trigger.dev/build/extensions'; import { defineConfig } from '@trigger.dev/sdk'; +// Load environment variables from root .env file +import { loadRootEnv } from '@buster/env-utils'; +loadRootEnv(); + export default defineConfig({ project: 'proj_lyyhkqmzhwiskfnavddk', runtime: 'node', diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs index 869b46017..c516b7627 100644 --- a/apps/web/next.config.mjs +++ b/apps/web/next.config.mjs @@ -1,7 +1,6 @@ import path, { dirname } from 'node:path'; import { fileURLToPath } from 'node:url'; import env from './src/config/env.mjs'; -import { withPostHogConfig } from '@posthog/nextjs-config'; import withBundleAnalyzer from '@next/bundle-analyzer'; const __filename = fileURLToPath(import.meta.url); diff --git a/apps/web/package.json b/apps/web/package.json index 321568da9..342bd3a31 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -29,7 +29,8 @@ "node": ">=22.0.0" }, "dependencies": { - "@ariakit/react": "^0.4.17", + "@ariakit/react": "^0.4.18", + "@buster/env-utils": "workspace:*", "@buster/server-shared": "workspace:*", "@buster/typescript-config": "workspace:*", "@dnd-kit/core": "^6.3.1", diff --git a/apps/web/src/config/env.mjs b/apps/web/src/config/env.mjs index ff73ab946..39497c416 100644 --- a/apps/web/src/config/env.mjs +++ b/apps/web/src/config/env.mjs @@ -1,5 +1,9 @@ import { z } from 'zod'; +// Load environment variables from root .env file +import { loadRootEnv } from '@buster/env-utils'; +loadRootEnv(); + const isServer = typeof window === 'undefined'; if (!isServer) { @@ -67,7 +71,6 @@ try { serverEnv = serverEnvSchema.parse(process.env); console.log('Successfully parsed server environment variables'); clientEnv = clientEnvSchema.parse(process.env); - console.log('Successfully parsed client environment variables'); } catch (error) { console.error('❌ Server environment validation failed!'); console.error(''); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ea937bed..3245f76bd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -237,7 +237,7 @@ importers: specifier: 'catalog:' version: 0.10.8(effect@3.16.8)(openapi-types@12.1.3)(react@18.3.1)(zod@3.25.1) '@trigger.dev/sdk': - specifier: ^4.0.0-v4-beta.27 + specifier: 4.0.0-v4-beta.27 version: 4.0.0-v4-beta.27(ai@4.3.16(react@18.3.1)(zod@3.25.1))(zod@3.25.1) ai: specifier: 'catalog:' @@ -256,14 +256,17 @@ importers: version: 3.25.1 devDependencies: '@trigger.dev/build': - specifier: ^4.0.0-v4-beta.27 + specifier: 4.0.0-v4-beta.27 version: 4.0.0-v4-beta.27(typescript@5.8.3) apps/web: dependencies: '@ariakit/react': - specifier: ^0.4.17 - version: 0.4.17(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^0.4.18 + version: 0.4.18(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@buster/env-utils': + specifier: workspace:* + version: link:../../packages/env-utils '@buster/server-shared': specifier: workspace:* version: link:../../packages/server-shared @@ -1319,14 +1322,14 @@ packages: '@ariakit/core@0.4.15': resolution: {integrity: sha512-vvxmZvkNhiisKM+Y1TbGMUfVVchV/sWu9F0xw0RYADXcimWPK31dd9JnIZs/OQ5pwAryAHmERHwuGQVESkSjwQ==} - '@ariakit/react-core@0.4.17': - resolution: {integrity: sha512-kFF6n+gC/5CRQIyaMTFoBPio2xUe0k9rZhMNdUobWRmc/twfeLVkODx+8UVYaNyKilTge8G0JFqwvFKku/jKEw==} + '@ariakit/react-core@0.4.18': + resolution: {integrity: sha512-wHtojXF7KPRwGTSbPg50l203Qngg2aGYCzCut+mYEwe3S0ZzuYVpiY+2Yh15HssnQ/S5yiDGRL4q94UEXsyO+w==} peerDependencies: react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 - '@ariakit/react@0.4.17': - resolution: {integrity: sha512-HQaIboE2axtlncJz1hRTaiQfJ1GGjhdtNcAnPwdjvl2RybfmlHowIB+HTVBp36LzroKPs/M4hPCxk7XTaqRZGg==} + '@ariakit/react@0.4.18': + resolution: {integrity: sha512-r38DFvdv6JzjC/8mHekTaJEXO6hmx+YPIiyjq9oL7DckLmqGkAKbFrmQd2CeKZZ1c372DDVw7lLhYjj/VYCBZQ==} peerDependencies: react: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -12533,7 +12536,7 @@ snapshots: '@ariakit/core@0.4.15': {} - '@ariakit/react-core@0.4.17(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@ariakit/react-core@0.4.18(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@ariakit/core': 0.4.15 '@floating-ui/dom': 1.7.2 @@ -12541,9 +12544,9 @@ snapshots: react-dom: 18.3.1(react@18.3.1) use-sync-external-store: 1.5.0(react@18.3.1) - '@ariakit/react@0.4.17(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@ariakit/react@0.4.18(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: - '@ariakit/react-core': 0.4.17(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@ariakit/react-core': 0.4.18(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -15213,7 +15216,7 @@ snapshots: '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0) '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0) '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.34.0 + '@opentelemetry/semantic-conventions': 1.36.0 '@opentelemetry/instrumentation-amqplib@0.48.0(@opentelemetry/api@1.9.0)': dependencies: @@ -20220,8 +20223,8 @@ snapshots: '@typescript-eslint/parser': 8.35.1(eslint@8.57.1)(typescript@5.8.3) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1) eslint-plugin-react: 7.37.5(eslint@8.57.1) eslint-plugin-react-hooks: 5.2.0(eslint@8.57.1) @@ -20244,7 +20247,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1): + eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.4.1 @@ -20255,22 +20258,22 @@ snapshots: tinyglobby: 0.2.14 unrs-resolver: 1.11.0 optionalDependencies: - eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1) transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.1(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.12.1(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 8.35.1(eslint@8.57.1)(typescript@5.8.3) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1) + eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@8.57.1) transitivePeerDependencies: - supports-color - eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): + eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.9 @@ -20281,7 +20284,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.35.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3