Refactor env variables

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

@@ -1,12 +1,13 @@
+{{={= =}=}}
 import { stripTrailingSlash } from '../universal/url.js'
 import { env } from './env.js'
 
-const apiUrl = stripTrailingSlash(env.REACT_APP_API_URL)
+const apiUrl = stripTrailingSlash(env["{= serverUrlEnvVarName =}"])
 
 // PUBLIC API
 export type ClientConfig = {
   apiUrl: string,
-} 
+}
 
 // PUBLIC API
 export const config: ClientConfig = {

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

@@ -10,10 +10,10 @@ const userClientEnvSchema = z.object({})
 {=/ envValidationSchema.isDefined =}
 
 const waspClientEnvSchema = z.object({
-  REACT_APP_API_URL: z
+  "{= serverUrlEnvVarName =}": z
   .string()
   .url({
-    message: 'REACT_APP_API_URL must be a valid URL',
+    message: '{= serverUrlEnvVarName =} must be a valid URL',
   })
   .default('{= defaultServerUrl =}'),
 })

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

@@ -19,8 +19,8 @@ type Config = {
   {=/ isAuthEnabled =}
 }
 
-const frontendUrl = stripTrailingSlash(env.WASP_WEB_CLIENT_URL)
-const serverUrl = stripTrailingSlash(env.WASP_SERVER_URL)
+const frontendUrl = stripTrailingSlash(env["{= clientUrlEnvVarName =}"])
+const serverUrl = stripTrailingSlash(env["{= serverUrlEnvVarName =}"])
 
 const allowedCORSOriginsPerEnv: Record<NodeEnv, string | string[]> = {
   development: '*',
@@ -38,7 +38,7 @@ const config: Config = {
   databaseUrl: env.{= databaseUrlEnvVarName =},
   {=# isAuthEnabled =}
   auth: {
-    jwtSecret: env.JWT_SECRET
+    jwtSecret: env["{= jwtSecretEnvVarName =}"]
   }
   {=/ isAuthEnabled =}
 }

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

@@ -107,47 +107,47 @@ const waspServerCommonSchema = z.object({
 
 const serverUrlSchema = z
   .string({
-    required_error: 'WASP_SERVER_URL is required',
+    required_error: '{= serverUrlEnvVarName =} is required',
   })
   .url({
-    message: 'WASP_SERVER_URL must be a valid URL',
+    message: '{= serverUrlEnvVarName =} must be a valid URL',
   })
 
 const clientUrlSchema = z
   .string({
-    required_error: 'WASP_WEB_CLIENT_URL is required',
+    required_error: '{= clientUrlEnvVarName =} is required',
   })
   .url({
-    message: 'WASP_WEB_CLIENT_URL must be a valid URL',
+    message: '{= clientUrlEnvVarName =} must be a valid URL',
   })
 
 {=# isAuthEnabled =}
 const jwtTokenSchema = z
   .string({
-    required_error: 'JWT_SECRET is required',
+    required_error: '{= jwtSecretEnvVarName =} is required',
   })
 {=/ isAuthEnabled =}
 
 // In development, we provide default values for some environment variables
 // to make the development process easier.
 const serverDevSchema = z.object({
   NODE_ENV: z.literal('development'),
-  WASP_SERVER_URL: serverUrlSchema
+  "{= serverUrlEnvVarName =}": serverUrlSchema
     .default('{= defaultServerUrl =}'),
-  WASP_WEB_CLIENT_URL: clientUrlSchema
+  "{= clientUrlEnvVarName =}": clientUrlSchema
     .default('{= defaultClientUrl =}'),
   {=# isAuthEnabled =}
-  JWT_SECRET: jwtTokenSchema
+  "{= jwtSecretEnvVarName =}": jwtTokenSchema
     .default('DEVJWTSECRET'),
   {=/ isAuthEnabled =}
 })
 
 const serverProdSchema = z.object({
   NODE_ENV: z.literal('production'),
-  WASP_SERVER_URL: serverUrlSchema,
-  WASP_WEB_CLIENT_URL: clientUrlSchema,
+  "{= serverUrlEnvVarName =}": serverUrlSchema,
+  "{= clientUrlEnvVarName =}": clientUrlSchema,
   {=# isAuthEnabled =}
-  JWT_SECRET: jwtTokenSchema,
+  "{= jwtSecretEnvVarName =}": jwtTokenSchema,
   {=/ isAuthEnabled =}
 })