diff --git a/packages/java/tests/csrf-context/package-lock.json b/packages/java/tests/csrf-context/package-lock.json
index d1bfb9c48d..7854f361fd 100644
--- a/packages/java/tests/csrf-context/package-lock.json
+++ b/packages/java/tests/csrf-context/package-lock.json
@@ -76,7 +76,7 @@
     },
     "../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -126,7 +126,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -145,12 +145,12 @@
     },
     "../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -177,13 +177,13 @@
     },
     "../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -194,8 +194,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -213,13 +213,13 @@
     },
     "../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -228,8 +228,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -247,12 +247,12 @@
     },
     "../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -261,7 +261,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -279,14 +279,14 @@
     },
     "../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -297,8 +297,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -316,13 +316,13 @@
     },
     "../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -333,8 +333,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -352,14 +352,14 @@
     },
     "../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -371,8 +371,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -390,14 +390,14 @@
     },
     "../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -408,9 +408,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -428,7 +428,7 @@
     },
     "../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -485,10 +485,10 @@
     },
     "../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -10245,8 +10245,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -10271,7 +10271,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10294,9 +10294,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10320,9 +10320,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10344,8 +10344,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10367,11 +10367,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10395,9 +10395,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10421,10 +10421,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10449,10 +10449,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10500,7 +10500,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/csrf-context/package.json b/packages/java/tests/csrf-context/package.json
index 4f6774d49f..16f8049017 100644
--- a/packages/java/tests/csrf-context/package.json
+++ b/packages/java/tests/csrf-context/package.json
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/csrf/package-lock.json b/packages/java/tests/csrf/package-lock.json
index e90fcf9b20..c24f93bc14 100644
--- a/packages/java/tests/csrf/package-lock.json
+++ b/packages/java/tests/csrf/package-lock.json
@@ -76,7 +76,7 @@
     },
     "../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -126,7 +126,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -145,12 +145,12 @@
     },
     "../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -177,13 +177,13 @@
     },
     "../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -194,8 +194,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -213,13 +213,13 @@
     },
     "../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -228,8 +228,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -247,12 +247,12 @@
     },
     "../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -261,7 +261,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -279,14 +279,14 @@
     },
     "../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -297,8 +297,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -316,13 +316,13 @@
     },
     "../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -333,8 +333,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -352,14 +352,14 @@
     },
     "../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -371,8 +371,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -390,14 +390,14 @@
     },
     "../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -408,9 +408,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -428,7 +428,7 @@
     },
     "../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -485,10 +485,10 @@
     },
     "../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -9711,8 +9711,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -9737,7 +9737,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9760,9 +9760,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9786,9 +9786,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9810,8 +9810,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9833,11 +9833,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9861,9 +9861,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9887,10 +9887,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9915,10 +9915,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -9966,7 +9966,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/csrf/package.json b/packages/java/tests/csrf/package.json
