prefix project-resolved logo paths with slash

fixes #11982
this was already done for navbar and sidebar
the commit moves that logic up to Brand itself

this breaks a huge number of tests; pushing to CI to gauge the damage

Author: gordonwoodhull

src/core/brand/brand.ts

@@ -245,13 +245,15 @@ export class Brand {
   resolvePath(entry: BrandLogoResource) {
     const pathPrefix = relative(this.projectDir, this.brandDir);
     if (typeof entry === "string") {
-      return { path: isExternalPath(entry) ? entry : join(pathPrefix, entry) };
+      return {
+        path: isExternalPath(entry) ? entry : "/" + join(pathPrefix, entry),
+      };
     }
     return {
       ...entry,
       path: isExternalPath(entry.path)
         ? entry.path
-        : join(pathPrefix, entry.path),
+        : "/" + join(pathPrefix, entry.path),
     };
   }
 

src/project/types/website/website-navigation.ts

@@ -1015,16 +1015,6 @@ async function sidebarEjsData(project: ProjectContext, sidebar: Sidebar) {
 
   // ensure title and search are present
   sidebar.title = await sidebarTitle(sidebar, project) as string | undefined;
-  if (sidebar.logo) {
-    // sidebar logo has been normalized
-    const sidebarLogo = sidebar.logo as NormalizedLogoLightDarkSpecifier;
-    if (sidebarLogo.light) {
-      sidebarLogo.light.path = resolveLogo(sidebarLogo.light.path)!;
-    }
-    if (sidebarLogo.dark) {
-      sidebarLogo.dark.path = resolveLogo(sidebarLogo.dark.path)!;
-    }
-  }
   const searchOpts = await searchOptions(project);
   sidebar.search = sidebar.search !== undefined
     ? sidebar.search
@@ -1258,16 +1248,6 @@ async function navbarEjsData(
       : ("-" + (navbar[kCollapseBelow] || "lg")) as LayoutBreak,
     pinned: navbar.pinned !== undefined ? !!navbar.pinned : false,
   };
-  if (data.logo) {
-    // navbar logo has been normalized
-    const navbarLogo = data.logo as NormalizedLogoLightDarkSpecifier;
-    if (navbarLogo.light) {
-      navbarLogo.light.path = resolveLogo(navbarLogo.light.path)!;
-    }
-    if (navbarLogo.dark) {
-      navbarLogo.dark.path = resolveLogo(navbarLogo.dark.path)!;
-    }
-  }
   // if there is no navbar title and it hasn't been set to 'false'
   // then use the site title
   if (!data.title && data.title !== false) {
@@ -1515,14 +1495,6 @@ async function sidebarTitle(sidebar: Sidebar, project: ProjectContext) {
   }
 }
 
-function resolveLogo(logo?: string) {
-  if (logo && !isExternalPath(logo) && !logo.startsWith("/")) {
-    return "/" + logo;
-  } else {
-    return logo;
-  }
-}
-
 async function websiteHeadroom(project: ProjectContext) {
   const { navbar, sidebars } = await websiteNavigationConfig(project);
   if (navbar || sidebars?.length) {

tests/docs/smoke-all/brand/logo/choose-logo-resource.qmd

@@ -22,17 +22,17 @@ _quarto:
     dashboard:
       ensureHtmlElements:
         -
-          - 'img[src="posit-logo-2024.svg"][alt="posit logo"]'
+          - 'img[src="/posit-logo-2024.svg"][alt="posit logo"]'
         - []
     revealjs:
       ensureHtmlElements:
         -
-          - 'img[src="posit-logo-2024.svg"][class="slide-logo"]'
+          - 'img[src="/posit-logo-2024.svg"][class="slide-logo"]'
         - []
     typst:
       ensureTypstFileRegexMatches:
         -
-          - 'background: align\(left\+top, box\(inset: 0.75in, image\("posit-logo-2024.svg", width: 1\.5in, alt: "posit logo"\)\)'
+          - 'background: align\(left\+top, box\(inset: 0.75in, image\("/posit-logo-2024.svg", width: 1\.5in, alt: "posit logo"\)\)'
         - []
 ---