diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 02968466b5..d81b1710ab 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -6,7 +6,7 @@ defaults:
 
 on:
   push:
-    branches: [ main, '24.5', '24.4', '2.5', '1.5', '1.4' ]
+    branches: [ main, '24.6', '24.5', '24.4', '2.5', '1.5', '1.4' ]
     paths-ignore:
       - 'hilla-logo.svg'
       - 'README.md'
@@ -291,6 +291,8 @@ jobs:
           TB_LICENSE=${{secrets.TB_LICENSE}}
           mkdir -p ~/.vaadin/
           echo '{"username":"'`echo $TB_LICENSE | cut -d / -f1`'","proKey":"'`echo $TB_LICENSE | cut -d / -f2`'"}' > ~/.vaadin/proKey
+      - name: publish plugin to Maven Local
+        run: ./packages/java/gradle-plugin/gradlew --info -p packages/java/gradle-plugin build publishToMavenLocal -x functionalTest
       - name: Test gradle-plugin's functional tests
         run: ./packages/java/gradle-plugin/gradlew --info -p packages/java/gradle-plugin functionalTest
       - name: Gradle ITs
diff --git a/package-lock.json b/package-lock.json
index 3e7c264c0d..c69d00c00f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3575,15 +3575,6 @@
         "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
-      "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
-      "peer": true,
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "15.3.0",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz",
@@ -16588,6 +16579,7 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
@@ -16613,35 +16605,42 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz",
-      "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==",
-      "peer": true,
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz",
+      "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==",
+      "license": "MIT",
       "dependencies": {
-        "@remix-run/router": "1.21.0"
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
+        "react": ">=18",
+        "react-dom": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
-    "node_modules/react-router-dom": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz",
-      "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==",
-      "peer": true,
-      "dependencies": {
-        "@remix-run/router": "1.21.0",
-        "react-router": "6.28.0"
-      },
+    "node_modules/react-router/node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "license": "MIT"
+    },
+    "node_modules/react-router/node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+        "node": ">=18"
       }
     },
     "node_modules/readable-stream": {
@@ -17148,6 +17147,7 @@
       "version": "0.23.2",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
       "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
@@ -17176,6 +17176,12 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+      "license": "MIT"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -18349,6 +18355,12 @@
         "fsevents": "~2.3.3"
       }
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
+      "license": "ISC"
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -19345,11 +19357,12 @@
     },
     "packages/ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-react-auth": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "react": "^18.2.0",
         "rollup": "^4.12.0",
         "typescript": "5.6.2"
@@ -19376,12 +19389,13 @@
       },
       "peerDependencies": {
         "react": "^18.2.0",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18.2.0",
+        "react-router": "^7"
       }
     },
     "packages/ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -19412,11 +19426,11 @@
     },
     "packages/ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -19430,7 +19444,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -19460,11 +19474,11 @@
     },
     "packages/ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -19502,12 +19516,12 @@
     },
     "packages/ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -19518,8 +19532,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19537,12 +19551,12 @@
     },
     "packages/ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -19551,8 +19565,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19570,11 +19584,11 @@
     },
     "packages/ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -19583,7 +19597,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19601,13 +19615,13 @@
     },
     "packages/ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -19618,8 +19632,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19637,12 +19651,12 @@
     },
     "packages/ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -19653,8 +19667,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19672,13 +19686,13 @@
     },
     "packages/ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -19690,8 +19704,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19810,13 +19824,13 @@
     },
     "packages/ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -19827,9 +19841,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19847,7 +19861,7 @@
     },
     "packages/ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -19877,10 +19891,10 @@
     },
     "packages/ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -19902,10 +19916,10 @@
     },
     "packages/ts/models": {
       "name": "@vaadin/hilla-models",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.0-beta5"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -20085,10 +20099,10 @@
     },
     "packages/ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5"
+        "@vaadin/hilla-frontend": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -20104,23 +20118,25 @@
         "@types/validator": "^13.11.2",
         "@web/test-runner": "^0.19.0",
         "chai-dom": "^1.11.0",
+        "react-router": "^7.0.2",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
         "typescript": "5.6.2"
       },
       "peerDependencies": {
         "react": "^18",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18",
+        "react-router": "^7"
       }
     },
     "packages/ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
