Skip to content

Commit e3a8be9

Browse files
author
Oleksandr Dzhychko
committed
build(vue-model-api): fix gradle caching
* The project version was not set as input. Leading to wrong cache usage. *The NPM build could possibly override the package.json in the dist folder.
1 parent b322e9a commit e3a8be9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

vue-model-api/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,16 @@ tasks.named("npm_run_lint") {
4747
outputs.cacheIf { true }
4848
}
4949

50+
val packageJsonForProd = layout.buildDirectory.file("package-for-publishing.json").get().asFile
5051
val createPackageJsonForPublishing = tasks.create("createPackageJsonForPublishing") {
5152
dependsOn(updateModelClient)
52-
val packageJsonForProd = projectDir.resolve("dist/package.json")
53+
5354
val packageJsonForDev = projectDir.resolve("package.json")
5455
inputs.file(packageJsonForDev)
56+
inputs.property("project.version", project.version)
5557
outputs.cacheIf { true }
5658
outputs.file(packageJsonForProd)
59+
5760
doLast {
5861
// We cannot use the mechanisms from the [lugin npm-publish `dev.petuska.npm.publish`,
5962
// because cannot remove fields from the template package.json and does not override dependency versions.
@@ -86,6 +89,7 @@ val createPackageJsonForPublishing = tasks.create("createPackageJsonForPublishin
8689
packageJsonDataIterator.remove()
8790
}
8891
}
92+
packageJsonForProd.parentFile.mkdirs()
8993
packageJsonForProd.writeText(JsonOutput.prettyPrint(JsonOutput.toJson(packageJsonData)))
9094
}
9195
}
@@ -115,7 +119,7 @@ npmPublish {
115119
}
116120
packages {
117121
create("js") {
118-
packageJsonTemplateFile.set(projectDir.resolve("dist/package.json"))
122+
packageJsonTemplateFile.set(packageJsonForProd)
119123
files {
120124
setFrom("dist")
121125
}

0 commit comments

Comments
 (0)