Skip to content

Commit 964b378

Browse files
sissbrueckersissbruecker
authored
Merge branch 'main' into clarify-lumo-utility-upgrade
2 parents ddd7596 + 21f3384 commit 964b378

File tree

73 files changed

+2930
-1483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+2930
-1483
lines changed

‎.github/styles/Vaadin/Terms-App.yml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/styles/Vaadin/Terms.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ swap:
1212
'(?:WiFi|wifi)': Wi-Fi
1313
'3\-D': 3D
1414
Ajax: AJAX
15-
apps: applications
1615
approx\.: approximately
1716
back[\s|-]end: backend
1817
cellular data: mobile data
@@ -25,8 +24,6 @@ swap:
2524
regex: regular expression
2625
repo: repository
2726
timeframe: time frame
28-
separator: divider
29-
separators: dividers
3027
Spring-boot: Spring Boot
3128
# stylesheet: style sheet
3229
# stylesheets: style sheets

‎.github/workflows/check-feature-flags.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Check Feature Flags
2+
3+
on:
4+
pull_request:
5+
branches: [main]
6+
7+
jobs:
8+
check:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v6
12+
- name: Set up JDK 21
13+
uses: actions/setup-java@v5
14+
with:
15+
java-version: '21'
16+
distribution: 'temurin'
17+
cache: 'maven'
18+
- name: Check feature flags
19+
run: node scripts/check-feature-flags.js

‎.github/workflows/format-check.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Format Check
22

33
on:
44
pull_request:
5-
branches: [main]
65

76
concurrency:
87
group: '${{ github.workflow }}-${{ github.ref }}'

‎.github/workflows/preview-deploy.yml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Preview Deploy
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, closed]
6+
branches: [main]
7+
8+
concurrency:
9+
group: preview-${{ github.event.pull_request.number }}
10+
cancel-in-progress: true
11+
12+
env:
13+
FLY_APP: docs-preview-pr-${{ github.event.pull_request.number }}
14+
FLY_ORG: ${{ vars.FLY_ORG || 'personal' }}
15+
16+
jobs:
17+
build-and-deploy:
18+
if: github.event.action != 'closed'
19+
runs-on: ubuntu-latest
20+
permissions:
21+
contents: read
22+
pull-requests: write
23+
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v6
27+
28+
- name: Set up Fly CLI
29+
uses: superfly/flyctl-actions/setup-flyctl@master
30+
31+
- name: Create Fly app (if not exists)
32+
run: |
33+
flyctl apps create "${{ env.FLY_APP }}" --org "${{ env.FLY_ORG }}" 2>/dev/null || true
34+
env:
35+
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
36+
37+
- name: Generate fly.toml
38+
run: |
39+
cat > fly.toml <<EOF
40+
app = "${{ env.FLY_APP }}"
41+
primary_region = "ams"
42+
43+
[build]
44+
dockerfile = "Dockerfile.preview"
45+
46+
[http_service]
47+
internal_port = 8210
48+
force_https = true
49+
50+
[[vm]]
51+
size = "shared-cpu-1x"
52+
memory = "256mb"
53+
EOF
54+
55+
- name: Deploy to Fly.io
56+
run: |
57+
flyctl deploy \
58+
--ha=false \
59+
--remote-only \
60+
--build-arg VAADIN_PRO_KEY="${{ secrets.VAADIN_PRO_KEY }}"
61+
env:
62+
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
63+
64+
- name: Comment preview URL on PR
65+
uses: marocchino/sticky-pull-request-comment@v2
66+
with:
67+
header: preview-deploy
68+
message: |
69+
### Preview Deployment
70+
71+
This PR has been deployed for preview.
72+
73+
**URL:** https://${{ env.FLY_APP }}.fly.dev
74+
75+
_Built from ${{ github.sha }}_
76+
77+
cleanup:
78+
if: github.event.action == 'closed'
79+
runs-on: ubuntu-latest
80+
steps:
81+
- name: Set up Fly CLI
82+
uses: superfly/flyctl-actions/setup-flyctl@master
83+
84+
- name: Destroy Fly app
85+
run: |
86+
flyctl apps destroy "${{ env.FLY_APP }}" --yes 2>/dev/null || true
87+
env:
88+
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

