Validate env vars with Zod

waspc/data/Generator/templates/Dockerfile

@@ -55,15 +55,15 @@ WORKDIR /app
 # Copying the top level 'node_modules' because it contains the Prisma packages
 # necessary for migrating the database.
 COPY --from=server-builder /app/node_modules ./node_modules
-# Copying the SDK because 'validate-env.mjs' executes independent of the bundle
+# Copying the SDK because the server bundle doesn't bundle the SDK
 # and references the 'wasp' package.
 COPY --from=server-builder /app/.wasp/out/sdk .wasp/out/sdk
-# Copying 'server/node_modules' because 'validate-env.mjs' executes independent
-# of the bundle and references the dotenv package.
+# Copying 'server/node_modules' because we require dotenv package to
+# load environment variables
+# TODO: replace dotenv with native Node.js environment variable loading
 COPY --from=server-builder /app/.wasp/build/server/node_modules .wasp/build/server/node_modules
 COPY --from=server-builder /app/.wasp/build/server/bundle .wasp/build/server/bundle
 COPY --from=server-builder /app/.wasp/build/server/package*.json .wasp/build/server/
-COPY --from=server-builder /app/.wasp/build/server/scripts .wasp/build/server/scripts
 COPY db/ .wasp/build/db/
 EXPOSE ${PORT}
 WORKDIR /app/.wasp/build/server

waspc/data/Generator/templates/react-app/package.json