index f5fd244a0a..6a5cf1d224 100644
--- a/packages/java/tests/csrf/package.json
+++ b/packages/java/tests/csrf/package.json
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/endpoints discovery/package-lock.json b/packages/java/tests/spring/endpoints discovery/package-lock.json
index a6301225b9..f2c58fa6bc 100644
--- a/packages/java/tests/spring/endpoints discovery/package-lock.json	
+++ b/packages/java/tests/spring/endpoints discovery/package-lock.json	
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -170,8 +170,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -273,8 +273,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -309,8 +309,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -366,14 +366,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -384,9 +384,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -404,7 +404,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -461,10 +461,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -10318,8 +10318,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -10344,7 +10344,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10367,9 +10367,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10393,9 +10393,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10417,8 +10417,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10440,11 +10440,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10468,9 +10468,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10494,10 +10494,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10522,10 +10522,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10573,7 +10573,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/endpoints discovery/package.json b/packages/java/tests/spring/endpoints discovery/package.json
index 5170d2b722..e47e14bd21 100644
--- a/packages/java/tests/spring/endpoints discovery/package.json	
+++ b/packages/java/tests/spring/endpoints discovery/package.json	
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/endpoints-contextpath/package-lock.json b/packages/java/tests/spring/endpoints-contextpath/package-lock.json
index e67eb2d468..8e08b9027b 100644
--- a/packages/java/tests/spring/endpoints-contextpath/package-lock.json
+++ b/packages/java/tests/spring/endpoints-contextpath/package-lock.json
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -170,8 +170,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -273,8 +273,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -309,8 +309,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -366,14 +366,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -384,9 +384,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -404,7 +404,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -461,10 +461,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -10266,8 +10266,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -10292,7 +10292,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10315,9 +10315,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10341,9 +10341,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10365,8 +10365,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10388,11 +10388,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10416,9 +10416,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10442,10 +10442,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10470,10 +10470,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10521,7 +10521,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/endpoints-contextpath/package.json b/packages/java/tests/spring/endpoints-contextpath/package.json
index c49092ef60..a8a7d244ab 100644
--- a/packages/java/tests/spring/endpoints-contextpath/package.json
+++ b/packages/java/tests/spring/endpoints-contextpath/package.json
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
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 49ece57db9..c77c789cda 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package-lock.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -170,8 +170,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -273,8 +273,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -309,8 +309,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -366,14 +366,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -384,9 +384,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -404,7 +404,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -461,10 +461,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -10266,8 +10266,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -10292,7 +10292,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10315,9 +10315,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10341,9 +10341,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10365,8 +10365,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10388,11 +10388,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10416,9 +10416,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10442,10 +10442,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10470,10 +10470,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10521,7 +10521,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/endpoints-custom-client/package.json b/packages/java/tests/spring/endpoints-custom-client/package.json
index c49092ef60..a8a7d244ab 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package.json
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
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 614622be8d..8e3e8c8a71 100644
--- a/packages/java/tests/spring/endpoints-latest-java/package-lock.json
+++ b/packages/java/tests/spring/endpoints-latest-java/package-lock.json
@@ -88,7 +88,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -138,7 +138,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -157,12 +157,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -206,8 +206,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -225,13 +225,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -240,8 +240,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -259,12 +259,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -273,7 +273,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -291,14 +291,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -309,8 +309,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -328,13 +328,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -345,8 +345,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -364,14 +364,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -383,8 +383,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -402,14 +402,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -420,9 +420,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -440,7 +440,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -497,10 +497,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -10408,8 +10408,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -10434,7 +10434,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10457,9 +10457,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10483,9 +10483,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10507,8 +10507,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10530,11 +10530,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10558,9 +10558,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10584,10 +10584,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10612,10 +10612,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10663,7 +10663,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/endpoints-latest-java/package.json b/packages/java/tests/spring/endpoints-latest-java/package.json
index 5170d2b722..e47e14bd21 100644
--- a/packages/java/tests/spring/endpoints-latest-java/package.json
+++ b/packages/java/tests/spring/endpoints-latest-java/package.json
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/endpoints/package-lock.json b/packages/java/tests/spring/endpoints/package-lock.json
index e3cd810bbd..da63996f62 100644
--- a/packages/java/tests/spring/endpoints/package-lock.json
+++ b/packages/java/tests/spring/endpoints/package-lock.json
@@ -52,7 +52,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -102,7 +102,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -121,12 +121,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -153,13 +153,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -170,8 +170,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -189,13 +189,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -204,8 +204,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -223,12 +223,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -237,7 +237,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -255,14 +255,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -273,8 +273,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -292,13 +292,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -309,8 +309,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -328,14 +328,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -347,8 +347,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -366,14 +366,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -384,9 +384,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -404,7 +404,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -461,10 +461,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -10266,8 +10266,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -10292,7 +10292,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10315,9 +10315,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10341,9 +10341,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10365,8 +10365,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10388,11 +10388,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10416,9 +10416,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10442,10 +10442,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10470,10 +10470,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -10521,7 +10521,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/endpoints/package.json b/packages/java/tests/spring/endpoints/package.json
index 73393b5231..5e467480e1 100644
--- a/packages/java/tests/spring/endpoints/package.json
+++ b/packages/java/tests/spring/endpoints/package.json
@@ -50,8 +50,8 @@
     "dependencies": {
       "@polymer/polymer": "3.5.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
@@ -67,16 +67,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
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 26e36af0f4..cda293936d 100644
--- a/packages/java/tests/spring/react-grid-test/package-lock.json
+++ b/packages/java/tests/spring/react-grid-test/package-lock.json
@@ -64,13 +64,13 @@
     },
     "../../../../ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/chai": "^5.0.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-react-auth": "24.7.0-alpha8",