-        "@vaadin/hilla-react-form": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+        "@vaadin/hilla-react-form": "24.7.0-alpha0",
         "@vaadin/react-components": "24.6.0-rc1"
       },
       "devDependencies": {
@@ -20150,10 +20166,10 @@
     },
     "packages/ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.0-beta5"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -20180,11 +20196,11 @@
     },
     "packages/ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "intl-messageformat": "^10.5.11"
       },
       "devDependencies": {
@@ -20213,11 +20229,11 @@
     },
     "packages/ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^2.0.0",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "nanoid": "^5.0.7"
       },
       "devDependencies": {
diff --git a/packages/java/endpoint/pom.xml b/packages/java/endpoint/pom.xml
index c6089643f7..5465508c23 100644
--- a/packages/java/endpoint/pom.xml
+++ b/packages/java/endpoint/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>hilla-project</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>hilla-endpoint</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <name>Hilla Endpoint</name>
     <packaging>jar</packaging>
 
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ListSignal.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ListSignal.java
index df6560b851..9589b46cb1 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ListSignal.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ListSignal.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/NumberSignal.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/NumberSignal.java
index 37905bafab..f74cd41068 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/NumberSignal.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/NumberSignal.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/Signal.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/Signal.java
index c574bbe11c..ea7a6ae45f 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/Signal.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/Signal.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ValueSignal.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ValueSignal.java
index 837e545058..d3e9121aea 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ValueSignal.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/ValueSignal.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/config/SignalsConfiguration.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/config/SignalsConfiguration.java
index 345b031608..7d7493771b 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/config/SignalsConfiguration.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/config/SignalsConfiguration.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/InvalidEventTypeException.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/InvalidEventTypeException.java
index 4bdff68f92..71a1d03480 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/InvalidEventTypeException.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/InvalidEventTypeException.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.core.event;
 
 /**
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/ListStateEvent.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/ListStateEvent.java
index 54a6dedfc7..d0a29f1a71 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/ListStateEvent.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/ListStateEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.core.event;
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/MissingFieldException.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/MissingFieldException.java
index 902c21f4ab..d893b593dd 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/MissingFieldException.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/MissingFieldException.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.core.event;
 
 /**
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/StateEvent.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/StateEvent.java
index 80c3fb3cba..b999c85958 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/StateEvent.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/event/StateEvent.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.core.event;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -7,8 +23,6 @@
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * A utility class for representing state events out of an ObjectNode. This
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SecureSignalsRegistry.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SecureSignalsRegistry.java
index 5bb47115d3..682a2f5acc 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SecureSignalsRegistry.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SecureSignalsRegistry.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.core.registry;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SignalsRegistry.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SignalsRegistry.java
index 23b372c0cb..e6b9e86cbb 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SignalsRegistry.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/core/registry/SignalsRegistry.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.core.registry;
 
 import com.vaadin.hilla.signals.Signal;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/handler/SignalsHandler.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/handler/SignalsHandler.java
index fa314c672b..b4868c896f 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/handler/SignalsHandler.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/handler/SignalsHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.handler;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/IncrementOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/IncrementOperation.java
index 2a50b5b6c8..d98ab5d34d 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/IncrementOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/IncrementOperation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 public record IncrementOperation(String operationId, Double value) implements ValueOperation<Double> {
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListInsertOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListInsertOperation.java
index 47ea01aa28..eef3e4496e 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListInsertOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListInsertOperation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 import com.vaadin.hilla.signals.core.event.ListStateEvent;
@@ -5,4 +21,5 @@
 public record ListInsertOperation<T>(
     String operationId,
     ListStateEvent.InsertPosition position,
-    T value) implements ValueOperation<T> {}
+    T value
+) implements ValueOperation<T> {}
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListRemoveOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListRemoveOperation.java
index ed88c6b62e..46dac9a1a1 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListRemoveOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ListRemoveOperation.java
@@ -1,8 +1,24 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 import com.vaadin.hilla.signals.core.event.ListStateEvent;
 
 public record ListRemoveOperation<T>(
     String operationId,
-    ListStateEvent.ListEntry<T> entryToRemove)
-    implements SignalOperation<T> {}
+    ListStateEvent.ListEntry<T> entryToRemove
+) implements SignalOperation<T> {}
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/OperationValidator.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/OperationValidator.java
index a58a7bc775..de0b751b09 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/OperationValidator.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/OperationValidator.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 @FunctionalInterface
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ReplaceValueOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ReplaceValueOperation.java
index 3a64d1f183..55764d947b 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ReplaceValueOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ReplaceValueOperation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SetValueOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SetValueOperation.java
index 78bc5a8c1c..1a3d7081b6 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SetValueOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SetValueOperation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SignalOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SignalOperation.java
index 6f38edac7c..28269a8407 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SignalOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/SignalOperation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 public interface SignalOperation<T> {
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValidationResult.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValidationResult.java
index 2fc7c03403..1db905bcec 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValidationResult.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValidationResult.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 public class ValidationResult {
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValueOperation.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValueOperation.java
index 61d8b3f9e4..c1fc427a85 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValueOperation.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/signals/operation/ValueOperation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2000-2024 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package com.vaadin.hilla.signals.operation;
 
 public interface ValueOperation<T> extends SignalOperation<T> {
diff --git a/packages/java/engine-core/pom.xml b/packages/java/engine-core/pom.xml
index bb276e75d0..2d0d752cd5 100644
--- a/packages/java/engine-core/pom.xml
+++ b/packages/java/engine-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/engine-runtime/pom.xml b/packages/java/engine-runtime/pom.xml
index fc6757ebb0..bf55ee4e30 100644
--- a/packages/java/engine-runtime/pom.xml
+++ b/packages/java/engine-runtime/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/gradle-plugin/pom-portal.xml b/packages/java/gradle-plugin/pom-portal.xml
index 6359c21bbc..e8bd0fac76 100644
--- a/packages/java/gradle-plugin/pom-portal.xml
+++ b/packages/java/gradle-plugin/pom-portal.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/gradle-plugin/pom.xml b/packages/java/gradle-plugin/pom.xml
index 845d4b09fb..ab78e507ea 100644
--- a/packages/java/gradle-plugin/pom.xml
+++ b/packages/java/gradle-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
       <groupId>com.vaadin</groupId>
       <artifactId>hilla-project</artifactId>
-      <version>24.6-SNAPSHOT</version>
+      <version>24.7-SNAPSHOT</version>
       <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/packages/java/gradle-plugin/src/functionalTest/kotlin/com/vaadin/hilla/gradle/plugin/AbstractGradleTest.kt b/packages/java/gradle-plugin/src/functionalTest/kotlin/com/vaadin/hilla/gradle/plugin/AbstractGradleTest.kt
index f7858c269c..3ca12b13ec 100644
--- a/packages/java/gradle-plugin/src/functionalTest/kotlin/com/vaadin/hilla/gradle/plugin/AbstractGradleTest.kt
+++ b/packages/java/gradle-plugin/src/functionalTest/kotlin/com/vaadin/hilla/gradle/plugin/AbstractGradleTest.kt
@@ -25,8 +25,8 @@ import org.junit.Before
  */
 abstract class AbstractGradleTest {
 
-    val hillaVersion = System.getenv("hilla.version").takeUnless { it.isNullOrEmpty() } ?: "24.6-SNAPSHOT"
-    val flowVersion = System.getenv("flow.version").takeUnless { it.isNullOrEmpty() } ?: "24.6-SNAPSHOT"
+    val hillaVersion = System.getenv("hilla.version").takeUnless { it.isNullOrEmpty() } ?: "24.7-SNAPSHOT"
+    val flowVersion = System.getenv("flow.version").takeUnless { it.isNullOrEmpty() } ?: "24.7-SNAPSHOT"
     /**
      * The testing Gradle project. Automatically deleted after every test.
      * Don't use TemporaryFolder JUnit `@Rule` since it will always delete the folder afterward,
diff --git a/packages/java/hilla-bom/pom.xml b/packages/java/hilla-bom/pom.xml
index 0c4b33f0ed..8d4e5c165b 100644
--- a/packages/java/hilla-bom/pom.xml
+++ b/packages/java/hilla-bom/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>hilla-bom</artifactId>
     <packaging>pom</packaging>
     <name>Hilla Platform (Bill of Materials)</name>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <description>Hilla Platform (Bill of Materials)</description>
     <url>https://hilla.dev</url>
 
diff --git a/packages/java/hilla-dev/pom.xml b/packages/java/hilla-dev/pom.xml
index eecfaf63b8..e9b03cce3b 100644
--- a/packages/java/hilla-dev/pom.xml
+++ b/packages/java/hilla-dev/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>hilla-project</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/packages/java/hilla/pom.xml b/packages/java/hilla/pom.xml
index fac69f73f8..8155df5cf7 100644
--- a/packages/java/hilla/pom.xml
+++ b/packages/java/hilla/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>hilla-project</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/packages/java/maven-plugin/pom.xml b/packages/java/maven-plugin/pom.xml
index 50df04bd36..9eea4a290b 100644
--- a/packages/java/maven-plugin/pom.xml
+++ b/packages/java/maven-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-core/pom.xml b/packages/java/parser-jvm-core/pom.xml
index 20f4fe1287..f2ff04f080 100644
--- a/packages/java/parser-jvm-core/pom.xml
+++ b/packages/java/parser-jvm-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-plugin-backbone/pom.xml b/packages/java/parser-jvm-plugin-backbone/pom.xml
index 2f1e120da9..16d6c8e00c 100644
--- a/packages/java/parser-jvm-plugin-backbone/pom.xml
+++ b/packages/java/parser-jvm-plugin-backbone/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>hilla-project</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/packages/java/parser-jvm-plugin-model/pom.xml b/packages/java/parser-jvm-plugin-model/pom.xml
index 2bf066f596..8d8aff9e5b 100644
--- a/packages/java/parser-jvm-plugin-model/pom.xml
+++ b/packages/java/parser-jvm-plugin-model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-plugin-nonnull/pom.xml b/packages/java/parser-jvm-plugin-nonnull/pom.xml
index f976b7fc03..9660b49e28 100644
--- a/packages/java/parser-jvm-plugin-nonnull/pom.xml
+++ b/packages/java/parser-jvm-plugin-nonnull/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-plugin-subtypes/pom.xml b/packages/java/parser-jvm-plugin-subtypes/pom.xml
index 1b620d3119..0854f7164c 100644
--- a/packages/java/parser-jvm-plugin-subtypes/pom.xml
+++ b/packages/java/parser-jvm-plugin-subtypes/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-plugin-transfertypes/pom.xml b/packages/java/parser-jvm-plugin-transfertypes/pom.xml
index 444f7d2769..cb509a93ba 100644
--- a/packages/java/parser-jvm-plugin-transfertypes/pom.xml
+++ b/packages/java/parser-jvm-plugin-transfertypes/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-test-utils/pom.xml b/packages/java/parser-jvm-test-utils/pom.xml
index edc304ff6c..2d92072135 100644
--- a/packages/java/parser-jvm-test-utils/pom.xml
+++ b/packages/java/parser-jvm-test-utils/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/parser-jvm-utils/pom.xml b/packages/java/parser-jvm-utils/pom.xml
index 8259c975a6..d6f0d85163 100644
--- a/packages/java/parser-jvm-utils/pom.xml
+++ b/packages/java/parser-jvm-utils/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>hilla-project</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/packages/java/runtime-plugin-transfertypes/pom.xml b/packages/java/runtime-plugin-transfertypes/pom.xml
index ec69daef6f..986574be6a 100644
--- a/packages/java/runtime-plugin-transfertypes/pom.xml
+++ b/packages/java/runtime-plugin-transfertypes/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>hilla-project</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/packages/java/tests/csrf-context/package-lock.json b/packages/java/tests/csrf-context/package-lock.json
index 2597769ace..59a43ae53e 100644
--- a/packages/java/tests/csrf-context/package-lock.json
+++ b/packages/java/tests/csrf-context/package-lock.json
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -76,7 +76,7 @@
     },
     "../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -107,12 +107,12 @@
     },
     "../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -126,7 +126,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -145,12 +145,12 @@
     },
     "../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -177,13 +177,13 @@
     },
     "../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -194,8 +194,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -213,13 +213,13 @@
     },
     "../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -228,8 +228,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -247,12 +247,12 @@
     },
     "../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -261,7 +261,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -279,14 +279,14 @@
     },
     "../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -297,8 +297,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -316,13 +316,13 @@
     },
     "../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -333,8 +333,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -352,14 +352,14 @@
     },
     "../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -371,8 +371,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -389,14 +389,14 @@
     },
     "../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -407,9 +407,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -427,7 +427,7 @@
     },
     "../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -484,10 +484,10 @@
     },
     "../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2264,9 +2264,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -7209,9 +7209,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -9394,9 +9394,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -10203,8 +10203,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -10229,7 +10229,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10252,9 +10252,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10278,9 +10278,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10302,8 +10302,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10325,11 +10325,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10353,9 +10353,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10379,10 +10379,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10406,10 +10406,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10458,7 +10458,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -13174,9 +13174,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/csrf-context/package.json b/packages/java/tests/csrf-context/package.json
index c0a07cdf64..8aea4db320 100644
--- a/packages/java/tests/csrf-context/package.json
+++ b/packages/java/tests/csrf-context/package.json
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "53252052c688591643e47b027dd073364931bfc727f92c4810ebe0302bf04fb5"
+    "hash": "da86c6668cba9f0e86913086f11b43cd45fda26a0a609835a03514d5a775210a"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/csrf-context/pom.xml b/packages/java/tests/csrf-context/pom.xml
index 4cb708dd52..4e07104e71 100644
--- a/packages/java/tests/csrf-context/pom.xml
+++ b/packages/java/tests/csrf-context/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>tests</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>tests-csrf-context</artifactId>
diff --git a/packages/java/tests/csrf/package-lock.json b/packages/java/tests/csrf/package-lock.json
index 7c0f20d7c5..243d75d425 100644
--- a/packages/java/tests/csrf/package-lock.json
+++ b/packages/java/tests/csrf/package-lock.json
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -76,7 +76,7 @@
     },
     "../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -107,12 +107,12 @@
     },
     "../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -126,7 +126,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -145,12 +145,12 @@
     },
     "../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -177,13 +177,13 @@
     },
     "../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -194,8 +194,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -213,13 +213,13 @@
     },
     "../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -228,8 +228,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -247,12 +247,12 @@
     },
     "../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -261,7 +261,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -279,14 +279,14 @@
     },
     "../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -297,8 +297,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -316,13 +316,13 @@
     },
     "../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -333,8 +333,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -352,14 +352,14 @@
     },
     "../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -371,8 +371,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -389,14 +389,14 @@
     },
     "../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -407,9 +407,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -427,7 +427,7 @@
     },
     "../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -484,10 +484,10 @@
     },
     "../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2276,9 +2276,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -6618,9 +6618,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -8876,9 +8876,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -9669,8 +9669,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -9695,7 +9695,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9718,9 +9718,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9744,9 +9744,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9768,8 +9768,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9791,11 +9791,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9819,9 +9819,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9845,10 +9845,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9872,10 +9872,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -9924,7 +9924,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -12171,9 +12171,9 @@
       "requires": {}
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/csrf/package.json b/packages/java/tests/csrf/package.json
index 6b81e365ac..29207093e8 100644
--- a/packages/java/tests/csrf/package.json
+++ b/packages/java/tests/csrf/package.json
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "53252052c688591643e47b027dd073364931bfc727f92c4810ebe0302bf04fb5"
+    "hash": "da86c6668cba9f0e86913086f11b43cd45fda26a0a609835a03514d5a775210a"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/csrf/pom.xml b/packages/java/tests/csrf/pom.xml
index 3625b0fb4a..090acef9c6 100644
--- a/packages/java/tests/csrf/pom.xml
+++ b/packages/java/tests/csrf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>tests</artifactId>
-    <version>24.6-SNAPSHOT</version>
+    <version>24.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>tests-csrf</artifactId>
diff --git a/packages/java/tests/gradle/single-module-tests/frontend/App.tsx b/packages/java/tests/gradle/single-module-tests/frontend/App.tsx
index 6b7546d1ed..b84dcf6ea7 100644
--- a/packages/java/tests/gradle/single-module-tests/frontend/App.tsx
+++ b/packages/java/tests/gradle/single-module-tests/frontend/App.tsx
@@ -1,5 +1,5 @@
 import router from 'Frontend/routes.js';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   return <RouterProvider router={router} />;
diff --git a/packages/java/tests/gradle/single-module-tests/frontend/_views/MainLayout.tsx b/packages/java/tests/gradle/single-module-tests/frontend/_views/MainLayout.tsx
index 9c7629fcf6..3b5fa36c6a 100644
--- a/packages/java/tests/gradle/single-module-tests/frontend/_views/MainLayout.tsx
+++ b/packages/java/tests/gradle/single-module-tests/frontend/_views/MainLayout.tsx
@@ -5,7 +5,7 @@ import { Scroller } from '@vaadin/react-components/Scroller.js';
 import Placeholder from 'Frontend/components/placeholder/Placeholder.js';
 import { MenuProps, routes, useViewMatches, ViewRouteObject } from 'Frontend/routes.js';
 import { Suspense } from 'react';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 import css from './MainLayout.module.css';
 
 type MenuRoute = ViewRouteObject &
diff --git a/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx b/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx
index 502d533321..7714b5e819 100644
--- a/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx
+++ b/packages/java/tests/gradle/single-module-tests/frontend/routes.tsx
@@ -1,7 +1,7 @@
 import HelloReactView from './_views/helloreact/HelloReactView.js';
 import MainLayout from './_views/MainLayout.js';
 import { lazy } from 'react';
-import { createBrowserRouter, IndexRouteObject, NonIndexRouteObject, useMatches } from 'react-router-dom';
+import { createBrowserRouter, IndexRouteObject, NonIndexRouteObject, useMatches } from 'react-router';
 
 const AboutView = lazy(async () => import('./_views/about/AboutView.js'));
 export type MenuProps = Readonly<{
diff --git a/packages/java/tests/gradle/single-module/gradle.properties b/packages/java/tests/gradle/single-module/gradle.properties
index fa2c5a391a..71177fc1a9 100644
--- a/packages/java/tests/gradle/single-module/gradle.properties
+++ b/packages/java/tests/gradle/single-module/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-hillaVersion=24.6-SNAPSHOT
-flowVersion=24.6-SNAPSHOT
+hillaVersion=24.7-SNAPSHOT
+flowVersion=24.7-SNAPSHOT
 vaadinComponentsVersion=24.6-SNAPSHOT
diff --git a/packages/java/tests/gradle/single-module/src/main/frontend/App.tsx b/packages/java/tests/gradle/single-module/src/main/frontend/App.tsx
index 3aaf8e8ec7..265f231fb5 100644
--- a/packages/java/tests/gradle/single-module/src/main/frontend/App.tsx
+++ b/packages/java/tests/gradle/single-module/src/main/frontend/App.tsx
@@ -1,5 +1,5 @@
 import router from './routes';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   return <RouterProvider router={router} />;
diff --git a/packages/java/tests/gradle/single-module/src/main/frontend/_views/MainLayout.tsx b/packages/java/tests/gradle/single-module/src/main/frontend/_views/MainLayout.tsx
index 89e9a07721..70bf9e967f 100644
--- a/packages/java/tests/gradle/single-module/src/main/frontend/_views/MainLayout.tsx
+++ b/packages/java/tests/gradle/single-module/src/main/frontend/_views/MainLayout.tsx
@@ -5,7 +5,7 @@ import { Scroller } from '@vaadin/react-components/Scroller.js';
 import Placeholder from '../components/placeholder/Placeholder';
 import { MenuProps, routes, useViewMatches, ViewRouteObject } from '../routes';
 import { Suspense } from 'react';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 import css from './MainLayout.module.css';
 
 type MenuRoute = ViewRouteObject &
diff --git a/packages/java/tests/gradle/single-module/src/main/frontend/routes.tsx b/packages/java/tests/gradle/single-module/src/main/frontend/routes.tsx
index ded3e68db1..387b3f25e0 100644
--- a/packages/java/tests/gradle/single-module/src/main/frontend/routes.tsx
+++ b/packages/java/tests/gradle/single-module/src/main/frontend/routes.tsx
@@ -1,7 +1,7 @@
 import HelloReactView from './_views/helloreact/HelloReactView';
 import MainLayout from './_views/MainLayout';
 import { lazy } from 'react';
-import { createBrowserRouter, IndexRouteObject, NonIndexRouteObject, useMatches } from 'react-router-dom';
+import { createBrowserRouter, IndexRouteObject, NonIndexRouteObject, useMatches } from 'react-router';
 
 const AboutView = lazy(async () => import('./_views/about/AboutView'));
 export type MenuProps = Readonly<{
diff --git a/packages/java/tests/pom.xml b/packages/java/tests/pom.xml
index 2259dfb40a..c4a9377ded 100644
--- a/packages/java/tests/pom.xml
+++ b/packages/java/tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>hilla-project</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/packages/java/tests/spring/endpoints discovery/package-lock.json b/packages/java/tests/spring/endpoints discovery/package-lock.json
index bed195c021..a148acc3ce 100644
--- a/packages/java/tests/spring/endpoints discovery/package-lock.json	
+++ b/packages/java/tests/spring/endpoints discovery/package-lock.json	
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -83,12 +83,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -170,8 +170,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -273,8 +273,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -309,8 +309,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -365,14 +365,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -383,9 +383,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -403,7 +403,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -460,10 +460,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2337,9 +2337,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -7282,9 +7282,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -9467,9 +9467,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -10276,8 +10276,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -10302,7 +10302,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10325,9 +10325,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10351,9 +10351,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10375,8 +10375,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10398,11 +10398,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10426,9 +10426,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10452,10 +10452,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10479,10 +10479,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10531,7 +10531,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -13247,9 +13247,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/endpoints discovery/package.json b/packages/java/tests/spring/endpoints discovery/package.json
index 9b15c479ea..c44018ef2a 100644
--- a/packages/java/tests/spring/endpoints discovery/package.json	
+++ b/packages/java/tests/spring/endpoints discovery/package.json	
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "951fdab543854014eb918f643718d01677d4085152649c385d2fa3d9be98a581"
+    "hash": "cf8e887569c2eeb388d7337885131bcdacbfa498c6bced6992a2748d47ede446"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/spring/endpoints discovery/pom.xml b/packages/java/tests/spring/endpoints discovery/pom.xml
index b413d0edfe..c75b11324f 100644
--- a/packages/java/tests/spring/endpoints discovery/pom.xml	
+++ b/packages/java/tests/spring/endpoints discovery/pom.xml	
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-endpoints-discovery</artifactId>
     <name>ITs for Endpoints Discovery</name>
diff --git a/packages/java/tests/spring/endpoints-contextpath/package-lock.json b/packages/java/tests/spring/endpoints-contextpath/package-lock.json
index 18f412ea57..def996d4a4 100644
--- a/packages/java/tests/spring/endpoints-contextpath/package-lock.json
+++ b/packages/java/tests/spring/endpoints-contextpath/package-lock.json
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -83,12 +83,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -170,8 +170,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -273,8 +273,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -309,8 +309,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -365,14 +365,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -383,9 +383,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -403,7 +403,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -460,10 +460,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2337,9 +2337,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -7249,9 +7249,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -9388,9 +9388,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -10231,8 +10231,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -10257,7 +10257,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10280,9 +10280,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10306,9 +10306,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10330,8 +10330,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10353,11 +10353,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10381,9 +10381,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10407,10 +10407,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10434,10 +10434,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10486,7 +10486,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -13144,9 +13144,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/endpoints-contextpath/package.json b/packages/java/tests/spring/endpoints-contextpath/package.json
index 42a201b1f5..ec504431eb 100644
--- a/packages/java/tests/spring/endpoints-contextpath/package.json
+++ b/packages/java/tests/spring/endpoints-contextpath/package.json
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "951fdab543854014eb918f643718d01677d4085152649c385d2fa3d9be98a581"
+    "hash": "cf8e887569c2eeb388d7337885131bcdacbfa498c6bced6992a2748d47ede446"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/spring/endpoints-contextpath/pom.xml b/packages/java/tests/spring/endpoints-contextpath/pom.xml
index 006f8e945e..053afaefb2 100644
--- a/packages/java/tests/spring/endpoints-contextpath/pom.xml
+++ b/packages/java/tests/spring/endpoints-contextpath/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-endpoints-contextpath</artifactId>
     <name>ITs for Endpoints when using a context path</name>
diff --git a/packages/java/tests/spring/endpoints-custom-client/package-lock.json b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
index 85e218c4eb..8faca0f86d 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package-lock.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -83,12 +83,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -170,8 +170,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -273,8 +273,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -309,8 +309,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -365,14 +365,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -383,9 +383,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -403,7 +403,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -460,10 +460,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2337,9 +2337,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -7249,9 +7249,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -9388,9 +9388,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -10231,8 +10231,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -10257,7 +10257,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10280,9 +10280,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10306,9 +10306,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10330,8 +10330,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10353,11 +10353,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10381,9 +10381,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10407,10 +10407,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10434,10 +10434,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10486,7 +10486,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -13144,9 +13144,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/endpoints-custom-client/package.json b/packages/java/tests/spring/endpoints-custom-client/package.json
index 42a201b1f5..ec504431eb 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package.json
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "951fdab543854014eb918f643718d01677d4085152649c385d2fa3d9be98a581"
+    "hash": "cf8e887569c2eeb388d7337885131bcdacbfa498c6bced6992a2748d47ede446"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/spring/endpoints-custom-client/pom.xml b/packages/java/tests/spring/endpoints-custom-client/pom.xml
index c6b6548d74..d274190187 100644
--- a/packages/java/tests/spring/endpoints-custom-client/pom.xml
+++ b/packages/java/tests/spring/endpoints-custom-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-endpoints-custom-client</artifactId>
     <name>ITs for Endpoints / custom client</name>
diff --git a/packages/java/tests/spring/endpoints-latest-java/package-lock.json b/packages/java/tests/spring/endpoints-latest-java/package-lock.json
index 05cc9bf181..235bb78301 100644
--- a/packages/java/tests/spring/endpoints-latest-java/package-lock.json
+++ b/packages/java/tests/spring/endpoints-latest-java/package-lock.json
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -88,7 +88,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -119,12 +119,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -138,7 +138,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -157,12 +157,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -206,8 +206,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -225,13 +225,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -240,8 +240,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -259,12 +259,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -273,7 +273,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -291,14 +291,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -309,8 +309,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -328,13 +328,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -345,8 +345,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -364,14 +364,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -383,8 +383,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -401,14 +401,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -419,9 +419,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -439,7 +439,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -496,10 +496,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2427,9 +2427,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -7372,9 +7372,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -9557,9 +9557,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -10366,8 +10366,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -10392,7 +10392,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10415,9 +10415,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10441,9 +10441,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10465,8 +10465,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10488,11 +10488,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10516,9 +10516,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10542,10 +10542,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10569,10 +10569,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10621,7 +10621,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -13339,9 +13339,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/endpoints-latest-java/package.json b/packages/java/tests/spring/endpoints-latest-java/package.json
index 9b15c479ea..c44018ef2a 100644
--- a/packages/java/tests/spring/endpoints-latest-java/package.json
+++ b/packages/java/tests/spring/endpoints-latest-java/package.json
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "951fdab543854014eb918f643718d01677d4085152649c385d2fa3d9be98a581"
+    "hash": "cf8e887569c2eeb388d7337885131bcdacbfa498c6bced6992a2748d47ede446"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/spring/endpoints-latest-java/pom.xml b/packages/java/tests/spring/endpoints-latest-java/pom.xml
index 3d59c491d2..997259a3de 100644
--- a/packages/java/tests/spring/endpoints-latest-java/pom.xml
+++ b/packages/java/tests/spring/endpoints-latest-java/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-endpoints-latest-java</artifactId>
     <name>ITs for Endpoints / latest Java</name>
diff --git a/packages/java/tests/spring/endpoints/package-lock.json b/packages/java/tests/spring/endpoints/package-lock.json
index e8ad8a4005..0f591f3ab4 100644
--- a/packages/java/tests/spring/endpoints/package-lock.json
+++ b/packages/java/tests/spring/endpoints/package-lock.json
@@ -21,7 +21,7 @@
         "lit": "3.2.1"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -43,7 +43,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -83,12 +83,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -170,8 +170,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -273,8 +273,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -309,8 +309,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -365,14 +365,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -383,9 +383,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -403,7 +403,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -460,10 +460,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2337,9 +2337,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -7249,9 +7249,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -9388,9 +9388,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -10231,8 +10231,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -10257,7 +10257,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10280,9 +10280,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10306,9 +10306,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10330,8 +10330,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10353,11 +10353,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10381,9 +10381,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10407,10 +10407,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10434,10 +10434,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -10486,7 +10486,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -13144,9 +13144,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/endpoints/package.json b/packages/java/tests/spring/endpoints/package.json
index a9a4272047..5a9483c294 100644
--- a/packages/java/tests/spring/endpoints/package.json
+++ b/packages/java/tests/spring/endpoints/package.json
@@ -18,7 +18,7 @@
     "lit": "3.2.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -40,7 +40,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
@@ -63,20 +63,20 @@
       "lit": "3.2.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -85,13 +85,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "951fdab543854014eb918f643718d01677d4085152649c385d2fa3d9be98a581"
+    "hash": "cf8e887569c2eeb388d7337885131bcdacbfa498c6bced6992a2748d47ede446"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/spring/endpoints/pom.xml b/packages/java/tests/spring/endpoints/pom.xml
index 0e688bd45f..4b55fa8519 100644
--- a/packages/java/tests/spring/endpoints/pom.xml
+++ b/packages/java/tests/spring/endpoints/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-endpoints</artifactId>
     <name>ITs for Endpoints</name>
diff --git a/packages/java/tests/spring/native/frontend/App.tsx b/packages/java/tests/spring/native/frontend/App.tsx
index 5d068e2165..2614586c54 100644
--- a/packages/java/tests/spring/native/frontend/App.tsx
+++ b/packages/java/tests/spring/native/frontend/App.tsx
@@ -1,6 +1,6 @@
 import router from 'Frontend/routes.js';
 import { AuthContext, useAuth } from 'Frontend/useAuth.js';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   const auth = useAuth();
diff --git a/packages/java/tests/spring/native/frontend/routes.tsx b/packages/java/tests/spring/native/frontend/routes.tsx
index e39a5ebf85..783d9fd051 100644
--- a/packages/java/tests/spring/native/frontend/routes.tsx
+++ b/packages/java/tests/spring/native/frontend/routes.tsx
@@ -1,4 +1,4 @@
-import {createBrowserRouter, RouteObject} from 'react-router-dom';
+import {createBrowserRouter, RouteObject} from 'react-router';
 import {ChatView} from "Frontend/views/ChatView.js";
 import {LoginView} from "Frontend/views/LoginView.js";
 import {ReadOnlyGrid} from "Frontend/views/ReadOnlyGrid";
diff --git a/packages/java/tests/spring/native/frontend/util/routing.ts b/packages/java/tests/spring/native/frontend/util/routing.ts
index ff80af3541..93f26fbbb2 100644
--- a/packages/java/tests/spring/native/frontend/util/routing.ts
+++ b/packages/java/tests/spring/native/frontend/util/routing.ts
@@ -1,4 +1,4 @@
-import { useMatches } from 'react-router-dom';
+import { useMatches } from 'react-router';
 
 type RouteMetadata = {
   [key: string]: any;
diff --git a/packages/java/tests/spring/native/frontend/views/AuthControl.tsx b/packages/java/tests/spring/native/frontend/views/AuthControl.tsx
index dac26aa713..d5b2c3f2fd 100644
--- a/packages/java/tests/spring/native/frontend/views/AuthControl.tsx
+++ b/packages/java/tests/spring/native/frontend/views/AuthControl.tsx
@@ -1,6 +1,6 @@
 import { AccessProps, AuthContext } from 'Frontend/useAuth.js';
 import { ReactNode, useContext } from 'react';
-import { Navigate, useMatches } from 'react-router-dom';
+import { Navigate, useMatches } from 'react-router';
 
 export type AuthControlProps = Readonly<{
   fallback?: ReactNode;
diff --git a/packages/java/tests/spring/native/frontend/views/MainLayout.tsx b/packages/java/tests/spring/native/frontend/views/MainLayout.tsx
index cc173c49be..e9e4404d83 100644
--- a/packages/java/tests/spring/native/frontend/views/MainLayout.tsx
+++ b/packages/java/tests/spring/native/frontend/views/MainLayout.tsx
@@ -7,7 +7,7 @@ import Placeholder from 'Frontend/components/placeholder/Placeholder';
 import { AuthContext } from 'Frontend/useAuth.js';
 import { useRouteMetadata } from 'Frontend/util/routing';
 import { Suspense, useContext } from 'react';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 
 const navLinkClasses = ({ isActive }: any) => {
   return `block rounded-m p-s ${isActive ? 'bg-primary-10 text-primary' : 'text-body'}`;
diff --git a/packages/java/tests/spring/native/pom.xml b/packages/java/tests/spring/native/pom.xml
index 611816a797..e065b452da 100644
--- a/packages/java/tests/spring/native/pom.xml
+++ b/packages/java/tests/spring/native/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-native</artifactId>
     <name>ITs for Hilla compiled to native</name>
diff --git a/packages/java/tests/spring/pom.xml b/packages/java/tests/spring/pom.xml
index 927f271c91..746cdf43e0 100644
--- a/packages/java/tests/spring/pom.xml
+++ b/packages/java/tests/spring/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>tests-spring</artifactId>
diff --git a/packages/java/tests/spring/react-grid-test/frontend/App.tsx b/packages/java/tests/spring/react-grid-test/frontend/App.tsx
index 6b7546d1ed..b84dcf6ea7 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/App.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/App.tsx
@@ -1,5 +1,5 @@
 import router from 'Frontend/routes.js';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   return <RouterProvider router={router} />;
diff --git a/packages/java/tests/spring/react-grid-test/frontend/MainLayout.tsx b/packages/java/tests/spring/react-grid-test/frontend/MainLayout.tsx
index 779dbd23bb..91a331da81 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/MainLayout.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/MainLayout.tsx
@@ -2,7 +2,7 @@ import { AppLayout } from '@vaadin/react-components/AppLayout.js';
 import { DrawerToggle } from '@vaadin/react-components/DrawerToggle.js';
 import { Scroller } from '@vaadin/react-components/Scroller.js';
 import { routes } from 'Frontend/routes.js';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 
 export default function MainLayout() {
   const menuRoutes = routes[0]!.children;
diff --git a/packages/java/tests/spring/react-grid-test/frontend/routes.tsx b/packages/java/tests/spring/react-grid-test/frontend/routes.tsx
index 669155f6b8..d22e2791e0 100644
--- a/packages/java/tests/spring/react-grid-test/frontend/routes.tsx
+++ b/packages/java/tests/spring/react-grid-test/frontend/routes.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router';
 import MainLayout from './MainLayout.js';
 import { AutoCrudView } from 'Frontend/views/AutoCrudView.js';
 import { AutoFormView } from 'Frontend/views/AutoFormView.js';
diff --git a/packages/java/tests/spring/react-grid-test/package-lock.json b/packages/java/tests/spring/react-grid-test/package-lock.json
index 85047eb4a7..0032ae333b 100644
--- a/packages/java/tests/spring/react-grid-test/package-lock.json
+++ b/packages/java/tests/spring/react-grid-test/package-lock.json
@@ -28,14 +28,14 @@
         "lit": "3.2.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
-        "react-router-dom": "6.28.0"
+        "react-router": "7.0.2"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
-        "@types/react": "18.3.12",
+        "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
@@ -55,7 +55,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -64,12 +64,12 @@
     },
     "../../../../ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-react-auth": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "react": "^18.2.0",
         "rollup": "^4.12.0",
         "typescript": "5.6.2"
@@ -95,12 +95,13 @@
       },
       "peerDependencies": {
         "react": "^18.2.0",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18.2.0",
+        "react-router": "^7"
       }
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -131,12 +132,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -150,7 +151,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -169,12 +170,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -201,13 +202,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -218,8 +219,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -237,13 +238,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -252,8 +253,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -271,12 +272,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -285,7 +286,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -303,14 +304,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -321,8 +322,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -340,13 +341,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -357,8 +358,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -376,14 +377,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -395,8 +396,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -413,14 +414,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -431,9 +432,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -451,7 +452,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -482,10 +483,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -507,10 +508,10 @@
     },
     "../../../../ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5"
+        "@vaadin/hilla-frontend": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -526,23 +527,25 @@
         "@types/validator": "^13.11.2",
         "@web/test-runner": "^0.19.0",
         "chai-dom": "^1.11.0",
+        "react-router": "^7.0.2",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
         "typescript": "5.6.2"
       },
       "peerDependencies": {
         "react": "^18",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18",
+        "react-router": "^7"
       }
     },
     "../../../../ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
-        "@vaadin/hilla-react-form": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+        "@vaadin/hilla-react-form": "24.7.0-alpha0",
         "@vaadin/react-components": "24.6.0-rc1"
       },
       "devDependencies": {
@@ -572,10 +575,10 @@
     },
     "../../../../ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.0-beta5"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -602,11 +605,11 @@
     },
     "../../../../ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "intl-messageformat": "^10.5.11"
       },
       "devDependencies": {
@@ -635,11 +638,11 @@
     },
     "../../../../ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^2.0.0",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "nanoid": "^5.0.7"
       },
       "devDependencies": {
@@ -2389,9 +2392,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -3101,14 +3104,6 @@
         "react": "^16.14.0 || 17.x || 18.x"
       }
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
-      "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "15.2.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
@@ -3507,6 +3502,11 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -3530,9 +3530,9 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/react": {
-      "version": "18.3.12",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
-      "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
+      "version": "18.3.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.13.tgz",
+      "integrity": "sha512-ii/gswMmOievxAJed4PAHT949bpYjPKXvXo1v6cRB/kqc2ZR4n+SgyCyvyc5Fec5ez8VnUumI1Vk7j6fRyRogg==",
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -5640,6 +5640,14 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
+    "node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/cookieconsent": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/cookieconsent/-/cookieconsent-3.1.1.tgz",
@@ -7645,33 +7653,26 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz",
-      "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz",
+      "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==",
       "dependencies": {
-        "@remix-run/router": "1.21.0"
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz",
-      "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==",
-      "dependencies": {
-        "@remix-run/router": "1.21.0",
-        "react-router": "6.28.0"
+        "react": ">=18",
+        "react-dom": ">=18"
       },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/readdirp": {
@@ -8009,6 +8010,11 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
+    },
     "node_modules/set-function-length": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
@@ -8527,6 +8533,11 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="
+    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -8761,9 +8772,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/react-grid-test/package.json b/packages/java/tests/spring/react-grid-test/package.json
index 761cd7259d..28fc7969f4 100644
--- a/packages/java/tests/spring/react-grid-test/package.json
+++ b/packages/java/tests/spring/react-grid-test/package.json
@@ -25,14 +25,14 @@
     "lit": "3.2.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.28.0"
+    "react-router": "7.0.2"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
-    "@types/react": "18.3.12",
+    "@types/react": "18.3.13",
     "@types/react-dom": "18.3.1",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
@@ -52,7 +52,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -63,14 +63,14 @@
       "@polymer/polymer": "3.5.2",
       "@vaadin/bundles": "24.6.0-rc1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.6.0-beta5",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
-      "@vaadin/hilla-react-auth": "24.6.0-beta5",
-      "@vaadin/hilla-react-crud": "24.6.0-beta5",
-      "@vaadin/hilla-react-form": "24.6.0-beta5",
-      "@vaadin/hilla-react-i18n": "24.6.0-beta5",
-      "@vaadin/hilla-react-signals": "24.6.0-beta5",
+      "@vaadin/hilla-file-router": "24.7.0-alpha0",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha0",
+      "@vaadin/hilla-react-form": "24.7.0-alpha0",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha0",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha0",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
       "@vaadin/react-components": "24.6.0-rc1",
       "@vaadin/react-components-pro": "24.6.0-rc1",
@@ -82,25 +82,25 @@
       "lit": "3.2.1",
       "react": "18.3.1",
       "react-dom": "18.3.1",
-      "react-router-dom": "6.28.0"
+      "react-router": "7.0.2"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@types/react": "18.3.12",
+      "@types/react": "18.3.13",
       "@types/react-dom": "18.3.1",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -109,13 +109,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "4a0e644ade57696a58d49b3bf58cf40efec3710a6a05bf715bd7501fe008cde5"
+    "hash": "5802ea7cafdaa7a5efea4e314ddc69fe6be2da5122e1fb1fb9cfc460a8c0ce24"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
@@ -133,7 +133,6 @@
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-react-form": "$@vaadin/hilla-react-form",
     "@vaadin/hilla-react-crud": "$@vaadin/hilla-react-crud",
-    "react-router-dom": "$react-router-dom",
     "@vaadin/hilla-react-auth": "$@vaadin/hilla-react-auth",
     "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-plugin-subtypes": "$@vaadin/hilla-generator-plugin-subtypes",
@@ -148,6 +147,7 @@
     "@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
     "@vaadin/react-components-pro": "$@vaadin/react-components-pro",
     "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
-    "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles"
+    "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
+    "react-router": "$react-router"
   }
 }
diff --git a/packages/java/tests/spring/react-grid-test/pom.xml b/packages/java/tests/spring/react-grid-test/pom.xml
index bbe7cadbc8..aa1b6a528a 100644
--- a/packages/java/tests/spring/react-grid-test/pom.xml
+++ b/packages/java/tests/spring/react-grid-test/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-react-grid</artifactId>
     <name>ITs for React Auto Grid</name>
diff --git a/packages/java/tests/spring/react-i18n/frontend/App.tsx b/packages/java/tests/spring/react-i18n/frontend/App.tsx
index 6b7546d1ed..b84dcf6ea7 100644
--- a/packages/java/tests/spring/react-i18n/frontend/App.tsx
+++ b/packages/java/tests/spring/react-i18n/frontend/App.tsx
@@ -1,5 +1,5 @@
 import router from 'Frontend/routes.js';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 
 export default function App() {
   return <RouterProvider router={router} />;
diff --git a/packages/java/tests/spring/react-i18n/frontend/MainLayout.tsx b/packages/java/tests/spring/react-i18n/frontend/MainLayout.tsx
index 779dbd23bb..91a331da81 100644
--- a/packages/java/tests/spring/react-i18n/frontend/MainLayout.tsx
+++ b/packages/java/tests/spring/react-i18n/frontend/MainLayout.tsx
@@ -2,7 +2,7 @@ import { AppLayout } from '@vaadin/react-components/AppLayout.js';
 import { DrawerToggle } from '@vaadin/react-components/DrawerToggle.js';
 import { Scroller } from '@vaadin/react-components/Scroller.js';
 import { routes } from 'Frontend/routes.js';
-import { NavLink, Outlet } from 'react-router-dom';
+import { NavLink, Outlet } from 'react-router';
 
 export default function MainLayout() {
   const menuRoutes = routes[0]!.children;
diff --git a/packages/java/tests/spring/react-i18n/frontend/routes.tsx b/packages/java/tests/spring/react-i18n/frontend/routes.tsx
index 6e3ff2e25c..79d9fc95d7 100644
--- a/packages/java/tests/spring/react-i18n/frontend/routes.tsx
+++ b/packages/java/tests/spring/react-i18n/frontend/routes.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router';
 import MainLayout from './MainLayout.js';
 import BasicI18NView from './_views/BasicI18NView';
 export const routes = [
diff --git a/packages/java/tests/spring/react-i18n/package-lock.json b/packages/java/tests/spring/react-i18n/package-lock.json
index dac86e8482..9a8c1413aa 100644
--- a/packages/java/tests/spring/react-i18n/package-lock.json
+++ b/packages/java/tests/spring/react-i18n/package-lock.json
@@ -28,14 +28,14 @@
         "lit": "3.2.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
-        "react-router-dom": "6.28.0"
+        "react-router": "7.0.2"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
-        "@types/react": "18.3.12",
+        "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
@@ -55,7 +55,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -96,12 +96,12 @@
     },
     "../../../../ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-react-auth": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "react": "^18.2.0",
         "rollup": "^4.12.0",
         "typescript": "5.6.2"
@@ -127,12 +127,13 @@
       },
       "peerDependencies": {
         "react": "^18.2.0",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18.2.0",
+        "react-router": "^7"
       }
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -163,12 +164,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -182,7 +183,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -201,12 +202,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -233,13 +234,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -250,8 +251,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -269,13 +270,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -284,8 +285,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -303,12 +304,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -317,7 +318,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -335,14 +336,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -353,8 +354,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -372,13 +373,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -389,8 +390,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -408,14 +409,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -427,8 +428,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -445,14 +446,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -463,9 +464,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -483,7 +484,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -514,10 +515,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -539,10 +540,10 @@
     },
     "../../../../ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5"
+        "@vaadin/hilla-frontend": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -558,23 +559,25 @@
         "@types/validator": "^13.11.2",
         "@web/test-runner": "^0.19.0",
         "chai-dom": "^1.11.0",
+        "react-router": "^7.0.2",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
         "typescript": "5.6.2"
       },
       "peerDependencies": {
         "react": "^18",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18",
+        "react-router": "^7"
       }
     },
     "../../../../ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
-        "@vaadin/hilla-react-form": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+        "@vaadin/hilla-react-form": "24.7.0-alpha0",
         "@vaadin/react-components": "24.6.0-rc1"
       },
       "devDependencies": {
@@ -604,10 +607,10 @@
     },
     "../../../../ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.0-beta5"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -634,11 +637,11 @@
     },
     "../../../../ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "intl-messageformat": "^10.5.11"
       },
       "devDependencies": {
@@ -667,11 +670,11 @@
     },
     "../../../../ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^2.0.0",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "nanoid": "^5.0.7"
       },
       "devDependencies": {
@@ -2421,9 +2424,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -3133,14 +3136,6 @@
         "react": "^16.14.0 || 17.x || 18.x"
       }
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
-      "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "15.2.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
@@ -3539,6 +3534,11 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -3562,9 +3562,9 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/react": {
-      "version": "18.3.12",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
-      "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
+      "version": "18.3.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.13.tgz",
+      "integrity": "sha512-ii/gswMmOievxAJed4PAHT949bpYjPKXvXo1v6cRB/kqc2ZR4n+SgyCyvyc5Fec5ez8VnUumI1Vk7j6fRyRogg==",
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -5668,6 +5668,14 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
+    "node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/cookieconsent": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/cookieconsent/-/cookieconsent-3.1.1.tgz",
@@ -7647,33 +7655,26 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz",
-      "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz",
+      "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==",
       "dependencies": {
-        "@remix-run/router": "1.21.0"
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz",
-      "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==",
-      "dependencies": {
-        "@remix-run/router": "1.21.0",
-        "react-router": "6.28.0"
+        "react": ">=18",
+        "react-dom": ">=18"
       },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/readdirp": {
@@ -8010,6 +8011,11 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
+    },
     "node_modules/set-function-length": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
@@ -8527,6 +8533,11 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="
+    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -8760,9 +8771,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/react-i18n/package.json b/packages/java/tests/spring/react-i18n/package.json
index 543446b0b0..830b2a8212 100644
--- a/packages/java/tests/spring/react-i18n/package.json
+++ b/packages/java/tests/spring/react-i18n/package.json
@@ -25,14 +25,14 @@
     "lit": "3.2.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.28.0"
+    "react-router": "7.0.2"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
-    "@types/react": "18.3.12",
+    "@types/react": "18.3.13",
     "@types/react-dom": "18.3.1",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
@@ -52,7 +52,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -63,14 +63,14 @@
       "@polymer/polymer": "3.5.2",
       "@vaadin/bundles": "24.6.0-rc1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.6.0-beta5",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
-      "@vaadin/hilla-react-auth": "24.6.0-beta5",
-      "@vaadin/hilla-react-crud": "24.6.0-beta5",
-      "@vaadin/hilla-react-form": "24.6.0-beta5",
-      "@vaadin/hilla-react-i18n": "24.6.0-beta5",
-      "@vaadin/hilla-react-signals": "24.6.0-beta5",
+      "@vaadin/hilla-file-router": "24.7.0-alpha0",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha0",
+      "@vaadin/hilla-react-form": "24.7.0-alpha0",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha0",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha0",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
       "@vaadin/react-components": "24.6.0-rc1",
       "@vaadin/react-components-pro": "24.6.0-rc1",
@@ -82,25 +82,25 @@
       "lit": "3.2.1",
       "react": "18.3.1",
       "react-dom": "18.3.1",
-      "react-router-dom": "6.28.0"
+      "react-router": "7.0.2"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@types/react": "18.3.12",
+      "@types/react": "18.3.13",
       "@types/react-dom": "18.3.1",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -109,13 +109,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "4a0e644ade57696a58d49b3bf58cf40efec3710a6a05bf715bd7501fe008cde5"
+    "hash": "5802ea7cafdaa7a5efea4e314ddc69fe6be2da5122e1fb1fb9cfc460a8c0ce24"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
@@ -133,7 +133,6 @@
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-react-form": "$@vaadin/hilla-react-form",
     "@vaadin/hilla-react-crud": "$@vaadin/hilla-react-crud",
-    "react-router-dom": "$react-router-dom",
     "@vaadin/hilla-react-auth": "$@vaadin/hilla-react-auth",
     "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-plugin-subtypes": "$@vaadin/hilla-generator-plugin-subtypes",
@@ -149,6 +148,7 @@
     "@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
     "@vaadin/react-components-pro": "$@vaadin/react-components-pro",
     "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
-    "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles"
+    "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
+    "react-router": "$react-router"
   }
 }
diff --git a/packages/java/tests/spring/react-i18n/pom.xml b/packages/java/tests/spring/react-i18n/pom.xml
index ba9069d9f5..d7dfd0ae8f 100644
--- a/packages/java/tests/spring/react-i18n/pom.xml
+++ b/packages/java/tests/spring/react-i18n/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-react-i18n</artifactId>
     <name>ITs for React I18N</name>
diff --git a/packages/java/tests/spring/react-signals/frontend/index.tsx b/packages/java/tests/spring/react-signals/frontend/index.tsx
index cd303c7cf9..8c2c5f76b8 100644
--- a/packages/java/tests/spring/react-signals/frontend/index.tsx
+++ b/packages/java/tests/spring/react-signals/frontend/index.tsx
@@ -12,7 +12,7 @@
 
 import { createElement } from 'react';
 import { createRoot } from 'react-dom/client';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 import { router } from 'Frontend/generated/routes.js';
 import { AuthProvider } from 'Frontend/util/auth';
 
diff --git a/packages/java/tests/spring/react-signals/frontend/views/SharedSignalSecurity.tsx b/packages/java/tests/spring/react-signals/frontend/views/SharedSignalSecurity.tsx
index 588325b153..5d34d53819 100644
--- a/packages/java/tests/spring/react-signals/frontend/views/SharedSignalSecurity.tsx
+++ b/packages/java/tests/spring/react-signals/frontend/views/SharedSignalSecurity.tsx
@@ -2,7 +2,7 @@ import { Button } from '@vaadin/react-components';
 import { useSignal } from '@vaadin/hilla-react-signals';
 import { SecureNumberSignalService } from 'Frontend/generated/endpoints.js';
 import { useAuth } from 'Frontend/util/auth.js';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 const userCounter = SecureNumberSignalService.userCounter();
 const adminCounter = SecureNumberSignalService.adminCounter();
diff --git a/packages/java/tests/spring/react-signals/package-lock.json b/packages/java/tests/spring/react-signals/package-lock.json
index bf9f292fe8..ce4ea2cdfd 100644
--- a/packages/java/tests/spring/react-signals/package-lock.json
+++ b/packages/java/tests/spring/react-signals/package-lock.json
@@ -28,14 +28,14 @@
         "lit": "3.2.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
-        "react-router-dom": "6.28.0"
+        "react-router": "7.0.2"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
-        "@types/react": "18.3.12",
+        "@types/react": "18.3.13",
         "@types/react-dom": "18.3.1",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
@@ -55,7 +55,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -64,12 +64,12 @@
     },
     "../../../../ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-react-auth": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "react": "^18.2.0",
         "rollup": "^4.12.0",
         "typescript": "5.6.2"
@@ -95,12 +95,13 @@
       },
       "peerDependencies": {
         "react": "^18.2.0",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18.2.0",
+        "react-router": "^7"
       }
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -131,12 +132,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -150,7 +151,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -169,12 +170,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -201,13 +202,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -218,8 +219,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -237,13 +238,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -252,8 +253,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -271,12 +272,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -285,7 +286,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -303,14 +304,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -321,8 +322,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -340,13 +341,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -357,8 +358,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -376,14 +377,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -395,8 +396,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -413,14 +414,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -431,9 +432,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -451,7 +452,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -482,10 +483,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -507,10 +508,10 @@
     },
     "../../../../ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5"
+        "@vaadin/hilla-frontend": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -526,23 +527,25 @@
         "@types/validator": "^13.11.2",
         "@web/test-runner": "^0.19.0",
         "chai-dom": "^1.11.0",
+        "react-router": "^7.0.2",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
         "typescript": "5.6.2"
       },
       "peerDependencies": {
         "react": "^18",
-        "react-router-dom": "^6.28.0"
+        "react-dom": "^18",
+        "react-router": "^7"
       }
     },
     "../../../../ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
-        "@vaadin/hilla-react-form": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+        "@vaadin/hilla-react-form": "24.7.0-alpha0",
         "@vaadin/react-components": "24.6.0-rc1"
       },
       "devDependencies": {
@@ -572,10 +575,10 @@
     },
     "../../../../ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.0-beta5"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -602,11 +605,11 @@
     },
     "../../../../ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
-        "@vaadin/hilla-react-signals": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha0",
         "intl-messageformat": "^10.5.11"
       },
       "devDependencies": {
@@ -635,11 +638,11 @@
     },
     "../../../../ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^2.0.0",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "nanoid": "^5.0.7"
       },
       "devDependencies": {
@@ -2389,9 +2392,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -3101,14 +3104,6 @@
         "react": "^16.14.0 || 17.x || 18.x"
       }
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
-      "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "15.2.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
@@ -3507,6 +3502,11 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -3530,9 +3530,9 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/react": {
-      "version": "18.3.12",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz",
-      "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==",
+      "version": "18.3.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.13.tgz",
+      "integrity": "sha512-ii/gswMmOievxAJed4PAHT949bpYjPKXvXo1v6cRB/kqc2ZR4n+SgyCyvyc5Fec5ez8VnUumI1Vk7j6fRyRogg==",
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -5636,6 +5636,14 @@
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true
     },
+    "node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/cookieconsent": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/cookieconsent/-/cookieconsent-3.1.1.tgz",
@@ -7615,33 +7623,26 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz",
-      "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.0.2.tgz",
+      "integrity": "sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==",
       "dependencies": {
-        "@remix-run/router": "1.21.0"
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz",
-      "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==",
-      "dependencies": {
-        "@remix-run/router": "1.21.0",
-        "react-router": "6.28.0"
+        "react": ">=18",
+        "react-dom": ">=18"
       },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/readdirp": {
@@ -7978,6 +7979,11 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
+    },
     "node_modules/set-function-length": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz",
@@ -8495,6 +8501,11 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="
+    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -8728,9 +8739,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/react-signals/package.json b/packages/java/tests/spring/react-signals/package.json
index 9afcb88b46..9cc51faa7d 100644
--- a/packages/java/tests/spring/react-signals/package.json
+++ b/packages/java/tests/spring/react-signals/package.json
@@ -25,14 +25,14 @@
     "lit": "3.2.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.28.0"
+    "react-router": "7.0.2"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
-    "@types/react": "18.3.12",
+    "@types/react": "18.3.13",
     "@types/react-dom": "18.3.1",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
@@ -52,7 +52,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -63,14 +63,14 @@
       "@polymer/polymer": "3.5.2",
       "@vaadin/bundles": "24.6.0-rc1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.6.0-beta5",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
-      "@vaadin/hilla-react-auth": "24.6.0-beta5",
-      "@vaadin/hilla-react-crud": "24.6.0-beta5",
-      "@vaadin/hilla-react-form": "24.6.0-beta5",
-      "@vaadin/hilla-react-i18n": "24.6.0-beta5",
-      "@vaadin/hilla-react-signals": "24.6.0-beta5",
+      "@vaadin/hilla-file-router": "24.7.0-alpha0",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha0",
+      "@vaadin/hilla-react-form": "24.7.0-alpha0",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha0",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha0",
       "@vaadin/polymer-legacy-adapter": "24.6.0-rc1",
       "@vaadin/react-components": "24.6.0-rc1",
       "@vaadin/react-components-pro": "24.6.0-rc1",
@@ -82,25 +82,25 @@
       "lit": "3.2.1",
       "react": "18.3.1",
       "react-dom": "18.3.1",
-      "react-router-dom": "6.28.0"
+      "react-router": "7.0.2"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@types/react": "18.3.12",
+      "@types/react": "18.3.13",
       "@types/react-dom": "18.3.1",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -109,13 +109,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "4a0e644ade57696a58d49b3bf58cf40efec3710a6a05bf715bd7501fe008cde5"
+    "hash": "5802ea7cafdaa7a5efea4e314ddc69fe6be2da5122e1fb1fb9cfc460a8c0ce24"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
@@ -133,7 +133,6 @@
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-react-form": "$@vaadin/hilla-react-form",
     "@vaadin/hilla-react-crud": "$@vaadin/hilla-react-crud",
-    "react-router-dom": "$react-router-dom",
     "@vaadin/hilla-react-auth": "$@vaadin/hilla-react-auth",
     "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-plugin-subtypes": "$@vaadin/hilla-generator-plugin-subtypes",
@@ -149,6 +148,7 @@
     "@vaadin/hilla-react-i18n": "$@vaadin/hilla-react-i18n",
     "@vaadin/react-components-pro": "$@vaadin/react-components-pro",
     "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
-    "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles"
+    "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
+    "react-router": "$react-router"
   }
 }
diff --git a/packages/java/tests/spring/react-signals/pom.xml b/packages/java/tests/spring/react-signals/pom.xml
index 3160e644d3..d89af21472 100644
--- a/packages/java/tests/spring/react-signals/pom.xml
+++ b/packages/java/tests/spring/react-signals/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-react-signals</artifactId>
     <name>ITs for React Signals</name>
diff --git a/packages/java/tests/spring/security-contextpath/package-lock.json b/packages/java/tests/spring/security-contextpath/package-lock.json
index ed359602e2..20dee1b914 100644
--- a/packages/java/tests/spring/security-contextpath/package-lock.json
+++ b/packages/java/tests/spring/security-contextpath/package-lock.json
@@ -92,7 +92,7 @@
         "mobx": "6.3.3"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -114,7 +114,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -123,7 +123,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -154,12 +154,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -173,7 +173,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -192,12 +192,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -224,13 +224,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -241,8 +241,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -260,13 +260,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -275,8 +275,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -294,12 +294,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -308,7 +308,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -326,14 +326,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -344,8 +344,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -363,13 +363,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -380,8 +380,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -399,14 +399,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -418,8 +418,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -436,14 +436,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -454,9 +454,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -474,7 +474,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -531,10 +531,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2329,9 +2329,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -8622,9 +8622,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -10634,9 +10634,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -11953,8 +11953,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -11979,7 +11979,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12002,9 +12002,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12028,9 +12028,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12052,8 +12052,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12075,11 +12075,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12103,9 +12103,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12129,10 +12129,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12156,10 +12156,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12208,7 +12208,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -15228,9 +15228,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/security-contextpath/package.json b/packages/java/tests/spring/security-contextpath/package.json
index 7c721ff89f..e1f80f66c3 100644
--- a/packages/java/tests/spring/security-contextpath/package.json
+++ b/packages/java/tests/spring/security-contextpath/package.json
@@ -89,7 +89,7 @@
     "mobx": "6.3.3"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -111,7 +111,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -151,8 +151,8 @@
       "@vaadin/form-layout": "24.6.0-rc1",
       "@vaadin/grid": "24.6.0-rc1",
       "@vaadin/grid-pro": "24.6.0-rc1",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/horizontal-layout": "24.6.0-rc1",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
@@ -200,20 +200,20 @@
       "mobx": "6.3.3"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -222,13 +222,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "52b64956c255a88c0f4a97ac52ae9216c97f96d51f1eb7ac844bd90b7d8a246a"
+    "hash": "50a37413a924e55195d1cd13beda79f08fed0b36c28ac93a8053272a2eb23312"
   },
   "overrides": {
     "@vaadin/icon": "$@vaadin/icon",
diff --git a/packages/java/tests/spring/security-contextpath/pom.xml b/packages/java/tests/spring/security-contextpath/pom.xml
index ee041293d9..d005e7da16 100644
--- a/packages/java/tests/spring/security-contextpath/pom.xml
+++ b/packages/java/tests/spring/security-contextpath/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-security-contextpath</artifactId>
     <name>ITs for Vaadin Spring Security and Hilla / context path</name>
diff --git a/packages/java/tests/spring/security-jwt/package-lock.json b/packages/java/tests/spring/security-jwt/package-lock.json
index 379458e255..51ceef8227 100644
--- a/packages/java/tests/spring/security-jwt/package-lock.json
+++ b/packages/java/tests/spring/security-jwt/package-lock.json
@@ -92,7 +92,7 @@
         "mobx": "6.3.3"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -114,7 +114,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -123,7 +123,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -154,12 +154,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -173,7 +173,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -192,12 +192,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -224,13 +224,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -241,8 +241,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -260,13 +260,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -275,8 +275,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -294,12 +294,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -308,7 +308,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -326,14 +326,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -344,8 +344,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -363,13 +363,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -380,8 +380,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -399,14 +399,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -418,8 +418,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -436,14 +436,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -454,9 +454,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -474,7 +474,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -531,10 +531,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2329,9 +2329,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -8622,9 +8622,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -10634,9 +10634,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -11953,8 +11953,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -11979,7 +11979,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12002,9 +12002,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12028,9 +12028,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12052,8 +12052,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12075,11 +12075,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12103,9 +12103,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12129,10 +12129,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12156,10 +12156,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12208,7 +12208,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -15230,9 +15230,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/security-jwt/package.json b/packages/java/tests/spring/security-jwt/package.json
index e6fb838323..1684eaf15e 100644
--- a/packages/java/tests/spring/security-jwt/package.json
+++ b/packages/java/tests/spring/security-jwt/package.json
@@ -89,7 +89,7 @@
     "mobx": "6.3.3"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -111,7 +111,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -151,8 +151,8 @@
       "@vaadin/form-layout": "24.6.0-rc1",
       "@vaadin/grid": "24.6.0-rc1",
       "@vaadin/grid-pro": "24.6.0-rc1",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/horizontal-layout": "24.6.0-rc1",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
@@ -200,20 +200,20 @@
       "mobx": "6.3.3"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -222,13 +222,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "52b64956c255a88c0f4a97ac52ae9216c97f96d51f1eb7ac844bd90b7d8a246a"
+    "hash": "50a37413a924e55195d1cd13beda79f08fed0b36c28ac93a8053272a2eb23312"
   },
   "overrides": {
     "@vaadin/bundles": "$@vaadin/bundles",
diff --git a/packages/java/tests/spring/security-jwt/pom.xml b/packages/java/tests/spring/security-jwt/pom.xml
index bcac2fd4b8..b67f3cd995 100644
--- a/packages/java/tests/spring/security-jwt/pom.xml
+++ b/packages/java/tests/spring/security-jwt/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-security-jwt</artifactId>
     <name>ITs for Vaadin Spring Security and Hilla / JWT</name>
diff --git a/packages/java/tests/spring/security-urlmapping/package-lock.json b/packages/java/tests/spring/security-urlmapping/package-lock.json
index 793140877a..ccc87ee3b8 100644
--- a/packages/java/tests/spring/security-urlmapping/package-lock.json
+++ b/packages/java/tests/spring/security-urlmapping/package-lock.json
@@ -92,7 +92,7 @@
         "mobx": "6.3.3"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -114,7 +114,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -123,7 +123,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -154,12 +154,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -173,7 +173,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -192,12 +192,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -224,13 +224,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -241,8 +241,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -260,13 +260,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -275,8 +275,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -294,12 +294,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -308,7 +308,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -326,14 +326,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -344,8 +344,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -363,13 +363,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -380,8 +380,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -399,14 +399,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -418,8 +418,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -436,14 +436,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -454,9 +454,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -474,7 +474,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -531,10 +531,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2329,9 +2329,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -8614,9 +8614,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -10626,9 +10626,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -11929,8 +11929,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -11955,7 +11955,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11978,9 +11978,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12004,9 +12004,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12028,8 +12028,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12051,11 +12051,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12079,9 +12079,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12105,10 +12105,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12132,10 +12132,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12184,7 +12184,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -15206,9 +15206,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/security-urlmapping/package.json b/packages/java/tests/spring/security-urlmapping/package.json
index e6fb838323..1684eaf15e 100644
--- a/packages/java/tests/spring/security-urlmapping/package.json
+++ b/packages/java/tests/spring/security-urlmapping/package.json
@@ -89,7 +89,7 @@
     "mobx": "6.3.3"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -111,7 +111,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -151,8 +151,8 @@
       "@vaadin/form-layout": "24.6.0-rc1",
       "@vaadin/grid": "24.6.0-rc1",
       "@vaadin/grid-pro": "24.6.0-rc1",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/horizontal-layout": "24.6.0-rc1",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
@@ -200,20 +200,20 @@
       "mobx": "6.3.3"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -222,13 +222,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "52b64956c255a88c0f4a97ac52ae9216c97f96d51f1eb7ac844bd90b7d8a246a"
+    "hash": "50a37413a924e55195d1cd13beda79f08fed0b36c28ac93a8053272a2eb23312"
   },
   "overrides": {
     "@vaadin/bundles": "$@vaadin/bundles",
diff --git a/packages/java/tests/spring/security-urlmapping/pom.xml b/packages/java/tests/spring/security-urlmapping/pom.xml
index 5c2b0668e7..b29d21005e 100644
--- a/packages/java/tests/spring/security-urlmapping/pom.xml
+++ b/packages/java/tests/spring/security-urlmapping/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-security-urlmapping</artifactId>
     <name>ITs for Vaadin Spring Security and Hilla / URL mapping</name>
diff --git a/packages/java/tests/spring/security/package-lock.json b/packages/java/tests/spring/security/package-lock.json
index 62c5b54abd..29a81040cc 100644
--- a/packages/java/tests/spring/security/package-lock.json
+++ b/packages/java/tests/spring/security/package-lock.json
@@ -87,7 +87,7 @@
         "mobx": "6.3.3"
       },
       "devDependencies": {
-        "@babel/preset-react": "7.25.9",
+        "@babel/preset-react": "7.26.3",
         "@preact/signals-react-transform": "0.4.0",
         "@rollup/plugin-replace": "6.0.1",
         "@rollup/pluginutils": "5.1.3",
@@ -109,7 +109,7 @@
         "strip-css-comments": "5.0.0",
         "transform-ast": "2.4.4",
         "typescript": "5.7.2",
-        "vite": "6.0.2",
+        "vite": "6.0.3",
         "vite-plugin-checker": "0.8.0",
         "workbox-build": "7.3.0",
         "workbox-core": "7.3.0",
@@ -118,7 +118,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -149,12 +149,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -168,7 +168,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -187,12 +187,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -219,13 +219,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -236,8 +236,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -255,13 +255,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -270,8 +270,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -289,12 +289,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "typescript": "5.6.2"
       },
       "devDependencies": {
@@ -303,7 +303,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -321,14 +321,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -339,8 +339,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -358,13 +358,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -375,8 +375,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -394,14 +394,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -413,8 +413,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -431,14 +431,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.6.2"
@@ -449,9 +449,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -469,7 +469,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -526,10 +526,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.0-beta5",
+      "version": "24.7.0-alpha0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -2324,9 +2324,9 @@
       }
     },
     "node_modules/@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -8547,9 +8547,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.24.0",
@@ -10559,9 +10559,9 @@
       }
     },
     "@babel/preset-react": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.9.tgz",
-      "integrity": "sha512-D3to0uSPiWE7rBrdIICCd0tJSIGpLaaGptna2+w7Pft5xMqLpA1sz99DK5TZ1TjGbdQ/VI1eCSZ06dv3lT4JOw==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.26.3.tgz",
+      "integrity": "sha512-Nl03d6T9ky516DGK2YMxrTqvnpUW63TnJMOMonj+Zae0JiPC5BC9xPMSL6L8fiSpA5vP88qfygavVQvnLp+6Cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.25.9",
@@ -11808,8 +11808,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -11834,7 +11834,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11857,9 +11857,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11883,9 +11883,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11907,8 +11907,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11930,11 +11930,11 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-        "@vaadin/hilla-lit-form": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11958,9 +11958,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -11984,10 +11984,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12011,10 +12011,10 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-        "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-        "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -12063,7 +12063,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-frontend": "24.6.0-beta5",
+        "@vaadin/hilla-frontend": "24.7.0-alpha0",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -15083,9 +15083,9 @@
       }
     },
     "vite": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-      "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+      "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
       "dev": true,
       "requires": {
         "esbuild": "^0.24.0",
diff --git a/packages/java/tests/spring/security/package.json b/packages/java/tests/spring/security/package.json
index f9ac295aa8..fbbec4fbf6 100644
--- a/packages/java/tests/spring/security/package.json
+++ b/packages/java/tests/spring/security/package.json
@@ -84,7 +84,7 @@
     "mobx": "6.3.3"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.9",
+    "@babel/preset-react": "7.26.3",
     "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "6.0.1",
     "@rollup/pluginutils": "5.1.3",
@@ -106,7 +106,7 @@
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
     "typescript": "5.7.2",
-    "vite": "6.0.2",
+    "vite": "6.0.3",
     "vite-plugin-checker": "0.8.0",
     "workbox-build": "7.3.0",
     "workbox-core": "7.3.0",
@@ -146,8 +146,8 @@
       "@vaadin/form-layout": "24.6.0-rc1",
       "@vaadin/grid": "24.6.0-rc1",
       "@vaadin/grid-pro": "24.6.0-rc1",
-      "@vaadin/hilla-frontend": "24.6.0-beta5",
-      "@vaadin/hilla-lit-form": "24.6.0-beta5",
+      "@vaadin/hilla-frontend": "24.7.0-alpha0",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha0",
       "@vaadin/horizontal-layout": "24.6.0-rc1",
       "@vaadin/icon": "24.6.0-rc1",
       "@vaadin/icons": "24.6.0-rc1",
@@ -195,20 +195,20 @@
       "mobx": "6.3.3"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.9",
+      "@babel/preset-react": "7.26.3",
       "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "6.0.1",
       "@rollup/pluginutils": "5.1.3",
-      "@vaadin/hilla-generator-cli": "24.6.0-beta5",
-      "@vaadin/hilla-generator-core": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-barrel": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-push": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-signals": "24.6.0-beta5",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.6.0-beta5",
-      "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha0",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "10.4.5",
@@ -217,13 +217,13 @@
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
       "typescript": "5.7.2",
-      "vite": "6.0.2",
+      "vite": "6.0.3",
       "vite-plugin-checker": "0.8.0",
       "workbox-build": "7.3.0",
       "workbox-core": "7.3.0",
       "workbox-precaching": "7.3.0"
     },
-    "hash": "9d0886170a4d89ad054679930244c549d69e9add290df250458d9a72d627baa6"
+    "hash": "d9df3e9a89a55cd25bd95ac2d4e0cf0c052f29d57fb0b0051d3b95d25accc654"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
diff --git a/packages/java/tests/spring/security/pom.xml b/packages/java/tests/spring/security/pom.xml
index 95485f08ef..f6d85ea205 100644
--- a/packages/java/tests/spring/security/pom.xml
+++ b/packages/java/tests/spring/security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>tests-spring</artifactId>
-        <version>24.6-SNAPSHOT</version>
+        <version>24.7-SNAPSHOT</version>
     </parent>
     <artifactId>tests-spring-security</artifactId>
     <name>ITs for Vaadin Spring Security and Hilla</name>
diff --git a/packages/ts/file-router/package.json b/packages/ts/file-router/package.json
index dde7782914..21c750e520 100644
--- a/packages/ts/file-router/package.json
+++ b/packages/ts/file-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-file-router",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla file-based router",
   "main": "index.js",
   "module": "index.js",
@@ -58,7 +58,8 @@
   },
   "peerDependencies": {
     "react": "^18.2.0",
-    "react-router-dom": "^6.28.0"
+    "react-dom": "^18.2.0",
+    "react-router": "^7"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -81,8 +82,9 @@
     "type-fest": "^4.9.0"
   },
   "dependencies": {
-    "@vaadin/hilla-react-auth": "24.6.0-beta5",
-    "@vaadin/hilla-react-signals": "24.6.0-beta5",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+    "@vaadin/hilla-react-auth": "24.7.0-alpha0",
+    "@vaadin/hilla-react-signals": "24.7.0-alpha0",
     "react": "^18.2.0",
     "rollup": "^4.12.0",
     "typescript": "5.6.2"
diff --git a/packages/ts/file-router/src/runtime/RouterConfigurationBuilder.ts b/packages/ts/file-router/src/runtime/RouterConfigurationBuilder.ts
index 9752c01c6e..d89856ffdd 100644
--- a/packages/ts/file-router/src/runtime/RouterConfigurationBuilder.ts
+++ b/packages/ts/file-router/src/runtime/RouterConfigurationBuilder.ts
@@ -1,12 +1,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-assertions */
 import { protectRoute } from '@vaadin/hilla-react-auth';
 import { type ComponentType, createElement } from 'react';
-import {
-  createBrowserRouter,
-  type IndexRouteObject,
-  type NonIndexRouteObject,
-  type RouteObject,
-} from 'react-router-dom';
+import { createBrowserRouter, type IndexRouteObject, type NonIndexRouteObject, type RouteObject } from 'react-router';
 import { convertComponentNameToTitle } from '../shared/convertComponentNameToTitle.js';
 import { transformTree } from '../shared/transformTree.js';
 import type {
@@ -428,22 +423,7 @@ export class RouterConfigurationBuilder {
 
     return {
       routes,
-      router: createBrowserRouter([...routes], {
-        basename: new URL(document.baseURI).pathname,
-        future: {
-          // eslint-disable-next-line camelcase
-          v7_fetcherPersist: true,
-          // eslint-disable-next-line camelcase
-          v7_normalizeFormMethod: true,
-          // eslint-disable-next-line camelcase
-          v7_partialHydration: true,
-          // eslint-disable-next-line camelcase
-          v7_relativeSplatPath: true,
-          // eslint-disable-next-line camelcase
-          v7_skipActionErrorRevalidation: true,
-        },
-        ...options,
-      }),
+      router: createBrowserRouter([...routes], { basename: new URL(document.baseURI).pathname, ...options }),
     };
   }
 
diff --git a/packages/ts/file-router/src/runtime/useViewConfig.ts b/packages/ts/file-router/src/runtime/useViewConfig.ts
index 5f94bc0bb7..5e9e2acac5 100644
--- a/packages/ts/file-router/src/runtime/useViewConfig.ts
+++ b/packages/ts/file-router/src/runtime/useViewConfig.ts
@@ -1,5 +1,5 @@
-import type { UIMatch } from '@remix-run/router';
-import { useMatches } from 'react-router-dom';
+import type { UIMatch } from 'react-router';
+import { useMatches } from 'react-router';
 import type { ViewConfig } from '../types.js';
 
 /**
diff --git a/packages/ts/file-router/src/types.d.ts b/packages/ts/file-router/src/types.d.ts
index 1840180676..6ed24949f8 100644
--- a/packages/ts/file-router/src/types.d.ts
+++ b/packages/ts/file-router/src/types.d.ts
@@ -1,4 +1,4 @@
-import type { createBrowserRouter, RouteObject } from 'react-router-dom';
+import type { createBrowserRouter, RouteObject } from 'react-router';
 
 export type ViewConfig = Readonly<{
   /**
diff --git a/packages/ts/file-router/test/mocks/react-router-dom.ts b/packages/ts/file-router/test/mocks/react-router-dom.ts
deleted file mode 100644
index 0ffd68daef..0000000000
--- a/packages/ts/file-router/test/mocks/react-router-dom.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import sinon from 'sinon';
-
-export const browserRouter = { 'browser-router': true };
-
-export const createBrowserRouter = sinon.stub().returns(browserRouter);
diff --git a/packages/ts/file-router/test/runtime/RouterConfigurationBuilder.spec.tsx b/packages/ts/file-router/test/runtime/RouterConfigurationBuilder.spec.tsx
index 3456f9b506..780695f8b6 100644
--- a/packages/ts/file-router/test/runtime/RouterConfigurationBuilder.spec.tsx
+++ b/packages/ts/file-router/test/runtime/RouterConfigurationBuilder.spec.tsx
@@ -5,7 +5,6 @@ import { createElement } from 'react';
 import sinonChai from 'sinon-chai';
 import { RouterConfigurationBuilder } from '../../src/runtime/RouterConfigurationBuilder.js';
 import { mockDocumentBaseURI } from '../mocks/dom.js';
-import { browserRouter, createBrowserRouter } from '../mocks/react-router-dom.js';
 import { protectRoute } from '../mocks/vaadin-hilla-react-auth.js';
 
 use(chaiLooseDeepEqual);
@@ -45,6 +44,10 @@ describe('RouterBuilder', () => {
       },
     ]);
     reset = mockDocumentBaseURI('https://example.com/foo');
+    // @ts-expect-error Fake just enough so tests pass
+    globalThis.window = { history: { replaceState: () => {} }, location: '', addEventListener: () => {} };
+    // @ts-expect-error Fake just enough so tests pass
+    globalThis.document.defaultView = globalThis.window;
   });
 
   afterEach(() => {
diff --git a/packages/ts/frontend/package.json b/packages/ts/frontend/package.json
index 0ae139c8ef..79b800d066 100644
--- a/packages/ts/frontend/package.json
+++ b/packages/ts/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-frontend",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla core frontend utils",
   "main": "index.js",
   "module": "index.js",
diff --git a/packages/ts/generator-cli/package.json b/packages/ts/generator-cli/package.json
index 94ada077b1..03320600aa 100644
--- a/packages/ts/generator-cli/package.json
+++ b/packages/ts/generator-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-cli",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -45,8 +45,8 @@
     "tsgen": "bin/index.js"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "get-stdin": "^9.0.0",
     "meow": "^12.1.1"
   },
@@ -57,7 +57,7 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
diff --git a/packages/ts/generator-core/package.json b/packages/ts/generator-core/package.json
index 2c488e4cc0..e5a5b00db5 100644
--- a/packages/ts/generator-core/package.json
+++ b/packages/ts/generator-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-core",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "meow": "^12.1.1",
     "openapi-types": "^12.1.3",
     "typescript": "5.6.2"
diff --git a/packages/ts/generator-plugin-backbone/package.json b/packages/ts/generator-plugin-backbone/package.json
index 45112f17ae..17e9e2764d 100644
--- a/packages/ts/generator-plugin-backbone/package.json
+++ b/packages/ts/generator-plugin-backbone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-backbone",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to generate basic code",
   "main": "index.js",
   "type": "module",
@@ -51,9 +51,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.6.2"
@@ -64,8 +64,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-barrel/package.json b/packages/ts/generator-plugin-barrel/package.json
index 61e6f0f588..c92d6bf827 100644
--- a/packages/ts/generator-plugin-barrel/package.json
+++ b/packages/ts/generator-plugin-barrel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-barrel",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to generate barrel file",
   "main": "index.js",
   "type": "module",
@@ -51,9 +51,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "typescript": "5.6.2"
   },
   "devDependencies": {
@@ -62,8 +62,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-client/package.json b/packages/ts/generator-plugin-client/package.json
index 7892213a15..4f77605679 100644
--- a/packages/ts/generator-plugin-client/package.json
+++ b/packages/ts/generator-plugin-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-client",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to generate default client implementation",
   "main": "index.js",
   "type": "module",
@@ -51,8 +51,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "typescript": "5.6.2"
   },
   "devDependencies": {
@@ -61,7 +61,7 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-model/package.json b/packages/ts/generator-plugin-model/package.json
index 5320c647be..ef8adf63cd 100644
--- a/packages/ts/generator-plugin-model/package.json
+++ b/packages/ts/generator-plugin-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-model",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to generate form models",
   "main": "index.js",
   "type": "module",
@@ -51,10 +51,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
-    "@vaadin/hilla-lit-form": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
+    "@vaadin/hilla-lit-form": "24.7.0-alpha0",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.6.2"
@@ -65,8 +65,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-push/package.json b/packages/ts/generator-plugin-push/package.json
index b6b4242bbf..8f74dbbe9e 100644
--- a/packages/ts/generator-plugin-push/package.json
+++ b/packages/ts/generator-plugin-push/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-push",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to add push support",
   "main": "index.js",
   "type": "module",
@@ -51,9 +51,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.6.2"
@@ -64,8 +64,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-signals/package.json b/packages/ts/generator-plugin-signals/package.json
index f54c646469..b65885285a 100644
--- a/packages/ts/generator-plugin-signals/package.json
+++ b/packages/ts/generator-plugin-signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-signals",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to add Shared Signals support",
   "main": "index.js",
   "type": "module",
@@ -51,10 +51,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "fast-deep-equal": "^3.1.3",
     "iterator-helpers-polyfill": "^3.0.1",
     "openapi-types": "^12.1.3",
@@ -66,8 +66,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
     "c8": "^8.0.1",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-subtypes/package.json b/packages/ts/generator-plugin-subtypes/package.json
index 27b194dd7f..fef0ea9ac8 100644
--- a/packages/ts/generator-plugin-subtypes/package.json
+++ b/packages/ts/generator-plugin-subtypes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-subtypes",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A Hilla TypeScript Generator plugin to support JsonSubTypes",
   "main": "index.js",
   "type": "module",
@@ -50,10 +50,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
-    "@vaadin/hilla-generator-utils": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-utils": "24.7.0-alpha0",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.6.2"
@@ -64,9 +64,9 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-client": "24.6.0-beta5",
-    "@vaadin/hilla-generator-plugin-model": "24.6.0-beta5",
+    "@vaadin/hilla-generator-core": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha0",
+    "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha0",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-utils/package.json b/packages/ts/generator-utils/package.json
index 127baa2f16..010ed6b584 100644
--- a/packages/ts/generator-utils/package.json
+++ b/packages/ts/generator-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-utils",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "A set of utils for developing Hilla generator plugins",
   "main": "index.js",
   "type": "module",
diff --git a/packages/ts/lit-form/package.json b/packages/ts/lit-form/package.json
index f80328bf52..bb498c806e 100644
--- a/packages/ts/lit-form/package.json
+++ b/packages/ts/lit-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-lit-form",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla form utils",
   "main": "index.js",
   "module": "index.js",
@@ -71,7 +71,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.0-beta5",
+    "@vaadin/hilla-frontend": "24.7.0-alpha0",
     "validator": "^13.11.0"
   },
   "peerDependencies": {
diff --git a/packages/ts/models/package.json b/packages/ts/models/package.json
index 9b5fafa1c4..2af7dc2237 100644
--- a/packages/ts/models/package.json
+++ b/packages/ts/models/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-models",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Generative form models for Hilla",
   "main": "index.js",
   "module": "index.js",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-lit-form": "24.6.0-beta5"
+    "@vaadin/hilla-lit-form": "24.7.0-alpha0"
   },
   "peerDependencies": {
     "react": "^18"
diff --git a/packages/ts/react-auth/package.json b/packages/ts/react-auth/package.json
index 729092865a..32407b8dd5 100644
--- a/packages/ts/react-auth/package.json
+++ b/packages/ts/react-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-auth",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla auth utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -46,11 +46,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.0-beta5"
+    "@vaadin/hilla-frontend": "24.7.0-alpha0"
   },
   "peerDependencies": {
     "react": "^18",
-    "react-router-dom": "^6.28.0"
+    "react-dom": "^18",
+    "react-router": "^7"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -66,6 +67,7 @@
     "@types/validator": "^13.11.2",
     "@web/test-runner": "^0.19.0",
     "chai-dom": "^1.11.0",
+    "react-router": "^7.0.2",
     "sinon": "^16.0.0",
     "sinon-chai": "^3.7.0",
     "typescript": "5.6.2"
diff --git a/packages/ts/react-auth/src/ProtectedRoute.tsx b/packages/ts/react-auth/src/ProtectedRoute.tsx
index de3d0918cb..75e5ff7bec 100644
--- a/packages/ts/react-auth/src/ProtectedRoute.tsx
+++ b/packages/ts/react-auth/src/ProtectedRoute.tsx
@@ -1,6 +1,6 @@
 import { useContext, type JSX } from 'react';
-import type { RouteObject } from 'react-router-dom';
-import { type IndexRouteObject, Navigate, type NonIndexRouteObject, useLocation } from 'react-router-dom';
+import type { RouteObject } from 'react-router';
+import { type IndexRouteObject, Navigate, type NonIndexRouteObject, useLocation } from 'react-router';
 import { type AccessProps, AuthContext } from './useAuth.js';
 
 type CustomMetadata = Record<string, any>;
diff --git a/packages/ts/react-auth/test/ProtectedRoute.spec.tsx b/packages/ts/react-auth/test/ProtectedRoute.spec.tsx
index 271d7f34ad..26d0afadec 100644
--- a/packages/ts/react-auth/test/ProtectedRoute.spec.tsx
+++ b/packages/ts/react-auth/test/ProtectedRoute.spec.tsx
@@ -1,6 +1,6 @@
 import { expect } from '@esm-bundle/chai';
 import { render, waitFor } from '@testing-library/react';
-import { createMemoryRouter, RouterProvider } from 'react-router-dom';
+import { createMemoryRouter, RouterProvider } from 'react-router';
 import { configureAuth, protectRoutes, type RouteObjectWithAuth } from '../src';
 
 function TestView({ route }: { route: string }) {
diff --git a/packages/ts/react-crud/package.json b/packages/ts/react-crud/package.json
index b5207b69fa..6b5d02aae9 100644
--- a/packages/ts/react-crud/package.json
+++ b/packages/ts/react-crud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-crud",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla CRUD utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -56,9 +56,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.0-beta5",
-    "@vaadin/hilla-lit-form": "24.6.0-beta5",
-    "@vaadin/hilla-react-form": "24.6.0-beta5",
+    "@vaadin/hilla-frontend": "24.7.0-alpha0",
+    "@vaadin/hilla-lit-form": "24.7.0-alpha0",
+    "@vaadin/hilla-react-form": "24.7.0-alpha0",
     "@vaadin/react-components": "24.6.0-rc1"
   },
   "peerDependencies": {
diff --git a/packages/ts/react-form/package.json b/packages/ts/react-form/package.json
index fbf958034e..6b4ef8e2f6 100644
--- a/packages/ts/react-form/package.json
+++ b/packages/ts/react-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-form",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla form utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-lit-form": "24.6.0-beta5"
+    "@vaadin/hilla-lit-form": "24.7.0-alpha0"
   },
   "peerDependencies": {
     "react": "^18"
diff --git a/packages/ts/react-i18n/package.json b/packages/ts/react-i18n/package.json
index 95ab551dd3..8aa573b438 100644
--- a/packages/ts/react-i18n/package.json
+++ b/packages/ts/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-i18n",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Hilla I18n utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -46,8 +46,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.0-beta5",
-    "@vaadin/hilla-react-signals": "24.6.0-beta5",
+    "@vaadin/hilla-frontend": "24.7.0-alpha0",
+    "@vaadin/hilla-react-signals": "24.7.0-alpha0",
     "intl-messageformat": "^10.5.11"
   },
   "peerDependencies": {
diff --git a/packages/ts/react-signals/package.json b/packages/ts/react-signals/package.json
index dca182d36c..5be5f18451 100644
--- a/packages/ts/react-signals/package.json
+++ b/packages/ts/react-signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-signals",
-  "version": "24.6.0-beta5",
+  "version": "24.7.0-alpha0",
   "description": "Signals for Hilla React",
   "main": "index.js",
   "module": "index.js",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@preact/signals-react": "^2.0.0",
-    "@vaadin/hilla-frontend": "24.6.0-beta5",
+    "@vaadin/hilla-frontend": "24.7.0-alpha0",
     "nanoid": "^5.0.7"
   },
   "peerDependencies": {
diff --git a/pom.xml b/pom.xml
index ec22501248..463351a027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hilla-project</artifactId>
-  <version>24.6-SNAPSHOT</version>
+  <version>24.7-SNAPSHOT</version>
   <name>Hilla</name>
   <packaging>pom</packaging>
 
@@ -75,7 +75,7 @@
     <jackson.version>2.17.2</jackson.version>
     <junit.version>5.10.1</junit.version>
     <mockito.version>4.5.0</mockito.version>
-    <flow.version>24.6-SNAPSHOT</flow.version>
+    <flow.version>24.7-SNAPSHOT</flow.version>
     <slf4j.version>2.0.9</slf4j.version>
     <spring.boot.version>3.3.6</spring.boot.version>
     <testbench.version>9.3.6</testbench.version>