From db4a1b8d3079d07b7db649c6047e0780aa510ecd Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 27 Oct 2022 13:41:26 +0200
Subject: build(web/ui): Update to Node 18

This change updates the build process to use Node 18 for building the
web application.
---
 opendc-web/opendc-web-ui/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'opendc-web/opendc-web-ui/build.gradle.kts')

diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts
index 5e999359..af9a9797 100644
--- a/opendc-web/opendc-web-ui/build.gradle.kts
+++ b/opendc-web/opendc-web-ui/build.gradle.kts
@@ -40,6 +40,7 @@ sourceSets {
 
 node {
     download.set(true)
+    version.set(libs.versions.node.get())
 }
 
 val formatTask = tasks.register<NpmTask>("format") {
-- 
cgit v1.2.3


From f39fc00fc9ab65a9f449e840c3782a0b0b7b5a35 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 27 Oct 2022 13:49:37 +0200
Subject: build(web/ui): Ensure consistency of build tasks

This change updates the build script for the web UI to use consistent
names for the build tasks.
---
 opendc-web/opendc-web-ui/build.gradle.kts | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'opendc-web/opendc-web-ui/build.gradle.kts')

diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts
index af9a9797..19f63353 100644
--- a/opendc-web/opendc-web-ui/build.gradle.kts
+++ b/opendc-web/opendc-web-ui/build.gradle.kts
@@ -25,7 +25,7 @@ import com.github.gradle.node.npm.task.NpmTask
 description = "Web interface for OpenDC"
 
 plugins {
-    `java-library-conventions`
+    `java-conventions`
     id("com.github.node-gradle.node")
 }
 
@@ -43,7 +43,10 @@ node {
     version.set(libs.versions.node.get())
 }
 
-val formatTask = tasks.register<NpmTask>("format") {
+val formatTask = tasks.register<NpmTask>("prettierFormat") {
+    group = "formatting"
+    description = "Use Prettier to format the JavaScript codebase"
+
     args.set(listOf("run", "format"))
     dependsOn(tasks.npmInstall)
     inputs.dir("src")
@@ -51,7 +54,10 @@ val formatTask = tasks.register<NpmTask>("format") {
     outputs.upToDateWhen { true }
 }
 
-val lintTask = tasks.register<NpmTask>("lint") {
+val lintTask = tasks.register<NpmTask>("nextLint") {
+    group = "verification"
+    description = "Use ESLint to check for problems"
+
     args.set(listOf("run", "lint"))
     dependsOn(tasks.npmInstall)
     inputs.dir("src")
@@ -59,7 +65,10 @@ val lintTask = tasks.register<NpmTask>("lint") {
     outputs.upToDateWhen { true }
 }
 
-tasks.register<NpmTask>("dev") {
+tasks.register<NpmTask>("nextDev") {
+    group = "build"
+    description = "Run the Next.js project in development mode"
+
     args.set(listOf("run", "dev"))
     dependsOn(tasks.npmInstall)
     inputs.dir(project.fileTree("src"))
@@ -68,7 +77,10 @@ tasks.register<NpmTask>("dev") {
     outputs.upToDateWhen { true }
 }
 
-val buildTask = tasks.register<NpmTask>("buildNext") {
+val buildTask = tasks.register<NpmTask>("nextBuild") {
+    group = "build"
+    description = "Build the Next.js project"
+
     args.set(listOf("run", "build"))
 
     val env = listOf(
@@ -90,7 +102,10 @@ val buildTask = tasks.register<NpmTask>("buildNext") {
     outputs.dir(layout.buildDirectory.dir("next"))
 }
 
-tasks.register<NpmTask>("start") {
+tasks.register<NpmTask>("nextStart") {
+    group = "build"
+    description = "Build the Next.js project"
+
     args.set(listOf("run", "start"))
 
     dependsOn(buildTask)
-- 
cgit v1.2.3


From 5a3d5148a9d52487f102e52bd079006c916075c9 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 27 Oct 2022 16:13:04 +0200
Subject: fix(web/ui): Disable configuration of basePath

This change removes the ability to configure the basePath of the Next.js
application using the Quarkus extension. This functionality was brittle
due to relying on Next.js internals coping with out replacement
strategy.

We should wait for Next.js to implement proper support for
changing the base path at runtime before making this functionality
available again.
---
 opendc-web/opendc-web-ui/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

(limited to 'opendc-web/opendc-web-ui/build.gradle.kts')

diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts
index 19f63353..79160a2e 100644
--- a/opendc-web/opendc-web-ui/build.gradle.kts
+++ b/opendc-web/opendc-web-ui/build.gradle.kts
@@ -84,7 +84,6 @@ val buildTask = tasks.register<NpmTask>("nextBuild") {
     args.set(listOf("run", "build"))
 
     val env = listOf(
-        "NEXT_BASE_PATH",
         "NEXT_PUBLIC_API_BASE_URL",
         "NEXT_PUBLIC_SENTRY_DSN",
         "NEXT_PUBLIC_AUTH0_DOMAIN",
-- 
cgit v1.2.3