-        "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha9",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "react": "^18.3.1",
         "rollup": "^4.21.0",
@@ -103,7 +103,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -134,12 +134,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -153,7 +153,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -172,12 +172,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -204,13 +204,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -221,8 +221,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -240,13 +240,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -255,8 +255,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -274,12 +274,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -288,7 +288,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -306,14 +306,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -324,8 +324,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -343,13 +343,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -360,8 +360,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -379,14 +379,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -398,8 +398,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -417,14 +417,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -435,9 +435,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -455,7 +455,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -486,10 +486,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -511,10 +511,10 @@
     },
     "../../../../ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8"
+        "@vaadin/hilla-frontend": "24.7.0-alpha9"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -544,12 +544,12 @@
     },
     "../../../../ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
-        "@vaadin/hilla-react-form": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
+        "@vaadin/hilla-react-form": "24.7.0-alpha9",
         "@vaadin/react-components": "24.7.0-alpha7"
       },
       "devDependencies": {
@@ -580,10 +580,10 @@
     },
     "../../../../ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -612,11 +612,11 @@
     },
     "../../../../ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
-        "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha9",
         "intl-messageformat": "^10.7.11"
       },
       "devDependencies": {
@@ -647,11 +647,11 @@
     },
     "../../../../ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^3.0.1",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "nanoid": "^5.0.9"
       },
       "devDependencies": {
diff --git a/packages/java/tests/spring/react-grid-test/package.json b/packages/java/tests/spring/react-grid-test/package.json
index d4532df4cd..30343ea822 100644
--- a/packages/java/tests/spring/react-grid-test/package.json
+++ b/packages/java/tests/spring/react-grid-test/package.json
@@ -63,14 +63,14 @@
       "@polymer/polymer": "3.5.2",
       "@vaadin/bundles": "24.7.0-alpha7",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.7.0-alpha8",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
-      "@vaadin/hilla-react-auth": "24.7.0-alpha8",
-      "@vaadin/hilla-react-crud": "24.7.0-alpha8",
-      "@vaadin/hilla-react-form": "24.7.0-alpha8",
-      "@vaadin/hilla-react-i18n": "24.7.0-alpha8",
-      "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+      "@vaadin/hilla-file-router": "24.7.0-alpha9",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha9",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha9",
+      "@vaadin/hilla-react-form": "24.7.0-alpha9",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha9",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha9",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
       "@vaadin/react-components": "24.7.0-alpha7",
       "@vaadin/react-components-pro": "24.7.0-alpha7",
@@ -91,16 +91,16 @@
       "@rollup/pluginutils": "5.1.4",
       "@types/react": "18.3.18",
       "@types/react-dom": "18.3.5",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/react-i18n/package-lock.json b/packages/java/tests/spring/react-i18n/package-lock.json
index ecb3b3a3f6..23fcbfd35c 100644
--- a/packages/java/tests/spring/react-i18n/package-lock.json
+++ b/packages/java/tests/spring/react-i18n/package-lock.json
@@ -96,13 +96,13 @@
     },
     "../../../../ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/chai": "^5.0.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-react-auth": "24.7.0-alpha8",
