From d182da209186df7dcd1ead77773cb4047f75ffe2 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 9 Apr 2024 21:42:43 +0200 Subject: fix(build): assembleFrontend task enableIf --- .../tools/refinery/gradle/frontend-workspace.gradle.kts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'buildSrc/src') 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) + } } -- cgit v1.2.3-54-g00ecf