diff --git a/frontend/app/.server/environment/client.ts b/frontend/app/.server/environment/client.ts index d541b9d7..6224d386 100644 --- a/frontend/app/.server/environment/client.ts +++ b/frontend/app/.server/environment/client.ts @@ -2,10 +2,12 @@ import * as v from 'valibot'; import { stringToBooleanSchema } from '~/.server/validation/string-to-boolean-schema'; import { stringToIntegerSchema } from '~/.server/validation/string-to-integer-schema'; +import { isValidTimeZone } from '~/utils/date-utils'; export type Client = Readonly>; export const defaults = { + BASE_TIMEZONE: 'Canada/Eastern', BUILD_DATE: '1970-01-01T00:00:00.000Z', BUILD_ID: '000000', BUILD_REVISION: '00000000', @@ -22,6 +24,7 @@ export const defaults = { * ⚠️ IMPORTANT: DO NOT PUT SENSITIVE CONFIGURATIONS HERE ⚠️ */ export const client = v.object({ + BASE_TIMEZONE: v.optional(v.pipe(v.string(), v.check(isValidTimeZone)), defaults.BASE_TIMEZONE), BUILD_DATE: v.optional(v.string(), defaults.BUILD_DATE), BUILD_ID: v.optional(v.string(), defaults.BUILD_ID), BUILD_REVISION: v.optional(v.string(), defaults.BUILD_REVISION), diff --git a/frontend/app/.server/environment/server.ts b/frontend/app/.server/environment/server.ts index 1a36839f..9bd656a2 100644 --- a/frontend/app/.server/environment/server.ts +++ b/frontend/app/.server/environment/server.ts @@ -9,14 +9,12 @@ import { session, defaults as sessionDefaults } from '~/.server/environment/sess import { telemetry, defaults as telemetryDefaults } from '~/.server/environment/telemetry'; import { LogFactory } from '~/.server/logging'; import { stringToIntegerSchema } from '~/.server/validation/string-to-integer-schema'; -import { isValidTimeZone } from '~/utils/date-utils'; const log = LogFactory.getLogger(import.meta.url); export type Server = Readonly>; export const defaults = { - BASE_TIMEZONE: 'Canada/Eastern', NODE_ENV: 'development', PORT: '3000', ...authenticationDefaults, @@ -41,7 +39,6 @@ export const server = v.pipe( ...redis.entries, ...session.entries, ...telemetry.entries, - BASE_TIMEZONE: v.optional(v.pipe(v.string(), v.check(isValidTimeZone)), defaults.BASE_TIMEZONE), NODE_ENV: v.optional(v.picklist(['production', 'development', 'test']), defaults.NODE_ENV), PORT: v.optional(v.pipe(stringToIntegerSchema(), v.minValue(0)), defaults.PORT), }),