be a bit more careful with to() path resolving

2 files changed, 13 insertions, 6 deletions

diff --git a/src/upd8.js b/src/upd8.js
index daef1458..12e301ca 100755
--- a/src/upd8.js
+++ b/src/upd8.js
@@ -1792,7 +1792,7 @@ writePage.html = (pageFn, {
     footer.content ??= (wikiInfo.footer ? transformMultiline(wikiInfo.footer) : '');
 
     const canonical = (wikiInfo.canonicalBase
-        ? wikiInfo.canonicalBase + paths.pathname
+        ? wikiInfo.canonicalBase + (paths.pathname === '/' ? '' : paths.pathanme)
         : '');
 
     const collapseSidebars = (sidebarLeft.collapse !== false) && (sidebarRight.collapse !== false);
diff --git a/src/util/urls.js b/src/util/urls.js
index a30cc81b..e15c018b 100644
--- a/src/util/urls.js
+++ b/src/util/urls.js
@@ -34,25 +34,32 @@ export function generateURLs(urlSpec) {
         };
     };
 
+    // This should be called on values which are going to be passed to
+    // path.relative, because relative will resolve a leading slash as the root
+    // directory of the working device, which we aren't looking for here.
+    const trimLeadingSlash = P => P.startsWith('/') ? P.slice(1) : P;
+
     const generateTo = (fromPath, fromGroup) => {
+        const A = trimLeadingSlash(fromPath);
+
         const rebasePrefix = '../'.repeat((fromGroup.prefix || '').split('/').filter(Boolean).length);
 
         const pathHelper = (toPath, toGroup) => {
-            let target = (toPath === '/' ? '' : toPath);
+            let B = trimLeadingSlash(toPath);
 
             let argIndex = 0;
-            target = target.replaceAll('<>', () => `<${argIndex++}>`);
+            B = B.replaceAll('<>', () => `<${argIndex++}>`);
 
             if (toGroup.prefix !== fromGroup.prefix) {
                 // TODO: Handle differing domains in prefixes.
-                target = rebasePrefix + (toGroup.prefix || '') + target;
+                B = rebasePrefix + (toGroup.prefix || '') + B;
             }
 
             const suffix = (toPath.endsWith('/') ? '/' : '');
 
             return {
-                posix: path.posix.relative(fromPath, target) + suffix,
-                device: path.relative(fromPath, target) + suffix
+                posix: path.posix.relative(A, B) + suffix,
+                device: path.relative(A, B) + suffix
             };
         };