coder · sreya · Nov 27, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
diff --git a/offlinedocs/pages/[[...slug]].tsx b/offlinedocs/pages/[[...slug]].tsx
@@ -27,7 +27,7 @@ import {
 } from "@chakra-ui/react";
 import fm from "front-matter";
 import { readFileSync } from "fs";
-import _ from "lodash";
+import _, { min } from "lodash";
 import { GetStaticPaths, GetStaticProps, NextPage } from "next";
 import Head from "next/head";
 import NextLink from "next/link";
@@ -194,8 +194,21 @@ const getNavigation = (manifest: Manifest): Nav => {
 	return navigation;
 };
 
-const removeHtmlComments = (string: string) => {
-	return string.replace(/<!--[\s\S]*?-->/g, "");
+const removeHtmlComments = (input: string) => {
+	if (!input) return "";
+
+	let lastResult = input;
+	let currentResult = "";
+
+	// Keep replacing until no more changes occur
+	do {
+		currentResult = lastResult.replace(/<!--[\s\S]*?-->/g, "");
+		if (currentResult === lastResult) {
+			break;
+		}
+		lastResult = currentResult;
+	} while (true);
+	return currentResult;
 };
 
 export const getStaticPaths: GetStaticPaths = () => {

diff --git a/offlinedocs/pnpm-lock.yaml b/offlinedocs/pnpm-lock.yaml
diff --git a/package.json b/package.json
@@ -9,6 +9,10 @@
 		"storybook": "pnpm run -C site/ storybook"
 	},
 	"devDependencies": {
+		"@types/url-parse": "^1.4.11",
 		"prettier": "3.3.3"
+	},
+	"dependencies": {
+		"url-parse": "^1.5.10"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/site/src/utils/apps.ts b/site/src/utils/apps.ts
@@ -1,4 +1,5 @@
 import type * as TypesGen from "api/typesGenerated";
+import URLParse from "url-parse";
 
 export const createAppLinkHref = (
 	protocol: string,
@@ -29,7 +30,12 @@ export const createAppLinkHref = (
 	}
 
 	if (appsHost && app.subdomain && app.subdomain_name) {
-		href = `${protocol}//${appsHost}/`.replace("*", app.subdomain_name);
+		const url = new URLParse("");
+		url.set("protocol", protocol);
+		url.set("hostname", appsHost.replace("*", app.subdomain_name));
+		url.set("pathname", "/");
+
+		href = url.toString();
 	}
 	return href;
 };
diff --git a/site/src/utils/portForward.ts b/site/src/utils/portForward.ts
@@ -1,4 +1,5 @@
 import type { WorkspaceAgentPortShareProtocol } from "api/typesGenerated";
+import URLParse from "url-parse";
 
 export const portForwardURL = (
 	host: string,
@@ -12,7 +13,11 @@ export const portForwardURL = (
 	const suffix = protocol === "https" ? "s" : "";
 
 	const subdomain = `${port}${suffix}--${agentName}--${workspaceName}--${username}`;
-	return `${location.protocol}//${host}`.replace("*", subdomain);
+	const url = new URLParse("");
+	url.set("protocol", location.protocol);
+	url.set("hostname", host.replace("*", subdomain));
+
+	return url.toString();
 };
 
 // openMaybePortForwardedURL tries to open the provided URI through the