Skip to content

Commit f77b308

Browse files
ZheSun88manolo
ZheSun88
and
manolo
authored
upgrade vaadin to 25.0.2 (#9)
* upgrade vaadin to 25.0.2 * update actions used in GHA validaiton * configure correctly vaadin-dev and vaadin-maven-plugin --------- Co-authored-by: Manolo Carrasco <manolo@vaadin.com>
1 parent 2203cbe commit f77b308

File tree

24 files changed

+3969
-12967
lines changed

24 files changed

+3969
-12967
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Set up JDK 21
17-
uses: actions/setup-java@v2
17+
uses: actions/setup-java@v4
1818
with:
1919
java-version: '21'
2020
distribution: 'adopt'

‎package-lock.json‎

Lines changed: 3601 additions & 12425 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 148 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -3,127 +3,119 @@
33
"license": "UNLICENSED",
44
"type": "module",
55
"dependencies": {
6-
"@polymer/polymer": "3.5.2",
7-
"@vaadin/bundles": "24.6.0",
6+
"@vaadin/aura": "25.0.1",
87
"@vaadin/common-frontend": "0.0.19",
9-
"@vaadin/hilla-file-router": "24.6.0",
10-
"@vaadin/hilla-frontend": "24.6.0",
11-
"@vaadin/hilla-lit-form": "24.6.0",
12-
"@vaadin/hilla-react-auth": "24.6.0",
13-
"@vaadin/hilla-react-crud": "24.6.0",
14-
"@vaadin/hilla-react-form": "24.6.0",
15-
"@vaadin/hilla-react-i18n": "24.6.0",
16-
"@vaadin/hilla-react-signals": "24.6.0",
17-
"@vaadin/polymer-legacy-adapter": "24.6.0",
18-
"@vaadin/react-components": "24.6.0",
8+
"@vaadin/hilla-file-router": "25.0.2",
9+
"@vaadin/hilla-frontend": "25.0.2",
10+
"@vaadin/hilla-lit-form": "25.0.2",
11+
"@vaadin/hilla-react-auth": "25.0.2",
12+
"@vaadin/hilla-react-crud": "25.0.2",
13+
"@vaadin/hilla-react-form": "25.0.2",
14+
"@vaadin/hilla-react-i18n": "25.0.2",
15+
"@vaadin/hilla-react-signals": "25.0.2",
16+
"@vaadin/react-components": "25.0.1",
1917
"@vaadin/vaadin-development-mode-detector": "2.0.7",
20-
"@vaadin/vaadin-lumo-styles": "24.6.0",
21-
"@vaadin/vaadin-material-styles": "24.6.0",
22-
"@vaadin/vaadin-themable-mixin": "24.6.0",
18+
"@vaadin/vaadin-lumo-styles": "25.0.1",
19+
"@vaadin/vaadin-themable-mixin": "25.0.1",
2320
"@vaadin/vaadin-usage-statistics": "2.1.3",
24-
"construct-style-sheets-polyfill": "3.1.0",
25-
"date-fns": "2.29.3",
26-
"lit": "3.2.1",
27-
"react": "18.3.1",
28-
"react-dom": "18.3.1",
21+
"date-fns": "4.1.0",
22+
"lit": "3.3.1",
23+
"react": "19.2.3",
24+
"react-dom": "19.2.3",
2925
"react-error-boundary": "4.0.13",
30-
"react-router-dom": "6.28.0"
26+
"react-router": "7.10.1"
3127
},
3228
"devDependencies": {
33-
"@babel/preset-react": "7.26.3",
34-
"@preact/signals-react-transform": "0.4.0",
35-
"@rollup/plugin-replace": "6.0.1",
36-
"@rollup/pluginutils": "5.1.3",
37-
"@types/react": "18.3.13",
38-
"@types/react-dom": "18.3.1",
39-
"@vaadin/hilla-generator-cli": "24.6.0",
40-
"@vaadin/hilla-generator-core": "24.6.0",
41-
"@vaadin/hilla-generator-plugin-backbone": "24.6.0",
42-
"@vaadin/hilla-generator-plugin-barrel": "24.6.0",
43-
"@vaadin/hilla-generator-plugin-client": "24.6.0",
44-
"@vaadin/hilla-generator-plugin-model": "24.6.0",
45-
"@vaadin/hilla-generator-plugin-push": "24.6.0",
46-
"@vaadin/hilla-generator-plugin-signals": "24.6.0",
47-
"@vaadin/hilla-generator-plugin-subtypes": "24.6.0",
48-
"@vaadin/hilla-generator-utils": "24.6.0",
49-
"@vitejs/plugin-react": "4.3.4",
50-
"async": "3.2.6",
51-
"glob": "10.4.5",
29+
"@babel/preset-react": "7.28.5",
30+
"@preact/signals-react-transform": "0.6.0",
31+
"@rollup/plugin-replace": "6.0.3",
32+
"@rollup/pluginutils": "5.3.0",
33+
"@types/node": "25.0.2",
34+
"@types/react": "19.2.7",
35+
"@types/react-dom": "19.2.3",
36+
"@vaadin/hilla-generator-cli": "25.0.2",
37+
"@vaadin/hilla-generator-core": "25.0.2",
38+
"@vaadin/hilla-generator-plugin-backbone": "25.0.2",
39+
"@vaadin/hilla-generator-plugin-barrel": "25.0.2",
40+
"@vaadin/hilla-generator-plugin-client": "25.0.2",
41+
"@vaadin/hilla-generator-plugin-model": "25.0.2",
42+
"@vaadin/hilla-generator-plugin-push": "25.0.2",
43+
"@vaadin/hilla-generator-plugin-signals": "25.0.2",
44+
"@vaadin/hilla-generator-plugin-subtypes": "25.0.2",
45+
"@vaadin/hilla-generator-plugin-transfertypes": "25.0.2",
46+
"@vaadin/hilla-generator-utils": "25.0.2",
47+
"@vitejs/plugin-react": "5.1.2",
48+
"magic-string": "0.30.21",
5249
"rollup-plugin-brotli": "3.1.0",
53-
"rollup-plugin-visualizer": "5.12.0",
50+
"rollup-plugin-visualizer": "6.0.5",
5451
"strip-css-comments": "5.0.0",
5552
"transform-ast": "2.4.4",
56-
"typescript": "5.7.2",
57-
"vite": "6.0.3",
58-
"vite-plugin-checker": "0.8.0",
59-
"workbox-build": "7.3.0",
53+
"typescript": "5.9.3",
54+
"vite": "7.3.0",
55+
"vite-plugin-checker": "0.12.0",
56+
"workbox-build": "7.4.0",
6057
"workbox-core": "7.3.0",
6158
"workbox-precaching": "7.3.0"
6259
},
6360
"vaadin": {
6461
"dependencies": {
65-
"@polymer/polymer": "3.5.2",
66-
"@vaadin/bundles": "24.6.0",
62+
"@vaadin/aura": "25.0.1",
6763
"@vaadin/common-frontend": "0.0.19",
68-
"@vaadin/hilla-file-router": "24.6.0",
69-
"@vaadin/hilla-frontend": "24.6.0",
70-
"@vaadin/hilla-lit-form": "24.6.0",
71-
"@vaadin/hilla-react-auth": "24.6.0",
72-
"@vaadin/hilla-react-crud": "24.6.0",
73-
"@vaadin/hilla-react-form": "24.6.0",
74-
"@vaadin/hilla-react-i18n": "24.6.0",
75-
"@vaadin/hilla-react-signals": "24.6.0",
76-
"@vaadin/polymer-legacy-adapter": "24.6.0",
77-
"@vaadin/react-components": "24.6.0",
64+
"@vaadin/hilla-file-router": "25.0.2",
65+
"@vaadin/hilla-frontend": "25.0.2",
66+
"@vaadin/hilla-lit-form": "25.0.2",
67+
"@vaadin/hilla-react-auth": "25.0.2",
68+
"@vaadin/hilla-react-crud": "25.0.2",
69+
"@vaadin/hilla-react-form": "25.0.2",
70+
"@vaadin/hilla-react-i18n": "25.0.2",
71+
"@vaadin/hilla-react-signals": "25.0.2",
72+
"@vaadin/react-components": "25.0.1",
7873
"@vaadin/vaadin-development-mode-detector": "2.0.7",
79-
"@vaadin/vaadin-lumo-styles": "24.6.0",
80-
"@vaadin/vaadin-material-styles": "24.6.0",
81-
"@vaadin/vaadin-themable-mixin": "24.6.0",
74+
"@vaadin/vaadin-lumo-styles": "25.0.1",
75+
"@vaadin/vaadin-themable-mixin": "25.0.1",
8276
"@vaadin/vaadin-usage-statistics": "2.1.3",
83-
"construct-style-sheets-polyfill": "3.1.0",
84-
"date-fns": "2.29.3",
85-
"lit": "3.2.1",
86-
"react": "18.3.1",
87-
"react-dom": "18.3.1",
77+
"date-fns": "4.1.0",
78+
"lit": "3.3.1",
79+
"react": "19.2.3",
80+
"react-dom": "19.2.3",
8881
"react-error-boundary": "4.0.13",
89-
"react-router-dom": "6.28.0"
82+
"react-router": "7.10.1"
9083
},
9184
"devDependencies": {
92-
"@babel/preset-react": "7.26.3",
93-
"@preact/signals-react-transform": "0.4.0",
94-
"@rollup/plugin-replace": "6.0.1",
95-
"@rollup/pluginutils": "5.1.3",
96-
"@types/react": "18.3.13",
97-
"@types/react-dom": "18.3.1",
98-
"@vaadin/hilla-generator-cli": "24.6.0",
99-
"@vaadin/hilla-generator-core": "24.6.0",
100-
"@vaadin/hilla-generator-plugin-backbone": "24.6.0",
101-
"@vaadin/hilla-generator-plugin-barrel": "24.6.0",
102-
"@vaadin/hilla-generator-plugin-client": "24.6.0",
103-
"@vaadin/hilla-generator-plugin-model": "24.6.0",
104-
"@vaadin/hilla-generator-plugin-push": "24.6.0",
105-
"@vaadin/hilla-generator-plugin-signals": "24.6.0",
106-
"@vaadin/hilla-generator-plugin-subtypes": "24.6.0",
107-
"@vaadin/hilla-generator-utils": "24.6.0",
108-
"@vitejs/plugin-react": "4.3.4",
109-
"async": "3.2.6",
110-
"glob": "10.4.5",
85+
"@babel/preset-react": "7.28.5",
86+
"@preact/signals-react-transform": "0.6.0",
87+
"@rollup/plugin-replace": "6.0.3",
88+
"@rollup/pluginutils": "5.3.0",
89+
"@types/node": "25.0.2",
90+
"@types/react": "19.2.7",
91+
"@types/react-dom": "19.2.3",
92+
"@vaadin/hilla-generator-cli": "25.0.2",
93+
"@vaadin/hilla-generator-core": "25.0.2",
94+
"@vaadin/hilla-generator-plugin-backbone": "25.0.2",
95+
"@vaadin/hilla-generator-plugin-barrel": "25.0.2",
96+
"@vaadin/hilla-generator-plugin-client": "25.0.2",
97+
"@vaadin/hilla-generator-plugin-model": "25.0.2",
98+
"@vaadin/hilla-generator-plugin-push": "25.0.2",
99+
"@vaadin/hilla-generator-plugin-signals": "25.0.2",
100+
"@vaadin/hilla-generator-plugin-subtypes": "25.0.2",
101+
"@vaadin/hilla-generator-plugin-transfertypes": "25.0.2",
102+
"@vaadin/hilla-generator-utils": "25.0.2",
103+
"@vitejs/plugin-react": "5.1.2",
104+
"magic-string": "0.30.21",
111105
"rollup-plugin-brotli": "3.1.0",
112-
"rollup-plugin-visualizer": "5.12.0",
106+
"rollup-plugin-visualizer": "6.0.5",
113107
"strip-css-comments": "5.0.0",
114108
"transform-ast": "2.4.4",
115-
"typescript": "5.7.2",
116-
"vite": "6.0.3",
117-
"vite-plugin-checker": "0.8.0",
118-
"workbox-build": "7.3.0",
109+
"typescript": "5.9.3",
110+
"vite": "7.3.0",
111+
"vite-plugin-checker": "0.12.0",
112+
"workbox-build": "7.4.0",
119113
"workbox-core": "7.3.0",
120114
"workbox-precaching": "7.3.0"
121115
},
122-
"hash": "09aed261ff9d0693c9a0538e53b0415b5df8b427307cdd0bee19ca02c6b8a945"
116+
"hash": "4fbc16adbb9aa4c32bbb8204bb40d88e8c0050e1922750727bb0dd7b77827bb5"
123117
},
124118
"overrides": {
125-
"@vaadin/bundles": "$@vaadin/bundles",
126-
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
127119
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
128120
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
129121
"@vaadin/react-components": "$@vaadin/react-components",
@@ -134,18 +126,75 @@
134126
"react": "$react",
135127
"@vaadin/hilla-react-crud": "$@vaadin/hilla-react-crud",
136128
"@vaadin/hilla-file-router": "$@vaadin/hilla-file-router",
137-
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
138-
"react-router-dom": "$react-router-dom",
139129
"@vaadin/hilla-react-i18n": "$@vaadin/hilla-react-i18n",
140130
"lit": "$lit",
141-
"@polymer/polymer": "$@polymer/polymer",
142131
"@vaadin/hilla-lit-form": "$@vaadin/hilla-lit-form",
143132
"@vaadin/hilla-react-form": "$@vaadin/hilla-react-form",
144133
"@vaadin/hilla-react-signals": "$@vaadin/hilla-react-signals",
145134
"date-fns": "$date-fns",
146135
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
147136
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
148-
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
149-
"react-error-boundary": "$react-error-boundary"
137+
"react-error-boundary": "$react-error-boundary",
138+
"react-router": "$react-router",
139+
"@vaadin/aura": "$@vaadin/aura",
140+
"@vaadin/a11y-base": "25.0.1",
141+
"@vaadin/accordion": "25.0.1",
142+
"@vaadin/app-layout": "25.0.1",
143+
"@vaadin/avatar": "25.0.1",
144+
"@vaadin/avatar-group": "25.0.1",
145+
"@vaadin/button": "25.0.1",
146+
"@vaadin/card": "25.0.1",
147+
"@vaadin/checkbox": "25.0.1",
148+
"@vaadin/checkbox-group": "25.0.1",
149+
"@vaadin/combo-box": "25.0.1",
150+
"@vaadin/component-base": "25.0.1",
151+
"@vaadin/confirm-dialog": "25.0.1",
152+
"@vaadin/context-menu": "25.0.1",
153+
"@vaadin/custom-field": "25.0.1",
154+
"@vaadin/date-picker": "25.0.1",
155+
"@vaadin/date-time-picker": "25.0.1",
156+
"@vaadin/details": "25.0.1",
157+
"@vaadin/dialog": "25.0.1",
158+
"@vaadin/email-field": "25.0.1",
159+
"@vaadin/field-base": "25.0.1",
160+
"@vaadin/field-highlighter": "25.0.1",
161+
"@vaadin/form-layout": "25.0.1",
162+
"@vaadin/grid": "25.0.1",
163+
"@vaadin/horizontal-layout": "25.0.1",
164+
"@vaadin/icon": "25.0.1",
165+
"@vaadin/icons": "25.0.1",
166+
"@vaadin/input-container": "25.0.1",
167+
"@vaadin/integer-field": "25.0.1",
168+
"@vaadin/item": "25.0.1",
169+
"@vaadin/list-box": "25.0.1",
170+
"@vaadin/lit-renderer": "25.0.1",
171+
"@vaadin/login": "25.0.1",
172+
"@vaadin/markdown": "25.0.1",
173+
"@vaadin/master-detail-layout": "25.0.1",
174+
"@vaadin/menu-bar": "25.0.1",
175+
"@vaadin/message-input": "25.0.1",
176+
"@vaadin/message-list": "25.0.1",
177+
"@vaadin/multi-select-combo-box": "25.0.1",
178+
"@vaadin/notification": "25.0.1",
179+
"@vaadin/number-field": "25.0.1",
180+
"@vaadin/overlay": "25.0.1",
181+
"@vaadin/password-field": "25.0.1",
182+
"@vaadin/popover": "25.0.1",
183+
"@vaadin/progress-bar": "25.0.1",
184+
"@vaadin/radio-group": "25.0.1",
185+
"@vaadin/scroller": "25.0.1",
186+
"@vaadin/select": "25.0.1",
187+
"@vaadin/side-nav": "25.0.1",
188+
"@vaadin/split-layout": "25.0.1",
189+
"@vaadin/tabs": "25.0.1",
190+
"@vaadin/tabsheet": "25.0.1",
191+
"@vaadin/text-area": "25.0.1",
192+
"@vaadin/text-field": "25.0.1",
193+
"@vaadin/time-picker": "25.0.1",
194+
"@vaadin/tooltip": "25.0.1",
195+
"@vaadin/upload": "25.0.1",
196+
"@vaadin/router": "2.0.1",
197+
"@vaadin/vertical-layout": "25.0.1",
198+
"@vaadin/virtual-list": "25.0.1"
150199
}
151-
}
200+
}