-        "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha9",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "react": "^18.3.1",
         "rollup": "^4.21.0",
@@ -135,7 +135,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -166,12 +166,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -185,7 +185,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -204,12 +204,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -236,13 +236,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -253,8 +253,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -272,13 +272,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -287,8 +287,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -306,12 +306,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -320,7 +320,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -338,14 +338,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -356,8 +356,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -375,13 +375,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -392,8 +392,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -411,14 +411,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -430,8 +430,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -449,14 +449,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -467,9 +467,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -487,7 +487,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -518,10 +518,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -543,10 +543,10 @@
     },
     "../../../../ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8"
+        "@vaadin/hilla-frontend": "24.7.0-alpha9"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -576,12 +576,12 @@
     },
     "../../../../ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
-        "@vaadin/hilla-react-form": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
+        "@vaadin/hilla-react-form": "24.7.0-alpha9",
         "@vaadin/react-components": "24.7.0-alpha7"
       },
       "devDependencies": {
@@ -612,10 +612,10 @@
     },
     "../../../../ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -644,11 +644,11 @@
     },
     "../../../../ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
-        "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha9",
         "intl-messageformat": "^10.7.11"
       },
       "devDependencies": {
@@ -679,11 +679,11 @@
     },
     "../../../../ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^3.0.1",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "nanoid": "^5.0.9"
       },
       "devDependencies": {
diff --git a/packages/java/tests/spring/react-i18n/package.json b/packages/java/tests/spring/react-i18n/package.json
index 17f932ca62..89d17eaf12 100644
--- a/packages/java/tests/spring/react-i18n/package.json
+++ b/packages/java/tests/spring/react-i18n/package.json
@@ -63,14 +63,14 @@
       "@polymer/polymer": "3.5.2",
       "@vaadin/bundles": "24.7.0-alpha7",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.7.0-alpha8",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
-      "@vaadin/hilla-react-auth": "24.7.0-alpha8",
-      "@vaadin/hilla-react-crud": "24.7.0-alpha8",
-      "@vaadin/hilla-react-form": "24.7.0-alpha8",
-      "@vaadin/hilla-react-i18n": "24.7.0-alpha8",
-      "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+      "@vaadin/hilla-file-router": "24.7.0-alpha9",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha9",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha9",
+      "@vaadin/hilla-react-form": "24.7.0-alpha9",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha9",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha9",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
       "@vaadin/react-components": "24.7.0-alpha7",
       "@vaadin/react-components-pro": "24.7.0-alpha7",
@@ -91,16 +91,16 @@
       "@rollup/pluginutils": "5.1.4",
       "@types/react": "18.3.18",
       "@types/react-dom": "18.3.5",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/react-signals/package-lock.json b/packages/java/tests/spring/react-signals/package-lock.json
index 3e67c314a3..afba2b3692 100644
--- a/packages/java/tests/spring/react-signals/package-lock.json
+++ b/packages/java/tests/spring/react-signals/package-lock.json
@@ -64,13 +64,13 @@
     },
     "../../../../ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/chai": "^5.0.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-react-auth": "24.7.0-alpha8",
-        "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-react-auth": "24.7.0-alpha9",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "react": "^18.3.1",
         "rollup": "^4.21.0",
@@ -103,7 +103,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -134,12 +134,12 @@
     },
     "../../../../ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -153,7 +153,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -172,12 +172,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -204,13 +204,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -221,8 +221,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -240,13 +240,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -255,8 +255,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -274,12 +274,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -288,7 +288,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -306,14 +306,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -324,8 +324,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -343,13 +343,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -360,8 +360,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -379,14 +379,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -398,8 +398,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -417,14 +417,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -435,9 +435,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -455,7 +455,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -486,10 +486,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -511,10 +511,10 @@
     },
     "../../../../ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8"