‎Dockerfile.preview‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Dockerfile.preview
2+
# Builds the AsciiDoc documentation and serves the static output.
3+
4+
FROM node:24-alpine AS build
5+
6+
RUN apk add --no-cache openjdk21 maven
7+
8+
WORKDIR /app
9+
10+
COPY pom.xml ./
11+
RUN mvn dependency:go-offline -B
12+
13+
COPY package.json package-lock.json* ./
14+
RUN npm ci --ignore-scripts
15+
16+
COPY vite*.ts tsconfig.json ./
17+
COPY src/ src/
18+
COPY articles/ articles/
19+
COPY dspublisher/ dspublisher/
20+
COPY frontend/ frontend/
21+
22+
ARG VAADIN_PRO_KEY
23+
RUN mkdir -p ~/.vaadin && echo "{\"proKey\":\"$VAADIN_PRO_KEY\"}" > ~/.vaadin/proKey
24+
RUN mvn compile vaadin:prepare-frontend vaadin:build-frontend -B
25+
RUN npx -y @vaadin/dspublisher@3.0.0-alpha.13 --build
26+
27+
FROM node:24-alpine
28+
29+
RUN npm install -g serve
30+
31+
COPY --from=build /app/dspublisher/out/public /app/public
32+
33+
EXPOSE 8210
34+
35+
CMD ["serve", "/app/public", "-l", "8210"]

‎articles/_vaadin-version.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
:vaadin-version: 25.0.6
2-
:vaadin-start-platform-version: v25.0
1+
:vaadin-version: 25.1.0
2+
:vaadin-start-platform-version: v25.1
33
:vaadin-start-java-version: 21
4-
:vaadin-flow-version: 25.0.7
4+
:vaadin-flow-version: 25.1.0
55
:vaadin-seven-version: 7.7.49
66
:vaadin-eight-version: 8.28.4
7-
:spring-boot-version: 4.0.1
7+
:spring-boot-version: 4.0.4

