diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e73f9b5..f27a280 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 cache: 'npm' cache-dependency-path: './ui' - name: Install dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee07f86..d09baa3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 cache: 'npm' cache-dependency-path: './ui' - name: Install dependencies diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ab0e9e0..6080c52 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,24 +8,24 @@ import sbt.Keys.libraryDependencies object Dependencies { object Versions { - val brotli = "1.17.0" - val flyway = "9.21.1" - val jsoniter = "2.31.1" + val brotli = "1.18.0" + val flyway = "11.3.0" + val jsoniter = "2.33.1" val jwt = "10.0.1" - val laminar = "17.1.0" + val laminar = "17.2.0" val laminext = "0.17.0" val `native-converter` = "0.9.0" val quill = "4.8.6" val `scala-java-time` = "2.6.0" val `sjs-dom` = "2.8.0+45-53f9a1a2-SNAPSHOT" // FIXME wait for 2.9.0 release - val snakeyaml = "2.8" + val snakeyaml = "2.9" val sqlite = "3.46.1.3" val sttp = "3.10.1" - val tapir = "1.11.8" + val tapir = "1.11.13" val waypoint = "8.0.1" val zio = "2.1.14" - val `zio-config` = "4.0.2" - val `zio-logging` = "2.3.2" + val `zio-config` = "4.0.3" + val `zio-logging` = "2.4.0" val `zio-metrics` = "2.3.1" } diff --git a/project/plugins.sbt b/project/plugins.sbt index 0f10bca..1fc1c58 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" addDependencyTreePlugin addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") diff --git a/server/src/main/resources/application.dev.conf b/server/src/main/resources/application.dev.conf index 93cc822..1eb5353 100644 --- a/server/src/main/resources/application.dev.conf +++ b/server/src/main/resources/application.dev.conf @@ -15,7 +15,7 @@ logger { "org.updraft0.esi.client": INFO // Auth/Location, etc tracking - "org.updraft0.controltower.server.tracking": TRACE + "org.updraft0.controltower.server.tracking": INFO // set to trace to log tracking information // dependencies "io.netty": INFO diff --git a/ui/vite.config.js b/ui/vite.config.js index a52b839..f9f3829 100644 --- a/ui/vite.config.js +++ b/ui/vite.config.js @@ -14,8 +14,9 @@ export default defineConfig({ preserveHeaderKeyCase: true, autoRewrite: true, secure: false, - localAddress: '127.0.0.1', - target: 'http://localhost4:8092', + // localAddress: '127.0.0.1', + // this can be unreliable if localhost resolves to an ipv6 address + target: 'http://localhost:8092', ws: true } }, @@ -28,4 +29,4 @@ export default defineConfig({ cwd: '../', projectID: 'ui' })], -}); \ No newline at end of file +});