Merge branch 'main' into refactor/commands

Author: Mpdreamz

docs/syntax/links.md

@@ -89,7 +89,8 @@ The syntax follows the format `<scheme>://<path>`, where:
 - `path`: The file path within that repository
 
 :::{important}
-The `path` in cross-repo links must be relative to the `docset.yml` file and not the full path within the repo
+- The `path` in cross-repo links must be relative to the `docset.yml` file and not the full path within the repo.
+- The link text is mandatory; if you omit it, the link will fail to be displayed. 
 :::
 
 Never use a full URL for links across documentation repositories.

src/Elastic.ApiExplorer/OpenApiGenerator.cs

@@ -288,7 +288,7 @@ private async Task<IFileInfo> Render<T>(INavigationItem current, T page, ApiRend
 		if (!outputFile.Directory!.Exists)
 			outputFile.Directory.Create();
 
-		var navigationRenderResult = await navigationRenderer.RenderNavigation(current.NavigationRoot, new Uri("http://ignored.example"), INavigationHtmlWriter.AllLevels, ctx);
+		var navigationRenderResult = await navigationRenderer.RenderNavigation(current.NavigationRoot, INavigationHtmlWriter.AllLevels, ctx);
 		renderContext = renderContext with
 		{
 			CurrentNavigation = current,

src/Elastic.Documentation.Site/Navigation/INavigationHtmlWriter.cs

@@ -10,8 +10,7 @@ public interface INavigationHtmlWriter
 {
 	const int AllLevels = -1;
 
-	Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, Uri navigationSource,
-		int maxLevel, Cancel ctx = default);
+	Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default);
 
 	async Task<string> Render(NavigationViewModel model, Cancel ctx)
 	{

src/Elastic.Documentation.Site/Navigation/IsolatedBuildNavigationHtmlWriter.cs

@@ -13,8 +13,9 @@ public class IsolatedBuildNavigationHtmlWriter(BuildContext context, IRootNaviga
 {
 	private readonly ConcurrentDictionary<(string, int), string> _renderedNavigationCache = [];
 
-	public async Task<NavigationRenderResult> RenderNavigation(IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation,
-		Uri navigationSource, int maxLevel, Cancel ctx = default)
+	public async Task<NavigationRenderResult> RenderNavigation(
+		IRootNavigationItem<INavigationModel, INavigationItem> currentRootNavigation, int maxLevel, Cancel ctx = default
+	)
 	{
 		var navigation = context.Configuration.Features.PrimaryNavEnabled || currentRootNavigation.IsUsingNavigationDropdown
 			? currentRootNavigation

src/Elastic.Documentation.Site/package-lock.json

@@ -32,8 +32,8 @@
   "private": true,
   "devDependencies": {
     "@elastic/datemath": "5.0.3",
-    "@elastic/eui": "104.1.0",
-    "@elastic/eui-theme-borealis": "3.1.0",
+    "@elastic/eui": "105.0.0",
+    "@elastic/eui-theme-borealis": "3.2.0",
     "@emotion/css": "11.13.5",
     "@emotion/react": "11.14.0",
     "@eslint/js": "9.30.1",
@@ -48,7 +48,7 @@
     "postcss": "8.5.6",
     "postcss-import": "16.1.1",
     "prettier": "3.6.2",
-    "prettier-plugin-tailwindcss": "0.6.13",
+    "prettier-plugin-tailwindcss": "0.6.14",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "typescript-eslint": "8.35.1"

src/Elastic.Documentation.Site/package.json

@@ -56,8 +56,8 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 		var html = MarkdownFile.CreateHtml(document);
 		await DocumentationSet.Tree.Resolve(ctx);
 
-		var fullNavigationRenderResult = await NavigationHtmlWriter.RenderNavigation(markdown.NavigationRoot, markdown.NavigationSource, INavigationHtmlWriter.AllLevels, ctx);
-		var miniNavigationRenderResult = await NavigationHtmlWriter.RenderNavigation(markdown.NavigationRoot, markdown.NavigationSource, 1, ctx);
+		var fullNavigationRenderResult = await NavigationHtmlWriter.RenderNavigation(markdown.NavigationRoot, INavigationHtmlWriter.AllLevels, ctx);
+		var miniNavigationRenderResult = await NavigationHtmlWriter.RenderNavigation(markdown.NavigationRoot, 1, ctx);
 
 		var navigationHtmlRenderResult = DocumentationSet.Context.Configuration.Features.LazyLoadNavigation
 			? miniNavigationRenderResult
@@ -135,7 +135,7 @@ private async Task<RenderResult> RenderLayout(MarkdownFile markdown, MarkdownDoc
 			UrlPathPrefix = markdown.UrlPathPrefix,
 			AppliesTo = markdown.YamlFrontMatter?.AppliesTo,
 			GithubEditUrl = editUrl,
-			AllowIndexing = DocumentationSet.Context.AllowIndexing && (markdown is DetectionRuleFile || !current.Hidden),
+			AllowIndexing = DocumentationSet.Context.AllowIndexing && (markdown.CrossLink.Equals("docs-content://index.md", StringComparison.OrdinalIgnoreCase) || markdown is DetectionRuleFile || !current.Hidden),
 			CanonicalBaseUrl = DocumentationSet.Context.CanonicalBaseUrl,
 			GoogleTagManager = DocumentationSet.Context.GoogleTagManager,
 			Features = DocumentationSet.Configuration.Features,

src/Elastic.Markdown/HtmlWriter.cs

@@ -57,7 +57,6 @@ DocumentationSet set
 		ScopeDirectory = build.Configuration.ScopeDirectory;
 
 		NavigationRoot = set.Tree;
-		NavigationSource = set.Source;
 	}
 
 	public bool PartOfNavigation { get; set; }
@@ -66,8 +65,6 @@ DocumentationSet set
 
 	public IRootNavigationItem<INavigationModel, INavigationItem> NavigationRoot { get; set; }
 
-	public Uri NavigationSource { get; set; }
-
 	private IDiagnosticsCollector Collector { get; }
 
 	public string? UrlPathPrefix { get; }

src/Elastic.Markdown/IO/MarkdownFile.cs

@@ -11,7 +11,7 @@
 
 namespace Elastic.Markdown.IO.Navigation;
 
-[DebuggerDisplay("Group >{Depth} {FolderName} ({NavigationItems.Count} items)")]
+[DebuggerDisplay("Toc: {Depth} {NavigationSource} > ({NavigationItems.Count} items)")]
 public class DocumentationGroup : INodeNavigationItem<MarkdownFile, INavigationItem>
 {
 	private readonly TableOfContentsTreeCollector _treeCollector;
@@ -138,7 +138,6 @@ void AddToNavigationItems(INavigationItem item, ref int fileIndex)
 				// TODO these have to be refactor to be pure navigational properties
 				md.ScopeDirectory = file.TableOfContentsScope.ScopeDirectory;
 				md.NavigationRoot = rootNavigationItem;
-				md.NavigationSource = NavigationSource;
 
 				foreach (var extension in lookups.EnabledExtensions)
 					extension.Visit(d, tocItem);

src/Elastic.Markdown/IO/Navigation/DocumentationGroup.cs

@@ -8,7 +8,7 @@
 
 namespace Elastic.Markdown.IO.Navigation;
 
-[DebuggerDisplay("Toc >{Depth} {FolderName} ({NavigationItems.Count} items)")]
+[DebuggerDisplay("Toc: {Depth} {NavigationSource} > ({NavigationItems.Count} items)")]
 public class TableOfContentsTree : DocumentationGroup, IRootNavigationItem<MarkdownFile, INavigationItem>
 {
 	public Uri Source { get; }