html: linkExternal: use full url, not href, in formatExternalLink

1 files changed, 21 insertions, 25 deletions

diff --git a/src/content/dependencies/linkExternal.js b/src/content/dependencies/linkExternal.js
index b47b1a90..52e43250 100644
--- a/src/content/dependencies/linkExternal.js
+++ b/src/content/dependencies/linkExternal.js
@@ -1,3 +1,4 @@
+import {errors} from '#sugar';
 import {isExternalLinkContext, isExternalLinkStyle} from '#external-links';
 
 export default {
@@ -74,35 +75,17 @@ export default {
   },
 
   generate(data, slots, {html, language, to}) {
-    let urlIsValid;
-    try {
-      new URL(data.url);
-      urlIsValid = true;
-    } catch {
-      urlIsValid = false;
-    }
-
-    let href;
-    if (urlIsValid) {
-      const {canonicalBase, canonicalMediaBase} = data;
-      const past = front => decodeURIComponent(data.url.slice(front.length));
-      if (canonicalMediaBase && data.url.startsWith(canonicalMediaBase)) {
-        href = to('media.path', past(canonicalMediaBase));
-      } else if (canonicalBase && data.url.startsWith(canonicalBase)) {
-        href = to('shared.path', past(canonicalBase));
-      } else {
-        href = data.url;
-      }
-    }
-
-    const urlEntry = {
-      url: href,
-      annotation: data.annotation,
-    };
+    const urlIsValid =
+      !errors(() => new URL(data.url));
 
     let formattedLink;
     let formattedPlatform;
     if (urlIsValid) {
+      const urlEntry = {
+        url: data.url,
+        annotation: data.annotation,
+      };
+
       formattedLink =
         language.formatExternalLink(urlEntry, {
           style: slots.style,
@@ -123,6 +106,19 @@ export default {
       formattedLink = null;
     }
 
+    let href;
+    if (urlIsValid) {
+      const {canonicalBase, canonicalMediaBase} = data;
+      const past = front => decodeURIComponent(data.url.slice(front.length));
+      if (canonicalMediaBase && data.url.startsWith(canonicalMediaBase)) {
+        href = to('media.path', past(canonicalMediaBase));
+      } else if (canonicalBase && data.url.startsWith(canonicalBase)) {
+        href = to('shared.path', past(canonicalBase));
+      } else {
+        href = data.url;
+      }
+    }
+
     const linkAttributes = html.attributes({
       class: 'external-link',
     });