@@ -7,9 +7,8 @@
   {=& depsChunk =},
   {=& devDepsChunk =},
   "scripts": {
-    "start": "npm run validate-env && vite",
-    "build": "npm run validate-env && tsc && vite build",
-    "validate-env": "node -r dotenv/config ./scripts/validate-env.mjs"
+    "start": "vite",
+    "build": "tsc && vite build"
   },
   "engineStrict": true,
   "engines": {

waspc/data/Generator/templates/react-app/src/components/DefaultRootErrorBoundary.tsx

@@ -7,7 +7,10 @@ export function DefaultRootErrorBoundary() {
   console.error(error)
   return (
     <FullPageWrapper>
-      <div>There was an error rendering this page. Check the browser console for more information.</div>
+      <div>
+        There was an error rendering this page. Check the browser console for
+        more information.
+      </div>
     </FullPageWrapper>
   )
 }

waspc/data/Generator/templates/sdk/wasp/client/config.ts

@@ -1,7 +1,7 @@
-{{={= =}=}}
 import { stripTrailingSlash } from '../universal/url.js'
+import { env } from './env.js'
 
-const apiUrl = stripTrailingSlash(import.meta.env.REACT_APP_API_URL) || '{= defaultServerUrl =}';
+const apiUrl = stripTrailingSlash(env.REACT_APP_API_URL)
 
 // PUBLIC API
 export type ClientConfig = {

waspc/data/Generator/templates/sdk/wasp/client/env.ts

@@ -0,0 +1,15 @@
+{{={= =}=}}
+import * as z from 'zod'
+
+import { ensureEnvSchema } from '../env/index.js'
+
+const clientEnvSchema = z.object({
+  REACT_APP_API_URL: z
+    .string({
+      required_error: 'REACT_APP_API_URL is required',
+    })
+    .default('{= defaultServerUrl =}')
+})
+
+// PUBLIC API
+export const env = ensureEnvSchema(import.meta.env, clientEnvSchema)

waspc/data/Generator/templates/sdk/wasp/client/index.ts

@@ -11,4 +11,7 @@ export enum HttpMethod {
 export type Route = { method: HttpMethod; path: string }
 
 // PUBLIC API
-export { config, ClientConfig } from './config'
+export { config, ClientConfig } from './config.js'
+
+// PUBLIC API
+export { env } from './env.js'

waspc/data/Generator/templates/sdk/wasp/env/index.ts

@@ -0,0 +1,25 @@
+import * as z from 'zod'
+
+const redColor = '\x1b[31m'
+
+export function ensureEnvSchema<Schema extends z.ZodTypeAny>(
+  data: unknown,
+  schema: Schema
+): z.infer<Schema> {
+  try {
+    return schema.parse(data)
+  } catch (e) {
+    if (e instanceof z.ZodError) {
+      const errorOutput = ['', '══ Env vars validation failed ══', '']
+      for (const error of e.errors) {
+        errorOutput.push(` - ${error.message}`)
+      }
+      errorOutput.push('')
+      errorOutput.push('════════════════════════════════')
+      console.error(redColor, errorOutput.join('\n'))
+      throw new Error('Error parsing environment variables')
+    } else {
+      throw e
+    }
+  }
+}

waspc/data/Generator/templates/sdk/wasp/server/HttpError.ts

@@ -2,7 +2,12 @@ export class HttpError extends Error {
   public statusCode: number
   public data: unknown
 
-  constructor (statusCode: number, message?: string, data?: Record<string, unknown>, options?: ErrorOptions) {
+  constructor(
+    statusCode: number,
+    message?: string,
+    data?: Record<string, unknown>,
+    options?: ErrorOptions
+  ) {
     super(message, options)
 
     if (Error.captureStackTrace) {
@@ -11,7 +16,9 @@ export class HttpError extends Error {
 
     this.name = this.constructor.name
 
-    if (!(Number.isInteger(statusCode) && statusCode >= 400 && statusCode < 600)) {
+    if (
+      !(Number.isInteger(statusCode) && statusCode >= 400 && statusCode < 600)
+    ) {
       throw new Error('statusCode has to be integer in range [400, 600).')
     }
     this.statusCode = statusCode

waspc/data/Generator/templates/sdk/wasp/server/auth/oauth/provider.ts

@@ -1,23 +1,19 @@
 import { OAuth2Provider, OAuth2ProviderWithPKCE } from "arctic";
 
 export function defineProvider<
-  OAuthClient extends OAuth2Provider | OAuth2ProviderWithPKCE,
-  Env extends Record<string, string>
+  OAuthClient extends OAuth2Provider | OAuth2ProviderWithPKCE
 >({
   id,
   displayName,
-  env,
   oAuthClient,
 }: {
   id: string;
   displayName: string;
-  env: Env;
   oAuthClient: OAuthClient;
 }) {
   return {
     id,
     displayName,
-    env,
     oAuthClient,
   };
 }

waspc/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/discord.ts

@@ -1,17 +1,12 @@
 {{={= =}=}}
-import { Discord  } from "arctic";
+import { Discord  } from 'arctic';
 
-import { defineProvider } from "../provider.js";
-import { ensureEnvVarsForProvider } from "../env.js";
-import { getRedirectUriForCallback } from "../redirect.js";
+import { defineProvider } from '../provider.js';
+import { getRedirectUriForCallback } from '../redirect.js';
+import { env } from '../../../env.js';
 
-const id = "{= providerId =}";
-const displayName = "{= displayName =}";
-
-const env = ensureEnvVarsForProvider(
-  ["DISCORD_CLIENT_ID", "DISCORD_CLIENT_SECRET"],
-  displayName
-);
+const id = '{= providerId =}';
+const displayName = '{= displayName =}';
 
 const oAuthClient = new Discord(
   env.DISCORD_CLIENT_ID,
@@ -23,6 +18,5 @@ const oAuthClient = new Discord(
 export const discord = defineProvider({
   id,
   displayName,
-  env,
   oAuthClient,
 });

waspc/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/github.ts

@@ -1,16 +1,11 @@
 {{={= =}=}}
-import { GitHub  } from "arctic";
+import { GitHub  } from 'arctic';
 
-import { ensureEnvVarsForProvider } from "../env.js";
-import { defineProvider } from "../provider.js";
+import { defineProvider } from '../provider.js';
+import { env } from '../../../env.js';
 
-const id = "{= providerId =}";
-const displayName = "{= displayName =}";
-
-const env = ensureEnvVarsForProvider(
-  ["GITHUB_CLIENT_ID", "GITHUB_CLIENT_SECRET"],
-  displayName
-);
+const id = '{= providerId =}';
+const displayName = '{= displayName =}';
 
 const oAuthClient = new GitHub(
   env.GITHUB_CLIENT_ID,
@@ -21,6 +16,5 @@ const oAuthClient = new GitHub(
 export const github = defineProvider({
   id,
   displayName,
-  env,
   oAuthClient,
 });

waspc/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/google.ts

@@ -1,17 +1,12 @@
 {{={= =}=}}
-import { Google  } from "arctic";
+import { Google  } from 'arctic';
 
-import { ensureEnvVarsForProvider } from "../env.js";
-import { getRedirectUriForCallback } from "../redirect.js";
-import { defineProvider } from "../provider.js";
+import { getRedirectUriForCallback } from '../redirect.js';
+import { defineProvider } from '../provider.js';
+import { env } from '../../../env.js';
 
-const id = "{= providerId =}";
-const displayName = "{= displayName =}";
-
-const env = ensureEnvVarsForProvider(
-  ["GOOGLE_CLIENT_ID", "GOOGLE_CLIENT_SECRET"],
-  displayName,
-);
+const id = '{= providerId =}';
+const displayName = '{= displayName =}';
 
 const oAuthClient = new Google(
   env.GOOGLE_CLIENT_ID,
@@ -23,6 +18,5 @@ const oAuthClient = new Google(
 export const google = defineProvider({
   id,
   displayName,
-  env,
   oAuthClient,
 });

waspc/data/Generator/templates/sdk/wasp/server/auth/oauth/providers/keycloak.ts

@@ -1,17 +1,12 @@
 {{={= =}=}}
-import { Keycloak  } from "arctic";
+import { Keycloak  } from 'arctic';
 
-import { ensureEnvVarsForProvider } from "../env.js";
-import { getRedirectUriForCallback } from "../redirect.js";
-import { defineProvider } from "../provider.js";
+import { getRedirectUriForCallback } from '../redirect.js';
+import { defineProvider } from '../provider.js';
+import { env } from '../../../env.js';
 
-const id = "{= providerId =}";
-const displayName = "{= displayName =}";
-
-const env = ensureEnvVarsForProvider(
-  ["KEYCLOAK_REALM_URL", "KEYCLOAK_CLIENT_ID", "KEYCLOAK_CLIENT_SECRET"],
-  displayName,
-);
+const id = '{= providerId =}';
+const displayName = '{= displayName =}';
 
 const oAuthClient = new Keycloak(
   env.KEYCLOAK_REALM_URL,
@@ -24,6 +19,5 @@ const oAuthClient = new Keycloak(
 export const keycloak = defineProvider({
   id,
   displayName,
-  env,
   oAuthClient,
 });