+        "@vaadin/hilla-frontend": "24.7.0-alpha9"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -544,12 +544,12 @@
     },
     "../../../../ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
-        "@vaadin/hilla-react-form": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
+        "@vaadin/hilla-react-form": "24.7.0-alpha9",
         "@vaadin/react-components": "24.7.0-alpha7"
       },
       "devDependencies": {
@@ -580,10 +580,10 @@
     },
     "../../../../ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8"
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -612,11 +612,11 @@
     },
     "../../../../ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
-        "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
+        "@vaadin/hilla-react-signals": "24.7.0-alpha9",
         "intl-messageformat": "^10.7.11"
       },
       "devDependencies": {
@@ -647,11 +647,11 @@
     },
     "../../../../ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^3.0.1",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "nanoid": "^5.0.9"
       },
       "devDependencies": {
diff --git a/packages/java/tests/spring/react-signals/package.json b/packages/java/tests/spring/react-signals/package.json
index 3ec7901513..73b0602ba8 100644
--- a/packages/java/tests/spring/react-signals/package.json
+++ b/packages/java/tests/spring/react-signals/package.json
@@ -63,14 +63,14 @@
       "@polymer/polymer": "3.5.2",
       "@vaadin/bundles": "24.7.0-alpha7",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-file-router": "24.7.0-alpha8",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
-      "@vaadin/hilla-react-auth": "24.7.0-alpha8",
-      "@vaadin/hilla-react-crud": "24.7.0-alpha8",
-      "@vaadin/hilla-react-form": "24.7.0-alpha8",
-      "@vaadin/hilla-react-i18n": "24.7.0-alpha8",
-      "@vaadin/hilla-react-signals": "24.7.0-alpha8",
+      "@vaadin/hilla-file-router": "24.7.0-alpha9",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
+      "@vaadin/hilla-react-auth": "24.7.0-alpha9",
+      "@vaadin/hilla-react-crud": "24.7.0-alpha9",
+      "@vaadin/hilla-react-form": "24.7.0-alpha9",
+      "@vaadin/hilla-react-i18n": "24.7.0-alpha9",
+      "@vaadin/hilla-react-signals": "24.7.0-alpha9",
       "@vaadin/polymer-legacy-adapter": "24.7.0-alpha7",
       "@vaadin/react-components": "24.7.0-alpha7",
       "@vaadin/react-components-pro": "24.7.0-alpha7",
@@ -91,16 +91,16 @@
       "@rollup/pluginutils": "5.1.4",
       "@types/react": "18.3.18",
       "@types/react-dom": "18.3.5",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/security-contextpath/package-lock.json b/packages/java/tests/spring/security-contextpath/package-lock.json
index 06a7aacf9a..48cad8af43 100644
--- a/packages/java/tests/spring/security-contextpath/package-lock.json
+++ b/packages/java/tests/spring/security-contextpath/package-lock.json
@@ -123,7 +123,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -173,7 +173,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -192,12 +192,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -224,13 +224,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -241,8 +241,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -260,13 +260,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -275,8 +275,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -294,12 +294,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -308,7 +308,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -326,14 +326,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -344,8 +344,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -363,13 +363,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -380,8 +380,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -399,14 +399,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -418,8 +418,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -437,14 +437,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -455,9 +455,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -475,7 +475,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -532,10 +532,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -12097,8 +12097,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -12123,7 +12123,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12146,9 +12146,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12172,9 +12172,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12196,8 +12196,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12219,11 +12219,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12247,9 +12247,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12273,10 +12273,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12301,10 +12301,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12352,7 +12352,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/security-contextpath/package.json b/packages/java/tests/spring/security-contextpath/package.json
index ff68cfe67c..7b215f9529 100644
--- a/packages/java/tests/spring/security-contextpath/package.json
+++ b/packages/java/tests/spring/security-contextpath/package.json
@@ -151,8 +151,8 @@
       "@vaadin/form-layout": "24.7.0-alpha7",
       "@vaadin/grid": "24.7.0-alpha7",
       "@vaadin/grid-pro": "24.7.0-alpha7",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/horizontal-layout": "24.7.0-alpha7",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
@@ -204,16 +204,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/security-jwt/package-lock.json b/packages/java/tests/spring/security-jwt/package-lock.json
index b84347f9af..e26ddd675b 100644
--- a/packages/java/tests/spring/security-jwt/package-lock.json
+++ b/packages/java/tests/spring/security-jwt/package-lock.json
@@ -123,7 +123,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -173,7 +173,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -192,12 +192,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -224,13 +224,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -241,8 +241,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -260,13 +260,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -275,8 +275,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -294,12 +294,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -308,7 +308,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -326,14 +326,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -344,8 +344,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -363,13 +363,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -380,8 +380,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -399,14 +399,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -418,8 +418,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -437,14 +437,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -455,9 +455,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -475,7 +475,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -532,10 +532,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -12097,8 +12097,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -12123,7 +12123,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12146,9 +12146,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12172,9 +12172,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12196,8 +12196,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12219,11 +12219,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12247,9 +12247,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12273,10 +12273,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12301,10 +12301,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12352,7 +12352,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/security-jwt/package.json b/packages/java/tests/spring/security-jwt/package.json
index f709cdc9ae..b967dd63ae 100644
--- a/packages/java/tests/spring/security-jwt/package.json
+++ b/packages/java/tests/spring/security-jwt/package.json
@@ -151,8 +151,8 @@
       "@vaadin/form-layout": "24.7.0-alpha7",
       "@vaadin/grid": "24.7.0-alpha7",
       "@vaadin/grid-pro": "24.7.0-alpha7",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/horizontal-layout": "24.7.0-alpha7",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
@@ -204,16 +204,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/security-urlmapping/package-lock.json b/packages/java/tests/spring/security-urlmapping/package-lock.json
index ffc926b7fa..5a2c8307b7 100644
--- a/packages/java/tests/spring/security-urlmapping/package-lock.json
+++ b/packages/java/tests/spring/security-urlmapping/package-lock.json
@@ -123,7 +123,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -173,7 +173,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -192,12 +192,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -224,13 +224,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -241,8 +241,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -260,13 +260,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -275,8 +275,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -294,12 +294,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -308,7 +308,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -326,14 +326,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -344,8 +344,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -363,13 +363,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -380,8 +380,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -399,14 +399,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -418,8 +418,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -437,14 +437,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -455,9 +455,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -475,7 +475,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -532,10 +532,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -12073,8 +12073,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -12099,7 +12099,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12122,9 +12122,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12148,9 +12148,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12172,8 +12172,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12195,11 +12195,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12223,9 +12223,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12249,10 +12249,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12277,10 +12277,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12328,7 +12328,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/security-urlmapping/package.json b/packages/java/tests/spring/security-urlmapping/package.json
index f709cdc9ae..b967dd63ae 100644
--- a/packages/java/tests/spring/security-urlmapping/package.json
+++ b/packages/java/tests/spring/security-urlmapping/package.json
@@ -151,8 +151,8 @@
       "@vaadin/form-layout": "24.7.0-alpha7",
       "@vaadin/grid": "24.7.0-alpha7",
       "@vaadin/grid-pro": "24.7.0-alpha7",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/horizontal-layout": "24.7.0-alpha7",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
@@ -204,16 +204,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",
diff --git a/packages/java/tests/spring/security/package-lock.json b/packages/java/tests/spring/security/package-lock.json
index c31f2a2fcb..683f3ea8f0 100644
--- a/packages/java/tests/spring/security/package-lock.json
+++ b/packages/java/tests/spring/security/package-lock.json
@@ -118,7 +118,7 @@
     },
     "../../../../ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "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.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "get-stdin": "^9.0.0",
         "meow": "^13.2.0"
       },
