Merge pull request #9595 from mcanouil/fix/issue9524

Author: cderv

news/changelog-1.5.md

@@ -63,6 +63,7 @@ All changes included in 1.5:
 - ([#8977](https://github.com/quarto-dev/quarto-cli/issues/8977)): Don't decorate about links within external link icons.
 - ([#8986](https://github.com/quarto-dev/quarto-cli/issues/8986)): Search: only build subfuse index when it's safe to do so.
 - ([#9356](https://github.com/quarto-dev/quarto-cli/issues/9356)): Don't process column classes for figures inside the About divs.
+- ([#9524](https://github.com/quarto-dev/quarto-cli/issues/9524)): Fix canonical URL generation for website pages.
 - ([#9781](https://github.com/quarto-dev/quarto-cli/issues/9781)): Correctly hide elements from click event in collapsed margin sidebar.
 - Sidebar navigation item now correctly supports `rel` attribute.
 - `target` attribute for sidebar navigation items is now correctly inserted with HTML escapes.

src/quarto-core/attribution/document.ts

@@ -447,14 +447,18 @@ export function synthesizeCitationUrl(
   offset?: string,
 ) {
   const siteMeta = metadata[kWebsite] as Metadata | undefined;
-  const baseUrl = siteMeta?.[kSiteUrl] as string;
+  let baseUrl = siteMeta?.[kSiteUrl] as string;
 
   if (baseUrl && outputFile && offset) {
+    baseUrl = baseUrl.replace(/\/$/, "");
     const rootDir = normalizePath(join(dirname(input), offset));
     if (outputFile === "index.html") {
-      return `${baseUrl}/${
-        pathWithForwardSlashes(relative(rootDir, dirname(input)))
-      }`;
+      const part = pathWithForwardSlashes(relative(rootDir, dirname(input)));
+      if (part.length === 0) {
+        return `${baseUrl}/`;
+      } else {
+        return `${baseUrl}/${part}/`;
+      }
     } else {
       const relativePath = relative(
         rootDir,

tests/docs/smoke-all/2024/05/06/9524/.gitignore

@@ -0,0 +1 @@
+/.quarto/

tests/docs/smoke-all/2024/05/06/9524/_quarto.yml

@@ -0,0 +1,17 @@
+project:
+  type: website
+
+website:
+  site-url: https://index.html.com/
+  title: "Quarto 9524"
+  navbar:
+    left:
+      - href: index.qmd
+        text: Home
+      - about/index.qmd
+      - about/test/something.qmd
+      - root-page.index.qmd
+
+format:
+  html:
+    canonical-url: true

tests/docs/smoke-all/2024/05/06/9524/about/file.qmd

@@ -0,0 +1,11 @@
+---
+title: "Untitled"
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['link[rel="canonical"][href="https://index.html.com/about/file.html"]']
+        - []
+---
+
+A non `index` file at the root of a subdirectory.

tests/docs/smoke-all/2024/05/06/9524/about/index.qmd

@@ -0,0 +1,11 @@
+---
+title: "About"
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['link[rel="canonical"][href="https://index.html.com/about/"]']
+        - []
+---
+
+About this site

tests/docs/smoke-all/2024/05/06/9524/about/test/something.qmd

@@ -0,0 +1,11 @@
+---
+title: "Untitled"
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['link[rel="canonical"][href="https://index.html.com/about/test/something.html"]']
+        - []
+---
+
+Another file inside a nested directory.

tests/docs/smoke-all/2024/05/06/9524/index.qmd

@@ -0,0 +1,13 @@
+---
+title: "Quarto 9524"
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['link[rel="canonical"][href="https://index.html.com/"]']
+        - []
+---
+
+This is a Quarto website.
+
+To learn more about Quarto websites visit <https://quarto.org/docs/websites>.

tests/docs/smoke-all/2024/05/06/9524/root-page.index.qmd

@@ -0,0 +1,11 @@
+---
+title: root page
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['link[rel="canonical"][href="https://index.html.com/root-page.index.html"]']
+        - []
+---
+
+Root page with "index." pattern.