Disabled Speedy Web Compiler for now since it causes issues with Vaadin and Hot Reload

build.gradle.kts

@@ -1,18 +1,12 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-val springCloudVersion by extra("2023.0.3")
-val vaadinVersion by extra("24.4.10")
-
 plugins {
-    val kotlinVersion = "2.0.10"
+    id("org.springframework.boot")
-    val vaadinVersion = "24.4.10"
+    id("io.spring.dependency-management")
-
+    id("com.vaadin")
-    id("org.springframework.boot") version "3.3.3"
+    kotlin("jvm")
-    id("io.spring.dependency-management") version "1.1.6"
+    kotlin("plugin.spring")
-    id("com.vaadin") version vaadinVersion
+    kotlin("plugin.jpa")
-    kotlin("jvm") version kotlinVersion
-    kotlin("plugin.spring") version kotlinVersion
-    kotlin("plugin.jpa") version kotlinVersion
     java
 }
 
@@ -73,8 +67,8 @@ dependencies {
 
 dependencyManagement {
     imports {
-        mavenBom("com.vaadin:vaadin-bom:$vaadinVersion")
+        mavenBom("com.vaadin:vaadin-bom:${extra["vaadinVersion"]}")
-        mavenBom("org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion")
+        mavenBom("org.springframework.cloud:spring-cloud-dependencies:${extra["springCloudVersion"]}")
     }
 }
 

gradle.properties

@@ -0,0 +1,5 @@
+kotlinVersion=2.0.20
+vaadinVersion=24.4.10
+springBootVersion=3.3.3
+springCloudVersion=2023.0.3
+springDependencyManagementVersion=1.1.6

package.json

@@ -81,7 +81,7 @@
   "overrides": {
     "classnames": "$classnames",
     "react": "$react",
-    "react-dom": "$react-dom",
+    "react-dom": "18.3.1",
     "react-router-dom": "$react-router-dom",
     "@vaadin/bundles": "$@vaadin/bundles",
     "@vaadin/common-frontend": "$@vaadin/common-frontend",

settings.gradle.kts

@@ -1 +1,16 @@
 rootProject.name = "gameyfin"
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven(url = "https://maven.vaadin.com/vaadin-prereleases")
+    }
+    plugins {
+        id("com.vaadin") version extra["vaadinVersion"] as String
+        id("org.springframework.boot") version extra["springBootVersion"] as String
+        id("io.spring.dependency-management") version extra["springDependencyManagementVersion"] as String
+        kotlin("jvm") version extra["kotlinVersion"] as String
+        kotlin("plugin.spring") version extra["kotlinVersion"] as String
+        kotlin("plugin.jpa") version extra["kotlinVersion"] as String
+    }
+}

src/main/resources/application.yml

@@ -43,4 +43,4 @@ vaadin:
     - org.vaadin
     - dev.hilla
   pnpm:
-    enable: true
+    enable: false

tailwind.config.ts

@@ -6,8 +6,8 @@ import withMT from "@material-tailwind/react/utils/withMT";
 export default withMT({
     darkMode: "class",
     content: [
-        './frontend/index.html',
+        './src/main/frontend/index.html',
-        './frontend/**/*.{js,ts,jsx,tsx}',
+        './src/main/frontend/**/*.{js,ts,jsx,tsx}',
         './node_modules/@nextui-org/theme/dist/**/*.{js,ts,jsx,tsx}'
     ],
     theme: {

vite.config.ts

@@ -1,15 +1,10 @@
-import reactSwc from '@vitejs/plugin-react-swc';
 import type {UserConfigFn} from 'vite';
 import {overrideVaadinConfig} from './vite.generated';
 
 const customConfig: UserConfigFn = (env) => ({
     // Here you can add custom Vite parameters
     // https://vitejs.dev/config/
-    plugins: [
+    plugins: []
-        reactSwc({
-            tsDecorators: true,
-        }),
-    ]
 });
 
 export default overrideVaadinConfig(customConfig);