diff --git a/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala b/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala index fa663d5af5f9..85624e8b15d7 100644 --- a/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala +++ b/scaladoc/src/dotty/tools/scaladoc/Inkuire.scala @@ -15,7 +15,10 @@ object Inkuire { } def generateInkuireConfig(externalMappings: Seq[String]): String = { - val paths = ("../inkuire-db.json" +: externalMappings.map(_ + "../inkuire-db.json")).map(jsonString) + val paths = + List("../inkuire-db.json").map(jsonString) + // TODO: #13243 + // ++ externalMappings.map(_ + "../inkuire-db.json")).map(jsonString) jsonObject(("inkuirePaths", jsonList(paths))).toString } diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index bd468273d6c7..f0aacccff7a4 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -154,7 +154,7 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx val siteResourcesPaths = allPages.toSet.flatMap(specificResources) ++ staticResources - val resources = siteResourcesPaths.toSeq.map(pathToResource) ++ allResources(allPages) + val resources = siteResourcesPaths.toSeq.map(pathToResource) ++ allResources(allPages) ++ onlyRenderedResources resources.flatMap(renderResource) def render(): Unit = diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala index 4829832fc811..6425dac347b5 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala @@ -52,6 +52,16 @@ trait Resources(using ctx: DocContext) extends Locations, Writer: case "js" => script(`type` := "text/javascript", src := resolveLink(dri, res), if (deferJs) Seq(defer := "true") else Nil) case _ => raw("") + val onlyRenderedResources: Seq[Resource] = + List( + ("https://github.com/VirtusLab/Inkuire/releases/download/1.0.0-M2/inkuire.js", "scripts/inkuire.js"), + ).map { case (url, path) => + Resource.URLToCopy(url, path) + } ++ + List( + "scripts/inkuire-worker.js" + ).map(dottyRes) + val earlyMemberResources: Seq[Resource] = List( "scripts/theme.js" @@ -78,8 +88,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer: "scripts/components/Input.js", "scripts/components/FilterGroup.js", "scripts/components/Filter.js", - "scripts/searchbar.js", - "scripts/inkuire-worker.js" + "scripts/searchbar.js" ).map(dottyRes) val urls = List( @@ -90,13 +99,8 @@ trait Resources(using ctx: DocContext) extends Locations, Writer: "https://cdnjs.cloudflare.com/ajax/libs/dagre-d3/0.6.1/dagre-d3.min.js", ).map(Resource.URL.apply) - val urlToPathMappings = List( - ("https://github.com/VirtusLab/Inkuire/releases/download/1.0.0-M2/inkuire.js", "scripts/inkuire.js"), - ).map { case (url, path) => - Resource.URLToCopy(url, path) - } - fromResources ++ urls ++ urlToPathMappings ++ projectLogo ++ Seq(scaladocVersionFile, dynamicJsData) + fromResources ++ urls ++ projectLogo ++ Seq(scaladocVersionFile, dynamicJsData) val searchDataPath = "scripts/searchData.js" val memberResourcesPaths = Seq(searchDataPath) ++ memberResources.map(_.path)