Define the WASP_SERVER_URL env var (#1856)

waspc/ChangeLog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.13.0
+
+### 🎉 New features
+
+- Wasp now supports defining the `WASP_SERVER_URL` environment variable and exposes it as `serverUrl` in the server config which can be imported from `wasp/server`.
+
 ## 0.12.3 (2024-03-01)
 
 ### 🎉 New features

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

@@ -1,6 +1,7 @@
+{{={= =}=}}
 import { stripTrailingSlash } from 'wasp/universal/url'
 
-const apiUrl = stripTrailingSlash(import.meta.env.REACT_APP_API_URL) || 'http://localhost:3001';
+const apiUrl = stripTrailingSlash(import.meta.env.REACT_APP_API_URL) || '{= defaultServerUrl =}';
 
 const config = {
   apiUrl,

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

@@ -28,6 +28,7 @@ type CommonConfig = BaseConfig & {
 
 type EnvConfig = BaseConfig & {
   frontendUrl: string;
+  serverUrl: string;
 }
 
 type Config = CommonConfig & EnvConfig
@@ -40,7 +41,7 @@ const config: {
   all: {
     env,
     isDevelopment: env === 'development',
-    port: parseInt(process.env.PORT) || 3001,
+    port: parseInt(process.env.PORT) || {= defaultServerPort =},
     databaseUrl: process.env.{= databaseUrlEnvVarName =},
     allowedCORSOrigins: [],
     {=# isAuthEnabled =}
@@ -59,8 +60,10 @@ export default resolvedConfig
 
 function getDevelopmentConfig(): EnvConfig {
   const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL || '{= defaultClientUrl =}');
+  const serverUrl = stripTrailingSlash(process.env.WASP_SERVER_URL || '{= defaultServerUrl =}');
   return {
     frontendUrl,
+    serverUrl,
     allowedCORSOrigins: '*',
     {=# isAuthEnabled =}
     auth: {
@@ -72,8 +75,10 @@ function getDevelopmentConfig(): EnvConfig {
 
 function getProductionConfig(): EnvConfig {
   const frontendUrl = stripTrailingSlash(process.env.WASP_WEB_CLIENT_URL);
+  const serverUrl = stripTrailingSlash(process.env.WASP_SERVER_URL);
   return {
     frontendUrl,
+    serverUrl,
     allowedCORSOrigins: [frontendUrl],
     {=# isAuthEnabled =}
     auth: {

waspc/data/Generator/templates/server/scripts/validate-env.mjs

@@ -2,3 +2,4 @@ import { throwIfNotValidAbsoluteURL } from 'wasp/universal/validators';
 
 console.info("🔍 Validating environment variables...");
 throwIfNotValidAbsoluteURL(process.env.WASP_WEB_CLIENT_URL, 'Environment variable WASP_WEB_CLIENT_URL');
+throwIfNotValidAbsoluteURL(process.env.WASP_SERVER_URL, 'Environment variable WASP_SERVER_URL');