@docusaurus/utils 3.8.1-canary-6386 → 3.8.1-canary-6389

package/lib/markdownLinks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdownLinks.d.ts","sourceRoot":"","sources":["../src/markdownLinks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,4EAA4E;AAC5E,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,YAAY,IAAI;IACvD,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,YAAY,EAAE,CAAC,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,GAAG,CACjC,MAAM,EAAE,gDAAgD;AACxD,MAAM,CACP,CAAC;AAKF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,MAAM,GAAG,IAAI,CAoBf"}
+{"version":3,"file":"markdownLinks.d.ts","sourceRoot":"","sources":["../src/markdownLinks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;OAKG;IACH,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,4EAA4E;AAC5E,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,YAAY,IAAI;IACvD,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,YAAY,EAAE,CAAC,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,GAAG,CACjC,MAAM,EAAE,gDAAgD;AACxD,MAAM,CACP,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE;IACP,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,MAAM,GAAG,IAAI,CA6Cf"}

package/lib/markdownLinks.js

@@ -11,24 +11,41 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const dataFileUtils_1 = require("./dataFileUtils");
 const pathUtils_1 = require("./pathUtils");
-// Note this is historical logic extracted during a 2024 refactor
-// The algo has been kept exactly as before for retro compatibility
-// See also https://github.com/facebook/docusaurus/pull/10168
 function resolveMarkdownLinkPathname(linkPathname, context) {
     const { sourceFilePath, sourceToPermalink, contentPaths, siteDir } = context;
-    const sourceDirsToTry = [];
-    // ./file.md and ../file.md are always relative to the current file
-    if (!linkPathname.startsWith('./') && !linkPathname.startsWith('../')) {
-        sourceDirsToTry.push(...(0, dataFileUtils_1.getContentPathList)(contentPaths), siteDir);
+    // If the link is already @site aliased, there's no need to resolve it
+    if (linkPathname.startsWith('@site/')) {
+        return sourceToPermalink.get(decodeURIComponent(linkPathname)) ?? null;
     }
-    // /file.md is never relative to the source file path
-    if (!linkPathname.startsWith('/')) {
-        sourceDirsToTry.push(path_1.default.dirname(sourceFilePath));
+    // Get the dirs to "look into", ordered by priority, when resolving the link
+    function getSourceDirsToTry() {
+        // /file.md is always resolved from
+        // - the plugin content paths,
+        // - then siteDir
+        if (linkPathname.startsWith('/')) {
+            return [...(0, dataFileUtils_1.getContentPathList)(contentPaths), siteDir];
+        }
+        // ./file.md and ../file.md are always resolved from
+        // - the current file dir
+        else if (linkPathname.startsWith('./') || linkPathname.startsWith('../')) {
+            return [path_1.default.dirname(sourceFilePath)];
+        }
+        // file.md is resolved from
+        // - the current file dir,
+        // - then from the plugin content paths,
+        // - then siteDir
+        else {
+            return [
+                path_1.default.dirname(sourceFilePath),
+                ...(0, dataFileUtils_1.getContentPathList)(contentPaths),
+                siteDir,
+            ];
+        }
     }
-    const aliasedSourceMatch = sourceDirsToTry
+    const sourcesToTry = getSourceDirsToTry()
         .map((sourceDir) => path_1.default.join(sourceDir, decodeURIComponent(linkPathname)))
-        .map((source) => (0, pathUtils_1.aliasedSitePath)(source, siteDir))
-        .find((source) => sourceToPermalink.has(source));
+        .map((source) => (0, pathUtils_1.aliasedSitePath)(source, siteDir));
+    const aliasedSourceMatch = sourcesToTry.find((source) => sourceToPermalink.has(source));
     return aliasedSourceMatch
         ? sourceToPermalink.get(aliasedSourceMatch) ?? null
         : null;

package/lib/markdownLinks.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdownLinks.js","sourceRoot":"","sources":["../src/markdownLinks.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA+CH,kEA4BC;;AAzED,wDAAwB;AACxB,mDAAmD;AACnD,2CAA4C;AAwC5C,iEAAiE;AACjE,mEAAmE;AACnE,6DAA6D;AAC7D,SAAgB,2BAA2B,CACzC,YAAoB,EACpB,OAKC;IAED,MAAM,EAAC,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,OAAO,EAAC,GAAG,OAAO,CAAC;IAC3E,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,mEAAmE;IACnE,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QACtE,eAAe,CAAC,IAAI,CAAC,GAAG,IAAA,kCAAkB,EAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IACD,qDAAqD;IACrD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAClC,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,kBAAkB,GAAG,eAAe;SACvC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;SAC1E,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,2BAAe,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACjD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnD,OAAO,kBAAkB;QACvB,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI;QACnD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}
+{"version":3,"file":"markdownLinks.js","sourceRoot":"","sources":["../src/markdownLinks.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA4CH,kEAqDC;;AA/FD,wDAAwB;AACxB,mDAAmD;AACnD,2CAA4C;AAwC5C,SAAgB,2BAA2B,CACzC,YAAoB,EACpB,OAKC;IAED,MAAM,EAAC,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,OAAO,EAAC,GAAG,OAAO,CAAC;IAE3E,sEAAsE;IACtE,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,OAAO,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,IAAI,IAAI,CAAC;IACzE,CAAC;IAED,4EAA4E;IAC5E,SAAS,kBAAkB;QACzB,mCAAmC;QACnC,8BAA8B;QAC9B,iBAAiB;QACjB,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,IAAA,kCAAkB,EAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC;QACD,oDAAoD;QACpD,yBAAyB;aACpB,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACzE,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;QACxC,CAAC;QACD,2BAA2B;QAC3B,0BAA0B;QAC1B,wCAAwC;QACxC,iBAAiB;aACZ,CAAC;YACJ,OAAO;gBACL,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC5B,GAAG,IAAA,kCAAkB,EAAC,YAAY,CAAC;gBACnC,OAAO;aACR,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,kBAAkB,EAAE;SACtC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;SAC1E,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,2BAAe,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAErD,MAAM,kBAAkB,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CACtD,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAC9B,CAAC;IAEF,OAAO,kBAAkB;QACvB,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI;QACnD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils",
-  "version": "3.8.1-canary-6386",
+  "version": "3.8.1-canary-6389",
   "description": "Node utility functions for Docusaurus packages.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "3.8.1-canary-6386",
-    "@docusaurus/types": "3.8.1-canary-6386",
-    "@docusaurus/utils-common": "3.8.1-canary-6386",
+    "@docusaurus/logger": "3.8.1-canary-6389",
+    "@docusaurus/types": "3.8.1-canary-6389",
+    "@docusaurus/utils-common": "3.8.1-canary-6389",
     "escape-string-regexp": "^4.0.0",
     "execa": "5.1.1",
     "file-loader": "^6.2.0",
@@ -51,5 +51,5 @@
     "dedent": "^0.7.0",
     "tmp-promise": "^3.0.3"
   },
-  "gitHead": "588d7e70cceaaaaf7218b0834ee3623e5aa1fe0b"
+  "gitHead": "32281a3eb0375ac19c0afc463b3e701b908b7cd6"
 }

package/src/markdownLinks.ts

@@ -47,9 +47,6 @@ export type SourceToPermalink = Map<
   string // Permalink: "/docs/content"
 >;
 
-// Note this is historical logic extracted during a 2024 refactor
-// The algo has been kept exactly as before for retro compatibility
-// See also https://github.com/facebook/docusaurus/pull/10168
 export function resolveMarkdownLinkPathname(
   linkPathname: string,
   context: {
@@ -60,20 +57,45 @@ export function resolveMarkdownLinkPathname(
   },
 ): string | null {
   const {sourceFilePath, sourceToPermalink, contentPaths, siteDir} = context;
-  const sourceDirsToTry: string[] = [];
-  // ./file.md and ../file.md are always relative to the current file
-  if (!linkPathname.startsWith('./') && !linkPathname.startsWith('../')) {
-    sourceDirsToTry.push(...getContentPathList(contentPaths), siteDir);
+
+  // If the link is already @site aliased, there's no need to resolve it
+  if (linkPathname.startsWith('@site/')) {
+    return sourceToPermalink.get(decodeURIComponent(linkPathname)) ?? null;
   }
-  // /file.md is never relative to the source file path
-  if (!linkPathname.startsWith('/')) {
-    sourceDirsToTry.push(path.dirname(sourceFilePath));
+
+  // Get the dirs to "look into", ordered by priority, when resolving the link
+  function getSourceDirsToTry() {
+    // /file.md is always resolved from
+    // - the plugin content paths,
+    // - then siteDir
+    if (linkPathname.startsWith('/')) {
+      return [...getContentPathList(contentPaths), siteDir];
+    }
+    // ./file.md and ../file.md are always resolved from
+    // - the current file dir
+    else if (linkPathname.startsWith('./') || linkPathname.startsWith('../')) {
+      return [path.dirname(sourceFilePath)];
+    }
+    // file.md is resolved from
+    // - the current file dir,
+    // - then from the plugin content paths,
+    // - then siteDir
+    else {
+      return [
+        path.dirname(sourceFilePath),
+        ...getContentPathList(contentPaths),
+        siteDir,
+      ];
+    }
   }
 
-  const aliasedSourceMatch = sourceDirsToTry
+  const sourcesToTry = getSourceDirsToTry()
     .map((sourceDir) => path.join(sourceDir, decodeURIComponent(linkPathname)))
-    .map((source) => aliasedSitePath(source, siteDir))
-    .find((source) => sourceToPermalink.has(source));
+    .map((source) => aliasedSitePath(source, siteDir));
+
+  const aliasedSourceMatch = sourcesToTry.find((source) =>
+    sourceToPermalink.has(source),
+  );
 
   return aliasedSourceMatch
     ? sourceToPermalink.get(aliasedSourceMatch) ?? null