2 files changed, 21 insertions, 2 deletions

diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts
index e2bd9aec..436d575d 100644
--- a/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts
+++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/frontend-workspace.gradle.kts
@@ -5,11 +5,17 @@
  */
 package tools.refinery.gradle
 
+import org.siouan.frontendgradleplugin.domain.ExecutableType
+
 plugins {
         id("tools.refinery.gradle.eclipse")
         id("tools.refinery.gradle.internal.frontend-conventions")
 }
 
+frontend {
+        nodeDistributionProvided = true
+}
+
 tasks {
         installNode {
                 dependsOn(rootProject.tasks.named("installNode"))
@@ -18,6 +24,8 @@ tasks {
 
         resolvePackageManager {
                 dependsOn(rootProject.tasks.named("resolvePackageManager"))
+                // We can't enable this task, because the package manager is declared in the worktree `package.json` instead of
+                // the `package.json` in this workspace (subproject).
                 enabled = false
         }
 
@@ -36,4 +44,13 @@ tasks {
                 dependsOn(rootInstallFrontend)
                 enabled = false
         }
+
+        assembleFrontend {
+                // Workaround to enable this task even if we have disabled `installPackageManager`. See
+                // https://github.com/siouan/frontend-gradle-plugin/blob/2add49d3a74c927abc813d98787be116d0074afe/plugin/src/main/java/org/siouan/frontendgradleplugin/FrontendGradlePlugin.java#L514-L516
+                setOnlyIf { frontend.assembleScript.isPresent }
+                // Workaround for disabled `resolvePackageManager`. See
+                // https://github.com/siouan/frontend-gradle-plugin/blob/2add49d3a74c927abc813d98787be116d0074afe/plugin/src/main/java/org/siouan/frontendgradleplugin/FrontendGradlePlugin.java#L513
+                executableType.set(ExecutableType.YARN)
+        }
 }
diff --git a/subprojects/docs/build.gradle.kts b/subprojects/docs/build.gradle.kts
index b49d9797..0c80e23a 100644
--- a/subprojects/docs/build.gradle.kts
+++ b/subprojects/docs/build.gradle.kts
@@ -48,7 +48,9 @@ val srcDir = "src"
 
 val docusaurusOutputDir = layout.buildDirectory.dir("docusaurus")
 
-val javadocsDir = layout.buildDirectory.dir("javadocs/api/javadoc")
+val javadocsDir = layout.buildDirectory.dir("javadocs")
+
+val javadocsDocsDir = javadocsDir.map { root -> root.dir("api/javadoc") }
 
 val configFiles: FileCollection = files(
         rootProject.file("yarn.lock"),
@@ -76,7 +78,7 @@ tasks {
                         javadocs.resolvedConfiguration.resolvedArtifacts.forEach { artifact ->
                                 copy {
                                         from(zipTree(artifact.file))
-                                        into(javadocsDir.map { root -> root.dir(artifact.moduleVersion.id.name) })
+                                        into(javadocsDocsDir.map { root -> root.dir(artifact.moduleVersion.id.name) })
                                 }
                         }
                 }