Skip to content

Commit 8012e85

Browse files
committed
Fix yarn running on jitpack
1 parent d292c50 commit 8012e85

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

Plan/common/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.gradle.node.yarn.task.YarnInstallTask
2+
import com.github.gradle.node.yarn.task.YarnSetupTask
13
import dev.vankka.dependencydownload.task.GenerateDependencyDownloadResourceTask
24

35
plugins {
@@ -132,6 +134,9 @@ node {
132134
}
133135

134136
tasks.register("bundle", YarnTask) {
137+
// Skip Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
138+
// Jitpack build is used mainly for java dependencies.
139+
onlyIf("not running in Jitpack") { !project.hasProperty("isJitpack") }
135140
dependsOn yarn
136141
inputs.files(fileTree("$rootDir/react/dashboard/src"))
137142
inputs.file("$rootDir/react/dashboard/package.json")
@@ -150,6 +155,17 @@ tasks.register("yarnStart", YarnTask) {
150155
args = ["run", "start"]
151156
}
152157

158+
tasks.withType(YarnSetupTask).configureEach {
159+
// Skip Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
160+
// Jitpack build is used mainly for java dependencies.
161+
onlyIf("not running in Jitpack") { !project.hasProperty("isJitpack") }
162+
}
163+
tasks.withType(YarnInstallTask).configureEach {
164+
// Skip Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
165+
// Jitpack build is used mainly for java dependencies.
166+
onlyIf("not running in Jitpack") { !project.hasProperty("isJitpack") }
167+
}
168+
153169
tasks.register("copyYarnBuildResults") {
154170
// Skip Yarn build on Jitpack since Jitpack doesn't offer gclib version compatible with Node 20
155171
// Jitpack build is used mainly for java dependencies.

Plan/react/dashboard/src/components/cards/query/filter/Filter.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const Filter = ({index, filter, setFilterOptions, removeFilter, setAsInvalid, se
5050
setAsInvalid={setAsInvalid} setAsValid={setAsValid}/>
5151
case "playedOn":
5252
return <SingleDateFilter index={index} filter={filter}
53-
label={'html.query.filter.playedOn.text'}
53+
label={'html.query.filter.hasPlayedOnDate.name'}
5454
setFilterOptions={setFilterOptions} removeFilter={removeFilter}
5555
setAsInvalid={setAsInvalid} setAsValid={setAsValid}/>
5656
case "registeredBetween":

0 commit comments

Comments
 (0)