Added a helper fn to stripTrailingSlash

wasp-lang · Aug 12, 2024 · 632b7f2 · 632b7f2
1 parent 9c138d7
commit 632b7f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/waspc/packages/deploy/src/providers/fly/deploy/deploy.ts b/waspc/packages/deploy/src/providers/fly/deploy/deploy.ts
@@ -7,6 +7,7 @@ import {
 	makeIdempotent,
 	getCommandHelp,
 	waspSays,
+	stripTrailingSlash,
 } from '../helpers/helpers.js';
 import {
 	clientTomlExistsInProject,
@@ -105,7 +106,7 @@ async function deployClient(deploymentInfo: DeploymentInfo<DeployOptions>, { bui
 	waspSays('Building web client for production...');
 	waspSays('If you configured a custom domain for the server, please run the command with an env variable: REACT_APP_API_URL=https://serverUrl.com wasp deploy fly deploy');
 
-	const serverUrl = process.env.REACT_APP_API_URL || deploymentInfo.serverUrl;
+	const serverUrl = stripTrailingSlash(process.env.REACT_APP_API_URL ?? '') || deploymentInfo.serverUrl;
 	await $`npm install`;
 	await $`REACT_APP_API_URL=${serverUrl} npm run build`;
 

diff --git a/waspc/packages/deploy/src/providers/fly/helpers/helpers.ts b/waspc/packages/deploy/src/providers/fly/helpers/helpers.ts
@@ -141,3 +141,10 @@ export async function silence(
 	$.verbose = verboseSetting;
 	return proc;
 }
+
+export function stripTrailingSlash(url: string): string {
+	if (url.endsWith('/')) {
+		return url.slice(0, -1);
+	}
+	return url;
+}