@@ -168,7 +168,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -187,12 +187,12 @@
     },
     "../../../../ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.1",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "meow": "^13.2.0",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -219,13 +219,13 @@
     },
     "../../../../ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -236,8 +236,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -255,13 +255,13 @@
     },
     "../../../../ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -270,8 +270,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -289,12 +289,12 @@
     },
     "../../../../ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "typescript": "5.7.3"
       },
       "devDependencies": {
@@ -303,7 +303,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -321,14 +321,14 @@
     },
     "../../../../ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -339,8 +339,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -358,13 +358,13 @@
     },
     "../../../../ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -375,8 +375,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -394,14 +394,14 @@
     },
     "../../../../ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -413,8 +413,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -432,14 +432,14 @@
     },
     "../../../../ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.3"
@@ -450,9 +450,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -470,7 +470,7 @@
     },
     "../../../../ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "dev": true,
       "license": "Apache 2.0",
       "dependencies": {
@@ -527,10 +527,10 @@
     },
     "../../../../ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.7.0-alpha8",
+      "version": "24.7.0-alpha9",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "validator": "^13.12.0"
       },
       "devDependencies": {
@@ -11952,8 +11952,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "chai-as-promised": "^7.1.2",
@@ -11978,7 +11978,7 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12001,9 +12001,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12027,9 +12027,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12051,8 +12051,8 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12074,11 +12074,11 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
-        "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
+        "@vaadin/hilla-lit-form": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12102,9 +12102,9 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12128,10 +12128,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12156,10 +12156,10 @@
         "@types/node": "^20.17.12",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
-        "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-        "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+        "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+        "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
         "c8": "^10.1.3",
         "chai": "^4.5.0",
         "concurrently": "^9.1.2",
@@ -12207,7 +12207,7 @@
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",
         "@types/validator": "^13.12.2",
-        "@vaadin/hilla-frontend": "24.7.0-alpha8",
+        "@vaadin/hilla-frontend": "24.7.0-alpha9",
         "chai": "^5.1.2",
         "chai-dom": "^1.12.0",
         "sinon": "^16.1.3",
diff --git a/packages/java/tests/spring/security/package.json b/packages/java/tests/spring/security/package.json
index 6df9abe7f8..f86218a25b 100644
--- a/packages/java/tests/spring/security/package.json
+++ b/packages/java/tests/spring/security/package.json
@@ -146,8 +146,8 @@
       "@vaadin/form-layout": "24.7.0-alpha7",
       "@vaadin/grid": "24.7.0-alpha7",
       "@vaadin/grid-pro": "24.7.0-alpha7",
-      "@vaadin/hilla-frontend": "24.7.0-alpha8",
-      "@vaadin/hilla-lit-form": "24.7.0-alpha8",
+      "@vaadin/hilla-frontend": "24.7.0-alpha9",
+      "@vaadin/hilla-lit-form": "24.7.0-alpha9",
       "@vaadin/horizontal-layout": "24.7.0-alpha7",
       "@vaadin/icon": "24.7.0-alpha7",
       "@vaadin/icons": "24.7.0-alpha7",
@@ -199,16 +199,16 @@
       "@preact/signals-react-transform": "0.5.1",
       "@rollup/plugin-replace": "6.0.2",
       "@rollup/pluginutils": "5.1.4",
-      "@vaadin/hilla-generator-cli": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-core": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha8",
-      "@vaadin/hilla-generator-utils": "24.7.0-alpha8",
+      "@vaadin/hilla-generator-cli": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-core": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-backbone": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-barrel": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-client": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-model": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-push": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-signals": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-plugin-subtypes": "24.7.0-alpha9",
+      "@vaadin/hilla-generator-utils": "24.7.0-alpha9",
       "@vitejs/plugin-react": "4.3.4",
       "async": "3.2.6",
       "glob": "11.0.1",