diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-04-13 16:00:51 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-04-21 16:22:09 +0200 |
| commit | 72568a66a6b499ca31e29bd0df51b0ab642f6368 (patch) | |
| tree | 2dd786598037686650aaae0be277be1b7101a83b /opendc-web/opendc-web-ui/build.gradle.kts | |
| parent | 0ec8a308eb5004814f61d69f11d81efb52d4eb27 (diff) | |
build(web/ui): Migrate from Yarn to NPM
This change updates the Node package manager used by the OpenDC web UI
build from Yarn to NPM, which is included by default in the Node
distributions that are used by node-gradle.
Diffstat (limited to 'opendc-web/opendc-web-ui/build.gradle.kts')
| -rw-r--r-- | opendc-web/opendc-web-ui/build.gradle.kts | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts index 9e0d4ff0..469de2fa 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") |
