fix: URL compatibility (#12)

opengovsg · Aug 20, 2024 · 9f26611 · 9f26611
1 parent f6049d3
commit 9f26611
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/validators/src/url/utils.ts b/packages/validators/src/url/utils.ts
@@ -5,16 +5,19 @@ const DYNAMIC_ROUTE_SEGMENT_REGEX = /\[\[?([^\]]+)\]?\]/g
 
 export const resolveRelativeUrl = (url: string, baseOrigin?: URL): URL => {
   if (!baseOrigin) {
-    if (!URL.canParse(url)) {
+    try {
+      return new URL(url)
+    } catch (error) {
       throw new UrlValidationError(`Invalid URL: ${url}`)
     }
-    return new URL(url)
   }
 
-  if (!URL.canParse(url, baseOrigin.href)) {
+  let normalizedUrl
+  try {
+    normalizedUrl = new URL(url, baseOrigin)
+  } catch (error) {
     throw new UrlValidationError(`Invalid URL: ${url}`)
   }
-  const normalizedUrl = new URL(url, baseOrigin)
 
   if (new URL(baseOrigin).origin !== normalizedUrl.origin) {
     throw new UrlValidationError(