From bc9a640fc730be684ab098e17bb50fc22500d06f Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:38:42 -0300 Subject: [PATCH 1/9] chore: ignore /src/main/frontend --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 407f945..53dc944 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ vite.generated.ts vite.config.ts /src/main/dev-bundle /src/main/bundles +/src/main/frontend/generated +/src/main/frontend/index.html \ No newline at end of file From b62fae2d430c025dcdc44041539b15b71f919c2c Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:40:49 -0300 Subject: [PATCH 2/9] ci: add vaadin 25 profile --- pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pom.xml b/pom.xml index 61de6a0..2a2435e 100644 --- a/pom.xml +++ b/pom.xml @@ -302,6 +302,28 @@ + + v25 + + 21 + 21 + 25.0.0-beta2 + + + + vaadin-prerelease + https://maven.vaadin.com/vaadin-prereleases + + + + + + vaadin-prerelease + https://maven.vaadin.com/vaadin-prereleases + + + + From e3b54d43941843e0125c3c24a263b40114a363d4 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:42:06 -0300 Subject: [PATCH 3/9] feat(demo): add AppShellConfiguratorImpl --- pom.xml | 1 + .../vaadin/addons/demo/AppShellConfiguratorImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 src/test/java/com/flowingcode/vaadin/addons/demo/AppShellConfiguratorImpl.java diff --git a/pom.xml b/pom.xml index 2a2435e..ac2a037 100644 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,7 @@ apache_v2 false + **/AppShellConfiguratorImpl.class **/main/resources/META-INF/resources/frontend/prism.js **/main/resources/META-INF/resources/frontend/prism.css **/test/resources/** diff --git a/src/test/java/com/flowingcode/vaadin/addons/demo/AppShellConfiguratorImpl.java b/src/test/java/com/flowingcode/vaadin/addons/demo/AppShellConfiguratorImpl.java new file mode 100644 index 0000000..95407e9 --- /dev/null +++ b/src/test/java/com/flowingcode/vaadin/addons/demo/AppShellConfiguratorImpl.java @@ -0,0 +1,9 @@ +package com.flowingcode.vaadin.addons.demo; + +import com.vaadin.flow.component.page.AppShellConfigurator; +import com.vaadin.flow.theme.Theme; + +@Theme +public class AppShellConfiguratorImpl implements AppShellConfigurator { + +} From fb0963e0ae84a3018e6a34818d114f09177998c9 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:55:34 -0300 Subject: [PATCH 4/9] ci: use webApp instead of webAppConfig in jetty configuration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ac2a037..e2998c6 100644 --- a/pom.xml +++ b/pom.xml @@ -187,12 +187,12 @@ jar - + src/main/resources/META-INF/resources src/test/resources/META-INF/resources - + From 69131a38faa49df1a411188fc67f6aae56696c23 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:42:43 -0300 Subject: [PATCH 5/9] refactor: use JsonMigration helper --- pom.xml | 6 ++++++ .../vaadin/addons/demo/MultiSourceCodeViewer.java | 6 ++++-- .../flowingcode/vaadin/addons/demo/SourceCodeViewer.java | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e2998c6..8c82936 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,12 @@ 1.2.0 + + com.flowingcode.vaadin + json-migration-helper + 0.0.1-SNAPSHOT + + junit junit diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java b/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java index 45c139b..3b84235 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java @@ -2,7 +2,7 @@ * #%L * Commons Demo * %% - * Copyright (C) 2020 - 2024 Flowing Code + * Copyright (C) 2020 - 2025 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ package com.flowingcode.vaadin.addons.demo; import com.flowingcode.vaadin.addons.enhancedtabs.EnhancedTabs; +import com.flowingcode.vaadin.jsonmigration.JsonMigration; import com.vaadin.flow.component.ComponentUtil; import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.tabs.Tab; @@ -46,7 +47,8 @@ public MultiSourceCodeViewer(List sourceCodeTabs, Map { - JsonValue filename = ev.getEventData().get("event.detail.filename"); + JsonValue filename = + JsonMigration.convertToJsonValue(ev.getEventData().get("event.detail.filename")); findTabWithFilename(Optional.ofNullable(filename).map(JsonValue::asString).orElse(null)) .ifPresent(tab -> { tabs.setSelectedTab(tab); diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java b/src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java index 89a40f1..82d59e4 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java @@ -2,7 +2,7 @@ * #%L * Commons Demo * %% - * Copyright (C) 2020 - 2024 Flowing Code + * Copyright (C) 2020 - 2025 Flowing Code * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ package com.flowingcode.vaadin.addons.demo; import com.flowingcode.vaadin.addons.DevSourceRequestHandler; +import com.flowingcode.vaadin.jsonmigration.JsonMigration; import com.vaadin.flow.component.ClickNotifier; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.HasElement; @@ -85,7 +86,7 @@ private void setProperties(Map properties) { env.put(k, Json.create(v)); } }); - codeViewer.setPropertyJson("env", env); + JsonMigration.setPropertyJson(codeViewer, "env", env); } } From 644e4daa82d69274e6c1a037bb49416c7a72317b Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 16 Oct 2025 20:43:39 -0300 Subject: [PATCH 6/9] chore: update jetty to 11.0.26 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c82936..06a433f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 17 17 24.3.13 - 11.0.12 + 11.0.26 From d1f4a548097bed4a60d9e778beb9f81ab40f37d7 Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Tue, 21 Oct 2025 16:52:31 -0300 Subject: [PATCH 7/9] build: add FlowingCode snapshot repository --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 06a433f..86a5510 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,13 @@ false + + flowing-snapshots + https://maven.flowingcode.com/snapshots + + true + + From 845fabf59a8624547ff120d36e1c0e3a7f798ecd Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Thu, 23 Oct 2025 13:06:05 -0300 Subject: [PATCH 8/9] build: set version to 4.4.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86a5510..26275c2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.flowingcode.vaadin.addons.demo commons-demo - 4.3.1-SNAPSHOT + 4.4.0-SNAPSHOT Commons Demo Common classes for add-ons demo From f7b601f76674f2457c10f0da7f74433b91bf685c Mon Sep 17 00:00:00 2001 From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com> Date: Wed, 29 Oct 2025 10:33:52 -0300 Subject: [PATCH 9/9] refactor: use getEventData migration helper --- .../flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java b/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java index 3b84235..2b7110b 100644 --- a/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java +++ b/src/main/java/com/flowingcode/vaadin/addons/demo/MultiSourceCodeViewer.java @@ -47,8 +47,7 @@ public MultiSourceCodeViewer(List sourceCodeTabs, Map { - JsonValue filename = - JsonMigration.convertToJsonValue(ev.getEventData().get("event.detail.filename")); + JsonValue filename = JsonMigration.getEventData(ev).get("event.detail.filename"); findTabWithFilename(Optional.ofNullable(filename).map(JsonValue::asString).orElse(null)) .ifPresent(tab -> { tabs.setSelectedTab(tab);