Ensure docs-builder builds to .artifacts/assembly/<content-source> and support a flag on serve-static to choose (#1241)

Author: Mpdreamz

src/tooling/docs-assembler/AssembleContext.cs

@@ -74,7 +74,8 @@ public AssembleContext(
 		var contentSource = Environment.ContentSource.ToStringFast(true);
 		var defaultCheckoutDirectory = Path.Combine(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "checkouts", contentSource);
 		CheckoutDirectory = ReadFileSystem.DirectoryInfo.New(checkoutDirectory ?? defaultCheckoutDirectory);
-		OutputDirectory = ReadFileSystem.DirectoryInfo.New(output ?? Path.Combine(".artifacts", "assembly"));
+		var defaultOutputDirectory = Path.Combine(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly", contentSource);
+		OutputDirectory = ReadFileSystem.DirectoryInfo.New(output ?? defaultOutputDirectory);
 
 
 	}

src/tooling/docs-builder/Cli/Commands.cs

@@ -50,13 +50,15 @@ public async Task Serve(string? path = null, int port = 3000, Cancel ctx = defau
 	/// Serve html files directly
 	/// </summary>
 	/// <param name="port">Port to serve the documentation.</param>
+	/// <param name="contentSource">The content source to serve defaults to next</param>
 	/// <param name="ctx"></param>
 	[Command("serve-static")]
 	[ConsoleAppFilter<CheckForUpdatesFilter>]
-	public async Task ServeStatic(int port = 4000, Cancel ctx = default)
+	public async Task ServeStatic(int port = 4000, string? contentSource = null, Cancel ctx = default)
 	{
+		contentSource ??= "next";
 		AssignOutputLogger();
-		var host = new StaticWebHost(port);
+		var host = new StaticWebHost(port, contentSource);
 		await host.RunAsync(ctx);
 		await host.StopAsync(ctx);
 	}

src/tooling/docs-builder/Http/StaticWebHost.cs

@@ -17,11 +17,18 @@ namespace Documentation.Builder.Http;
 
 public class StaticWebHost
 {
+	private readonly string _contentSource;
 	private readonly WebApplication _webApplication;
 
-	public StaticWebHost(int port)
+	public StaticWebHost(int port, string contentSource)
 	{
-		var builder = WebApplication.CreateSlimBuilder();
+		_contentSource = contentSource;
+		var contentRoot = Path.Combine(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly", _contentSource);
+
+		var builder = WebApplication.CreateBuilder(new WebApplicationOptions
+		{
+			ContentRootPath = contentRoot
+		});
 		DocumentationTooling.CreateServiceCollection(builder.Services, LogLevel.Warning);
 
 		_ = builder.Logging
@@ -49,14 +56,14 @@ private void SetUpRoutes()
 		_ = _webApplication.MapGet("{**slug}", ServeDocumentationFile);
 	}
 
-	private static async Task<IResult> ServeDocumentationFile(string slug, Cancel _)
+	private async Task<IResult> ServeDocumentationFile(string slug, Cancel _)
 	{
 		// from the injected top level navigation which expects us to run on elastic.co
 		if (slug.StartsWith("static-res/"))
 			return Results.NotFound();
 
 		await Task.CompletedTask;
-		var path = Path.Combine(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly");
+		var path = Path.Combine(Paths.WorkingDirectoryRoot.FullName, ".artifacts", "assembly", _contentSource);
 		var localPath = Path.Combine(path, slug.Replace('/', Path.DirectorySeparatorChar));
 		var fileInfo = new FileInfo(localPath);
 		var directoryInfo = new DirectoryInfo(localPath);