‎articles/building-apps/ai/quickstart-guide.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ package org.vaadin.example;
121121
122122
import com.vaadin.flow.component.Composite;
123123
import com.vaadin.flow.component.ai.orchestrator.AIOrchestrator;
124-
import com.vaadin.flow.component.ai.provider.LLMProvider;
124+
import com.vaadin.flow.component.ai.provider.SpringAILLMProvider;
125125
import com.vaadin.flow.component.messages.MessageInput;
126126
import com.vaadin.flow.component.messages.MessageList;
127127
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@@ -146,7 +146,7 @@ public class MainView extends Composite<VerticalLayout> {
146146
messageInput.setWidthFull();
147147
148148
// Create the LLM provider
149-
var provider = LLMProvider.from(chatModel);
149+
var provider = new SpringAILLMProvider(chatModel);
150150
151151
// Wire everything together
152152
AIOrchestrator.builder(provider,

‎articles/compatibility.adoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Supported Technologies
33
page-title: Vaadin compatibility guide
4-
description: Lists the minimum required version of compatible technologies for Vaadin 24.
5-
meta-description: Learn about Vaadin’s compatibility with browsers, frameworks, and environments. See minimum required version of compatible technologies for Vaadin 24.
4+
description: Lists the minimum required version of compatible technologies for Vaadin 25.
5+
meta-description: Learn about Vaadin’s compatibility with browsers, frameworks, and environments. See minimum required version of compatible technologies for Vaadin 25.
66
order: 901
77
---
88

99

1010
= List of Supported Technologies
1111

12-
This page shows the minimum required versions of supported technologies for Vaadin 24. See the https://github.com/vaadin/platform/releases/tag/24.0.0[release notes] for more details.
12+
This page shows the minimum required versions of supported technologies for Vaadin 25. See the https://github.com/vaadin/platform/releases/tag/25.0.0[release notes] for more details.
1313

1414
[cols="1,1"]
1515
|===
@@ -20,11 +20,11 @@ This page shows the minimum required versions of supported technologies for Vaad
2020
| Node.js| 24 or later
2121
| Maven| 3.8 or later
2222
| Gradle| 8.14 or later
23-
| Servlet| 6 or later
23+
| Servlet| 6.1 or later
2424
| Application Servers
2525
a|
2626

27-
- Apache Tomcat 10.1
27+
- Apache Tomcat 11
2828
- Open Liberty 23
2929
- RedHat JBoss Enterprise Application Platform (EAP) 8.1
3030
- WildFly 36

‎articles/components/dashboard/index.adoc‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,32 @@ ifdef::flow[]
2525
----
2626
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/DashboardBasic.java[render,tags=snippet,indent=0,group=Flow]
2727
----
28+
[source,java]
29+
----
30+
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/MockWidgets.java[group=Flow]
31+
----
2832
endif::[]
2933

3034
ifdef::react[]
3135
[source,tsx]
3236
----
3337
include::{root}/frontend/demo/component/dashboard/react/dashboard-basic.tsx[render,tags=snippet,indent=0,group=React]
3438
----
39+
[source,tsx]
40+
----
41+
include::{root}/frontend/demo/component/dashboard/react/mock-widgets.tsx[group=React]
42+
----
3543
endif::[]
3644

3745
ifdef::lit[]
3846
[source,html]
3947
----
4048
include::{root}/frontend/demo/component/dashboard/dashboard-basic.ts[render,tags=snippet,indent=0,group=Lit]
4149
----
50+
[source,ts]
51+
----
52+
include::{root}/frontend/demo/component/dashboard/mock-widgets.ts[group=Lit]
53+
----
4254
endif::[]
4355
--
4456

@@ -264,20 +276,32 @@ ifdef::flow[]
264276
----
265277
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/DashboardBasic.java[render,tags=snippet,indent=0,group=Flow]
266278
----
279+
[source,java]
280+
----
281+
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/MockWidgets.java[group=Flow]
282+
----
267283
endif::[]
268284

269285
ifdef::react[]
270286
[source,tsx]
271287
----
272288
include::{root}/frontend/demo/component/dashboard/react/dashboard-basic.tsx[render,tags=snippet,indent=0,group=React]
273289
----
290+
[source,tsx]
291+
----
292+
include::{root}/frontend/demo/component/dashboard/react/mock-widgets.tsx[group=React]
293+
----
274294
endif::[]
275295

276296
ifdef::lit[]
277297
[source,html]
278298
----
279299
include::{root}/frontend/demo/component/dashboard/dashboard-basic.ts[render,tags=snippet,indent=0,group=Lit]
280300
----
301+
[source,ts]
302+
----
303+
include::{root}/frontend/demo/component/dashboard/mock-widgets.ts[group=Lit]
304+
----
281305
endif::[]
282306
--
283307

@@ -317,6 +341,10 @@ include::{root}/src/main/java/com/vaadin/demo/component/dashboard/WidgetConfig.j
317341
----
318342
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/DashboardStorage.java[tags=snippet,indent=0,group=Flow]
319343
----
344+
[source,java]
345+
----
346+
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/MockWidgets.java[group=Flow]
347+
----
320348
endif::[]
321349

322350
ifdef::react[]
@@ -332,6 +360,10 @@ include::{root}/src/main/java/com/vaadin/demo/component/dashboard/WidgetConfig.j
332360
----
333361
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/DashboardService.java[tags=snippet,indent=0,group=React]
334362
----
363+
[source,tsx]
364+
----
365+
include::{root}/frontend/demo/component/dashboard/react/mock-widgets.tsx[group=React]
366+
----
335367
endif::[]
336368

337369
ifdef::lit[]
@@ -347,6 +379,10 @@ include::{root}/src/main/java/com/vaadin/demo/component/dashboard/WidgetConfig.j
347379
----
348380
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/DashboardService.java[tags=snippet,indent=0,group=Lit]
349381
----
382+
[source,ts]
383+
----
384+
include::{root}/frontend/demo/component/dashboard/mock-widgets.ts[group=Lit]
385+
----
350386
endif::[]
351387
--
352388

@@ -425,6 +461,10 @@ ifdef::flow[]
425461
----
426462
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/DashboardAnnouncements.java[render,tags=snippet,indent=0,group=Flow]
427463
----
464+
[source,java]
465+
----
466+
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/MockWidgets.java[group=Flow]
467+
----
428468
endif::[]
429469

430470
ifdef::react[]
@@ -436,6 +476,10 @@ include::{root}/frontend/demo/component/dashboard/react/dashboard-announcements.
436476
----
437477
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/WidgetConfig.java[tags=snippet,indent=0,group=React]
438478
----
479+
[source,tsx]
480+
----
481+
include::{root}/frontend/demo/component/dashboard/react/mock-widgets.tsx[group=React]
482+
----
439483
endif::[]
440484

441485
ifdef::lit[]
@@ -447,6 +491,10 @@ include::{root}/frontend/demo/component/dashboard/dashboard-announcements.ts[ren
447491
----
448492
include::{root}/src/main/java/com/vaadin/demo/component/dashboard/WidgetConfig.java[tags=snippet,indent=0,group=Lit]
449493
----
494+
[source,ts]
495+
----
496+
include::{root}/frontend/demo/component/dashboard/mock-widgets.ts[group=Lit]
497+
----
450498
endif::[]
451499

452500
[source,css]

0 commit comments

Comments
 (0)