@docusaurus/plugin-content-docs 0.0.0-6004 → 0.0.0-6006

package/lib/client/docsClientUtils.js

@@ -30,14 +30,22 @@ export function getActivePlugin(allPluginData, pathname, options = {}) {
 }
 export const getLatestVersion = (data) => data.versions.find((version) => version.isLast);
 export function getActiveVersion(data, pathname) {
-    const lastVersion = getLatestVersion(data);
-    // Last version is a route like /docs/*,
-    // we need to match it last or it would match /docs/version-1.0/* as well
-    const orderedVersionsMetadata = [
-        ...data.versions.filter((version) => version !== lastVersion),
-        lastVersion,
-    ];
-    return orderedVersionsMetadata.find((version) => !!matchPath(pathname, {
+    // Sort paths so that a match-all version like /docs/* is matched last
+    // Otherwise /docs/* would match /docs/1.0.0/* routes
+    // This is simplified but similar to the core sortRoutes() logic
+    const sortedVersions = [...data.versions].sort((a, b) => {
+        if (a.path === b.path) {
+            return 0;
+        }
+        if (a.path.includes(b.path)) {
+            return -1;
+        }
+        if (b.path.includes(a.path)) {
+            return 1;
+        }
+        return 0;
+    });
+    return sortedVersions.find((version) => !!matchPath(pathname, {
         path: version.path,
         exact: false,
         strict: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "0.0.0-6004",
+  "version": "0.0.0-6006",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "sideEffects": false,
@@ -35,15 +35,15 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "0.0.0-6004",
-    "@docusaurus/logger": "0.0.0-6004",
-    "@docusaurus/mdx-loader": "0.0.0-6004",
-    "@docusaurus/module-type-aliases": "0.0.0-6004",
-    "@docusaurus/theme-common": "0.0.0-6004",
-    "@docusaurus/types": "0.0.0-6004",
-    "@docusaurus/utils": "0.0.0-6004",
-    "@docusaurus/utils-common": "0.0.0-6004",
-    "@docusaurus/utils-validation": "0.0.0-6004",
+    "@docusaurus/core": "0.0.0-6006",
+    "@docusaurus/logger": "0.0.0-6006",
+    "@docusaurus/mdx-loader": "0.0.0-6006",
+    "@docusaurus/module-type-aliases": "0.0.0-6006",
+    "@docusaurus/theme-common": "0.0.0-6006",
+    "@docusaurus/types": "0.0.0-6006",
+    "@docusaurus/utils": "0.0.0-6006",
+    "@docusaurus/utils-common": "0.0.0-6006",
+    "@docusaurus/utils-validation": "0.0.0-6006",
     "@types/react-router-config": "^5.0.7",
     "combine-promises": "^1.1.0",
     "fs-extra": "^11.1.1",
@@ -67,5 +67,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "70e1069f65cbb7416b20d8e828293b3d537cc3de"
+  "gitHead": "79b82f5d1cade4e9fedc6c08d9a5dc8ec6559e7f"
 }

package/src/client/docsClientUtils.ts

@@ -63,14 +63,23 @@ export function getActiveVersion(
   data: GlobalPluginData,
   pathname: string,
 ): GlobalVersion | undefined {
-  const lastVersion = getLatestVersion(data);
-  // Last version is a route like /docs/*,
-  // we need to match it last or it would match /docs/version-1.0/* as well
-  const orderedVersionsMetadata = [
-    ...data.versions.filter((version) => version !== lastVersion),
-    lastVersion,
-  ];
-  return orderedVersionsMetadata.find(
+  // Sort paths so that a match-all version like /docs/* is matched last
+  // Otherwise /docs/* would match /docs/1.0.0/* routes
+  // This is simplified but similar to the core sortRoutes() logic
+  const sortedVersions = [...data.versions].sort((a, b) => {
+    if (a.path === b.path) {
+      return 0;
+    }
+    if (a.path.includes(b.path)) {
+      return -1;
+    }
+    if (b.path.includes(a.path)) {
+      return 1;
+    }
+    return 0;
+  });
+
+  return sortedVersions.find(
     (version) =>
       !!matchPath(pathname, {
         path: version.path,