@salesforcedevs/dx-components 1.40.5-final-alpha → 1.40.5-final-alpha1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforcedevs/dx-components",
-  "version": "1.40.5-final-alpha",
+  "version": "1.40.5-final-alpha1",
   "description": "DX Lightning web components",
   "license": "MIT",
   "engines": {

package/src/modules/dxUtils/topicVersion/topicVersion.ts

@@ -294,13 +294,13 @@ export function toCanonicalHref(
     }
 
     for (const version of versions) {
-        if (version.id === versions[0].id) {
-            continue;
-        }
-        const delta = getVersionPathDelta(
-            latestPath,
-            normalizePath(version.link?.href)
-        );
+        // The latest is also served under `/<latestId>/`, so that form is
+        // stripped too.
+        const versionedPath =
+            version.id === versions[0].id
+                ? insertVersionBeforeSlug(latestPath, version.id)
+                : normalizePath(version.link?.href);
+        const delta = getVersionPathDelta(latestPath, versionedPath);
         const stripped = delta && stripVersionPathDelta(hrefPath, delta);
         if (stripped) {
             return stripped;
@@ -315,10 +315,19 @@ function hrefMatchesVersion(
     version: TopicVersionOption,
     versions: TopicVersionOption[]
 ): boolean {
-    return hrefMatchesCurrentPage(applyVersionToHref(href, version, versions));
+    if (hrefMatchesCurrentPage(applyVersionToHref(href, version, versions))) {
+        return true;
+    }
+    // The server serves the latest under its canonical URL and also under
+    // `/<latestId>/`, so the versioned form must select the latest too.
+    return (
+        !!href &&
+        version.id === versions[0]?.id &&
+        hrefMatchesCurrentPage(insertVersionBeforeSlug(href, version.id))
+    );
 }
 
-function collectSubtreeCanonicalHrefs(
+export function collectSubtreeCanonicalHrefs(
     node: VersionedNode,
     includeSelf = true
 ): string[] {