Skip to content

Commit

Permalink
feat(collaboration-server): remove frontend setting and add webjars a…
Browse files Browse the repository at this point in the history
…nd template engine upgrade versions
  • Loading branch information
DaiYuANg committed Dec 18, 2024
1 parent 60b226f commit 6ab1c6b
Show file tree
Hide file tree
Showing 22 changed files with 71 additions and 2,430 deletions.
15 changes: 10 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ asciidoctor = "4.0.3"
avajeInject = "11.1-RC1"
record-builder = "44"
mutinyVertx = "3.17.1"
schemacrawler = "16.23.2"
schemacrawler = "16.24.1"
polyglot = "24.1.1"
ebean = "15.8.0"
immutables = "2.10.1"
Expand Down Expand Up @@ -96,7 +96,7 @@ gestalt = { group = "com.github.gestalt-config", name = "gestalt-core", version.
gestalt-toml = { group = "com.github.gestalt-config", name = "gestalt-toml", version.ref = "gestalt" }
gestalt-yaml = { group = "com.github.gestalt-config", name = "gestalt-yaml", version.ref = "gestalt" }

guava = { group = "com.google.guava", name = "guava", version = "33.3.1-jre" }
guava = { group = "com.google.guava", name = "guava", version = "33.4.0-jre" }

mysql = { group = "com.mysql", name = "mysql-connector-j", version = "9.1.0" }
postgres = { group = "org.postgresql", name = "postgresql", version = "42.7.4" }
Expand All @@ -113,7 +113,7 @@ jetbrains-annotation = { group = "org.jetbrains", name = "annotations", version
caffine = { group = "com.github.ben-manes.caffeine", name = "caffeine", version = "3.1.8" }
antlr = { group = "org.antlr", name = "antlr4", version = "4.13.2" }
immutables-value = { group = "org.immutables", name = "value", version.ref = "immutables" }
agrona = { group = "org.agrona", name = "agrona", version = "1.23.1" }
agrona = { group = "org.agrona", name = "agrona", version = "2.0.0" }

jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson" }
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" }
Expand Down Expand Up @@ -153,6 +153,7 @@ jsh = { group = "com.github.mwiede", name = "jsch", version = "0.2.21" }
vertx-core = { group = "io.vertx", name = "vertx-core", version.ref = "vertx" }
vertx-junit5 = { group = "io.vertx", name = "vertx-junit5", version.ref = "vertx" }
vertx-web = { group = "io.vertx", name = "vertx-web", version.ref = "vertx" }
vertx-web-templ-thymeleaf = { group = "io.vertx", name = "vertx-web-templ-thymeleaf", version.ref = "vertx" }
vertx-web-client = { group = "io.vertx", name = "vertx-web-client", version.ref = "vertx" }
vertx-tcp-eventbus-bridge = { group = "io.vertx", name = "vertx-tcp-eventbus-bridge", version.ref = "vertx" }
vertx-micrometer-metrics = { group = "io.vertx", name = "vertx-micrometer-metrics", version.ref = "vertx" }
Expand All @@ -173,6 +174,7 @@ mutiny-vertx = { group = "io.smallrye.reactive", name = "smallrye-mutiny-vertx-c
mutiny-vertx-web = { group = "io.smallrye.reactive", name = "smallrye-mutiny-vertx-web", version.ref = "mutinyVertx" }
mutiny-vertx-web-client = { group = "io.smallrye.reactive", name = "smallrye-mutiny-vertx-web-client", version.ref = "mutinyVertx" }
mutiny-vertx-tcp-eventbus-bridge = { group = "io.smallrye.reactive", name = "smallrye-mutiny-vertx-tcp-eventbus-bridge", version.ref = "mutinyVertx" }
mutiny-vertx-web-templ-thymeleaf = { group = "io.smallrye.reactive", name = "smallrye-mutiny-vertx-web-templ-thymeleaf", version.ref = "mutinyVertx" }
netty-resolver-dns-native-macos = { group = "io.netty", name = "netty-resolver-dns-native-macos", version = "4.2.0.RC1" }

record-builder-core = { group = "io.soabase.record-builder", name = "record-builder-core", version.ref = "record-builder" }
Expand All @@ -198,12 +200,15 @@ ebean-ddl-generator = { group = "io.ebean", name = "ebean-ddl-generator", versio
fury-core = { group = "org.apache.fury", name = "fury-core", version.ref = "fury" }
fury-format = { group = "org.apache.fury", name = "fury-format", version.ref = "fury" }

avaje-spi-service = { group = "io.avaje", name = "avaje-spi-service", version = "2.8" }
avaje-spi-service = { group = "io.avaje", name = "avaje-spi-service", version = "2.9" }
graalvm-polyglot = { group = "org.graalvm.polyglot", name = "polyglot", version.ref = "polyglot" }
graalvm-polyglot-js = { group = "org.graalvm.polyglot", name = "js-community", version.ref = "polyglot" }
graalvm-polyglot-python = { group = "org.graalvm.polyglot", name = "python-community", version.ref = "polyglot" }
graalvm-polyglot-profile = { group = "org.graalvm.polyglot", name = "profiler", version.ref = "polyglot" }

theme-detector = { group = "com.github.Dansoftowner", name = "jSystemThemeDetector", version = "3.9.1" }

lombok-plugin = { group = "name.remal.gradle-plugins.lombok", name = "lombok", version = "2.2.12" }
lombok-plugin = { group = "name.remal.gradle-plugins.lombok", name = "lombok", version = "2.2.14" }

bootstrap = { group = "org.webjars", name = "bootstrap", version = "5.3.3" }
tailwindcss = { group = "org.webjars.npm", name = "tailwindcss", version = "4.0.0-beta.3" }
32 changes: 5 additions & 27 deletions visual-collaboration-server/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask

plugins {
application
alias(libs.plugins.graalvm)
Expand All @@ -8,7 +6,6 @@ plugins {
alias(libs.plugins.javamodularity)
alias(libs.plugins.docker)
alias(libs.plugins.maniftest)
alias(libs.plugins.frontend)
}

apply<ModulePlugin>()
Expand Down Expand Up @@ -36,6 +33,10 @@ dependencies {
implementation(libs.vertx.micrometer.metrics)
implementation(libs.micrometer.registry.jmx)
implementation(libs.vertx.core)
implementation(libs.mutiny.vertx.web.templ.thymeleaf)
implementation(libs.vertx.web.templ.thymeleaf)
implementation(libs.bootstrap)
implementation(libs.tailwindcss)
implementation(libs.agrona)
implementation(libs.jgrapht)
implementation(libs.vertx.web)
Expand Down Expand Up @@ -76,27 +77,4 @@ docker {
images.set(setOf(group.toString().replace(".", "-")))
jvmArgs.set(listOf("-Xms256m", "-Xmx2048m"))
}
}

frontend {
nodeVersion.set("22.11.0")
packageJsonDirectory.set(project.layout.projectDirectory.dir("src/main/frontend"))
assembleScript.set("build")
}

tasks.withType(InstallFrontendTask::class.java) {
environmentVariables.put("COREPACK_NPM_REGISTRY", "https://registry.npmmirror.com")
}

tasks.create("copyFrontend", Copy::class) {
group = "build"
from(layout.projectDirectory.dir("src/main/frontend/dist"))
destinationDir =
layout.buildDirectory
.dir("classes/java/main/webroot")
.get()
.asFile
dependsOn(tasks.assembleFrontend)
}

tasks.processResources { dependsOn("copyFrontend") }
}
24 changes: 0 additions & 24 deletions visual-collaboration-server/src/main/frontend/.gitignore

This file was deleted.

50 changes: 0 additions & 50 deletions visual-collaboration-server/src/main/frontend/README.md

This file was deleted.

28 changes: 0 additions & 28 deletions visual-collaboration-server/src/main/frontend/eslint.config.js

This file was deleted.

13 changes: 0 additions & 13 deletions visual-collaboration-server/src/main/frontend/index.html

This file was deleted.

30 changes: 0 additions & 30 deletions visual-collaboration-server/src/main/frontend/package.json

This file was deleted.

Loading

0 comments on commit 6ab1c6b

Please sign in to comment.