‎pom.xml‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
<parent>
99
<groupId>org.springframework.boot</groupId>
1010
<artifactId>spring-boot-starter-parent</artifactId>
11-
<version>3.4.0</version>
11+
<version>4.0.1</version>
1212
</parent>
1313
<name>Hilla PetClinic</name>
1414

1515
<properties>
1616

1717
<!-- Generic properties -->
18-
<maven.compiler.source>17</maven.compiler.source>
19-
<maven.compiler.target>17</maven.compiler.target>
18+
<maven.compiler.source>21</maven.compiler.source>
19+
<maven.compiler.target>21</maven.compiler.target>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
22-
<java.version>17</java.version>
23-
<vaadin.version>24.6.0</vaadin.version>
22+
<java.version>21</java.version>
23+
<vaadin.version>25.0.2</vaadin.version>
2424
</properties>
2525

2626
<dependencyManagement>
@@ -108,6 +108,21 @@
108108
<groupId>com.vaadin</groupId>
109109
<artifactId>vaadin-spring-boot-starter</artifactId>
110110
</dependency>
111+
<dependency>
112+
<groupId>com.vaadin</groupId>
113+
<artifactId>hilla-spring-boot-starter</artifactId>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.vaadin</groupId>
117+
<artifactId>vaadin-dev</artifactId>
118+
<optional>true</optional>
119+
</dependency>
120+
121+
<dependency>
122+
<groupId>org.jspecify</groupId>
123+
<artifactId>jspecify</artifactId>
124+
<version>1.0.0</version>
125+
</dependency>
111126

112127
</dependencies>
113128

@@ -163,7 +178,7 @@
163178
<executions>
164179
<execution>
165180
<goals>
166-
<goal>prepare-frontend</goal>
181+
<goal>build-frontend</goal>
167182
</goals>
168183
</execution>
169184
</executions>
@@ -243,27 +258,6 @@
243258
</pluginRepositories>
244259

245260
<profiles>
246-
<profile>
247-
<!-- Production mode is activated using -Pproduction -->
248-
<id>production</id>
249-
<build>
250-
<plugins>
251-
<plugin>
252-
<groupId>com.vaadin</groupId>
253-
<artifactId>vaadin-maven-plugin</artifactId>
254-
<version>${vaadin.version}</version>
255-
<executions>
256-
<execution>
257-
<goals>
258-
<goal>build-frontend</goal>
259-
</goals>
260-
</execution>
261-
</executions>
262-
</plugin>
263-
</plugins>
264-
</build>
265-
</profile>
266-
267261
<profile>
268262
<id>it</id>
269263
<build>

0 commit comments

Comments
 (0)
⚡