diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-04-22 16:03:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 16:03:33 +0200 |
| commit | f2706efb0cb1b3df9f4f5722591dd4b73188cc5c (patch) | |
| tree | 302913ed479cfb05a9581d4b6eed356aec1fd718 /opendc-web/opendc-web-ui/build.gradle.kts | |
| parent | 578394adfb5f1f835b7d8e24f68094968706dfaa (diff) | |
| parent | f5d631b474567c87bcd41f8567ba66fda2a83050 (diff) | |
merge: Update build process (#74)
This pull request brings several updates to the build process as well as new dependency versions. This should resolve several issues that occur during the build process (such as Quarkus or JaCoCo complaining).
## Implementation Notes :hammer_and_pick:
* Remove use of lint-staged
* Migrate from Yarn to NPM
* Update to Kotlin 1.6.21
* Update to Quarkus 2.8.1.Final
* Use JaCoCo 0.8.8
* Test Java 18
## External Dependencies :four_leaf_clover:
* Kotlin, Quarkus, JaCoCo, NPM
## Breaking API Changes :warning:
* N/A
Diffstat (limited to 'opendc-web/opendc-web-ui/build.gradle.kts')
| -rw-r--r-- | opendc-web/opendc-web-ui/build.gradle.kts | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts index 9e0d4ff0..c0e3fcf6 100644 --- a/opendc-web/opendc-web-ui/build.gradle.kts +++ b/opendc-web/opendc-web-ui/build.gradle.kts @@ -20,7 +20,7 @@ * SOFTWARE. */ -import com.github.gradle.node.yarn.task.YarnTask +import com.github.gradle.node.npm.task.NpmTask description = "Web interface for OpenDC" @@ -38,25 +38,33 @@ sourceSets { } } -val lintTask = tasks.register<YarnTask>("lintNext") { - args.set(listOf("lint")) - dependsOn(tasks.yarn) +val formatTask = tasks.register<NpmTask>("format") { + args.set(listOf("run", "format")) + dependsOn(tasks.npmInstall) + inputs.dir("src") + inputs.files("package.json", "next.config.js", ".prettierrc.yaml") + outputs.upToDateWhen { true } +} + +val lintTask = tasks.register<NpmTask>("lint") { + args.set(listOf("run", "lint")) + dependsOn(tasks.npmInstall) inputs.dir("src") inputs.files("package.json", "next.config.js", ".eslintrc") outputs.upToDateWhen { true } } -tasks.register<YarnTask>("dev") { - args.set(listOf("dev")) - dependsOn(tasks.yarn) +tasks.register<NpmTask>("dev") { + args.set(listOf("run", "dev")) + dependsOn(tasks.npmInstall) inputs.dir(project.fileTree("src")) inputs.dir("node_modules") inputs.files("package.json", "next.config.js") outputs.upToDateWhen { true } } -val buildTask = tasks.register<YarnTask>("buildNext") { - args.set(listOf("build")) +val buildTask = tasks.register<NpmTask>("buildNext") { + args.set(listOf("run", "build")) val env = listOf( "NEXT_BASE_PATH", @@ -70,16 +78,19 @@ val buildTask = tasks.register<YarnTask>("buildNext") { environment.put(envvar, "%%${envvar}%%") } - dependsOn(tasks.yarn) + dependsOn(tasks.npmInstall) inputs.dir(project.fileTree("src")) inputs.dir("node_modules") inputs.files("package.json", "next.config.js") outputs.dir(layout.buildDirectory.dir("next")) } -tasks.register<YarnTask>("start") { - args.set(listOf("start")) +tasks.register<NpmTask>("start") { + args.set(listOf("run", "start")) + dependsOn(buildTask) + dependsOn(tasks.npmInstall) + inputs.dir(project.fileTree("src")) inputs.dir("node_modules") inputs.files("package.json", "next.config.js") @@ -107,6 +118,4 @@ tasks.processResources { from(project.fileTree("public")) { into("META-INF/resources/${project.name}/static") } - - mkdir("${project.buildDir}/classes/java/main") } |
