Skip to content

Vaadin 25 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 6 commits into from
Feb 26, 2026
Merged

Vaadin 25 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
43b1a93
working on migration to Vaadin 25 and Aura
VISTALL Dec 21, 2025
173146e
Merge branch 'master' into vaadin25
VISTALL Feb 25, 2026
90fefef
initial finish migration to aura theme for plugins
VISTALL Feb 25, 2026
8dabbe7
working on migration to vaadin 25, and last spring boot
VISTALL Feb 26, 2026
e0799c6
sync to vaadin 25 other projects
VISTALL Feb 26, 2026
574d488
fix app
VISTALL Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .consulo/runConfigurations/_plugins_consulo_app__frontend.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<option name="PASS_PARENT_ENVS" value="true" />
<envs />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>
Empty file removed consulo.app/plugins-frontend/frontend/themes/vflow/main-layout.css
View file
Open in desktop
Empty file.
Empty file removed consulo.app/plugins-frontend/frontend/themes/vflow/theme-editor.css
View file
Open in desktop
Empty file.
9 changes: 0 additions & 9 deletions consulo.app/plugins-frontend/frontend/themes/vflow/theme.json
View file
Open in desktop

This file was deleted.

12,315 changes: 3,226 additions & 9,089 deletions consulo.app/plugins-frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

181 changes: 112 additions & 69 deletions consulo.app/plugins-frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,105 +3,148 @@
"license": "UNLICENSED",
"type": "module",
"dependencies": {
"@fontsource/inter": "4.5.0",
"@polymer/polymer": "3.5.2",
"@vaadin/bundles": "24.7.5",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/polymer-legacy-adapter": "24.7.5",
"@vaadin/react-components": "24.7.5",
"@vaadin/aura": "25.0.4",
"@vaadin/common-frontend": "0.0.22",
"@vaadin/polymer-legacy-adapter": "24.8.14",
"@vaadin/react-components": "25.0.4",
"@vaadin/vaadin-development-mode-detector": "2.0.7",
"@vaadin/vaadin-lumo-styles": "24.7.5",
"@vaadin/vaadin-material-styles": "24.7.5",
"@vaadin/vaadin-themable-mixin": "24.7.5",
"@vaadin/vaadin-lumo-styles": "25.0.4",
"@vaadin/vaadin-themable-mixin": "25.0.4",
"@vaadin/vaadin-usage-statistics": "2.1.3",
"construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.29.3",
"lit": "3.3.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "7.5.2"
"date-fns": "4.1.0",
"lit": "3.3.2",
"react": "19.2.4",
"react-dom": "19.2.4",
"react-router": "7.12.0"
},
"devDependencies": {
"@babel/preset-react": "7.26.3",
"@preact/signals-react-transform": "0.5.1",
"@rollup/plugin-replace": "6.0.2",
"@rollup/pluginutils": "5.1.4",
"@types/react": "18.3.20",
"@types/react-dom": "18.3.6",
"@vitejs/plugin-react": "4.4.1",
"async": "3.2.6",
"glob": "11.0.2",
"@babel/preset-react": "7.28.5",
"@preact/signals-react-transform": "0.6.0",
"@rollup/plugin-replace": "6.0.3",
"@rollup/pluginutils": "5.3.0",
"@types/node": "25.0.10",
"@types/react": "19.2.13",
"@types/react-dom": "19.2.3",
"@vitejs/plugin-react": "5.1.3",
"magic-string": "0.30.21",
"rollup-plugin-brotli": "3.1.0",
"rollup-plugin-visualizer": "5.14.0",
"rollup-plugin-visualizer": "6.0.5",
"strip-css-comments": "5.0.0",
"transform-ast": "2.4.4",
"typescript": "5.7.3",
"vite": "6.3.3",
"vite-plugin-checker": "0.9.1",
"workbox-build": "7.3.0",
"workbox-core": "7.3.0",
"workbox-precaching": "7.3.0"
"typescript": "5.9.3",
"vite": "7.3.1",
"vite-plugin-checker": "0.12.0",
"workbox-build": "7.4.0"
},
"overrides": {
"@vaadin/bundles": "$@vaadin/bundles",
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
"@vaadin/react-components": "$@vaadin/react-components",
"@vaadin/common-frontend": "$@vaadin/common-frontend",
"react-dom": "$react-dom",
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
"lit": "$lit",
"@polymer/polymer": "$@polymer/polymer",
"react": "$react",
"react-router": "$react-router",
"date-fns": "$date-fns",
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
"@fontsource/inter": "$@fontsource/inter"
"@vaadin/aura": "$@vaadin/aura",
"@vaadin/router": "2.0.1",
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
"@vaadin/a11y-base": "25.0.4",
"@vaadin/accordion": "25.0.4",
"@vaadin/app-layout": "25.0.4",
"@vaadin/avatar": "25.0.4",
"@vaadin/avatar-group": "25.0.4",
"@vaadin/button": "25.0.4",
"@vaadin/card": "25.0.4",
"@vaadin/checkbox": "25.0.4",
"@vaadin/checkbox-group": "25.0.4",
"@vaadin/combo-box": "25.0.4",
"@vaadin/component-base": "25.0.4",
"@vaadin/confirm-dialog": "25.0.4",
"@vaadin/context-menu": "25.0.4",
"@vaadin/custom-field": "25.0.4",
"@vaadin/date-picker": "25.0.4",
"@vaadin/date-time-picker": "25.0.4",
"@vaadin/details": "25.0.4",
"@vaadin/dialog": "25.0.4",
"@vaadin/email-field": "25.0.4",
"@vaadin/field-base": "25.0.4",
"@vaadin/field-highlighter": "25.0.4",
"@vaadin/form-layout": "25.0.4",
"@vaadin/grid": "25.0.4",
"@vaadin/horizontal-layout": "25.0.4",
"@vaadin/icon": "25.0.4",
"@vaadin/icons": "25.0.4",
"@vaadin/input-container": "25.0.4",
"@vaadin/integer-field": "25.0.4",
"@vaadin/item": "25.0.4",
"@vaadin/list-box": "25.0.4",
"@vaadin/lit-renderer": "25.0.4",
"@vaadin/login": "25.0.4",
"@vaadin/markdown": "25.0.4",
"@vaadin/master-detail-layout": "25.0.4",
"@vaadin/menu-bar": "25.0.4",
"@vaadin/message-input": "25.0.4",
"@vaadin/message-list": "25.0.4",
"@vaadin/multi-select-combo-box": "25.0.4",
"@vaadin/notification": "25.0.4",
"@vaadin/number-field": "25.0.4",
"@vaadin/overlay": "25.0.4",
"@vaadin/password-field": "25.0.4",
"@vaadin/popover": "25.0.4",
"@vaadin/progress-bar": "25.0.4",
"@vaadin/radio-group": "25.0.4",
"@vaadin/scroller": "25.0.4",
"@vaadin/select": "25.0.4",
"@vaadin/side-nav": "25.0.4",
"@vaadin/split-layout": "25.0.4",
"@vaadin/tabs": "25.0.4",
"@vaadin/tabsheet": "25.0.4",
"@vaadin/text-area": "25.0.4",
"@vaadin/text-field": "25.0.4",
"@vaadin/time-picker": "25.0.4",
"@vaadin/tooltip": "25.0.4",
"@vaadin/upload": "25.0.4",
"@vaadin/vertical-layout": "25.0.4",
"@vaadin/virtual-list": "25.0.4"
},
"vaadin": {
"dependencies": {
"@fontsource/inter": "4.5.0",
"@polymer/polymer": "3.5.2",
"@vaadin/bundles": "24.7.5",
"@vaadin/common-frontend": "0.0.19",
"@vaadin/polymer-legacy-adapter": "24.7.5",
"@vaadin/react-components": "24.7.5",
"@vaadin/aura": "25.0.4",
"@vaadin/common-frontend": "0.0.22",
"@vaadin/polymer-legacy-adapter": "24.8.14",
"@vaadin/react-components": "25.0.4",
"@vaadin/vaadin-development-mode-detector": "2.0.7",
"@vaadin/vaadin-lumo-styles": "24.7.5",
"@vaadin/vaadin-material-styles": "24.7.5",
"@vaadin/vaadin-themable-mixin": "24.7.5",
"@vaadin/vaadin-lumo-styles": "25.0.4",
"@vaadin/vaadin-themable-mixin": "25.0.4",
"@vaadin/vaadin-usage-statistics": "2.1.3",
"construct-style-sheets-polyfill": "3.1.0",
"date-fns": "2.29.3",
"lit": "3.3.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router": "7.5.2"
"date-fns": "4.1.0",
"lit": "3.3.2",
"react": "19.2.4",
"react-dom": "19.2.4",
"react-router": "7.12.0"
},
"devDependencies": {
"@babel/preset-react": "7.26.3",
"@preact/signals-react-transform": "0.5.1",
"@rollup/plugin-replace": "6.0.2",
"@rollup/pluginutils": "5.1.4",
"@types/react": "18.3.20",
"@types/react-dom": "18.3.6",
"@vitejs/plugin-react": "4.4.1",
"async": "3.2.6",
"glob": "11.0.2",
"@babel/preset-react": "7.28.5",
"@preact/signals-react-transform": "0.6.0",
"@rollup/plugin-replace": "6.0.3",
"@rollup/pluginutils": "5.3.0",
"@types/node": "25.0.10",
"@types/react": "19.2.13",
"@types/react-dom": "19.2.3",
"@vitejs/plugin-react": "5.1.3",
"magic-string": "0.30.21",
"rollup-plugin-brotli": "3.1.0",
"rollup-plugin-visualizer": "5.14.0",
"rollup-plugin-visualizer": "6.0.5",
"strip-css-comments": "5.0.0",
"transform-ast": "2.4.4",
"typescript": "5.7.3",
"vite": "6.3.3",
"vite-plugin-checker": "0.9.1",
"workbox-build": "7.3.0",
"workbox-core": "7.3.0",
"workbox-precaching": "7.3.0"
"typescript": "5.9.3",
"vite": "7.3.1",
"vite-plugin-checker": "0.12.0",
"workbox-build": "7.4.0"
},
"hash": "3c9d16ecf2f6659a06ae59fd9c6638bc403599ea4fb7d6babc164f31dc257601"
"hash": "09da7888f54eee4012848b1e61dee6d08b5a57914ed16ca371311a0fa0e72eec"
}
}
5 changes: 5 additions & 0 deletions consulo.app/plugins-frontend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

<dependency>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
Expand Down
Binary file modified consulo.app/plugins-frontend/src/main/bundles/dev.bundle
View file
Open in desktop
Binary file not shown.
17 changes: 9 additions & 8 deletions consulo.app/plugins-frontend/src/main/java/consulo/app/plugins/frontend/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package consulo.app.plugins.frontend;

import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.component.dependency.StyleSheet;
import com.vaadin.flow.component.page.AppShellConfigurator;
import com.vaadin.flow.component.page.Push;
import com.vaadin.flow.server.AppShellSettings;
import com.vaadin.flow.shared.communication.PushMode;
import com.vaadin.flow.spring.annotation.EnableVaadin;
import com.vaadin.flow.theme.Theme;
import com.vaadin.flow.theme.aura.Aura;
import consulo.procoeton.core.ProCore;
import jakarta.annotation.Nonnull;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.boot.security.autoconfigure.UserDetailsServiceAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.socket.config.annotation.EnableWebSocket;
Expand All @@ -22,18 +22,19 @@
* @author VISTALL
* @since 2025-05-10
*/
@EnableCaching
@EnableScheduling
@EnableWebSocket
@SpringBootApplication(exclude = {
DataSourceAutoConfiguration.class,
UserDetailsServiceAutoConfiguration.class
})
@EnableVaadin({"consulo.app.plugins.frontend", "consulo.procoeton.core"})
@ComponentScan(basePackageClasses = {ProCore.class, Application.class}, basePackages = "consulo.app.plugins.frontend")
@Push(PushMode.MANUAL)
@NpmPackage(value = "@fontsource/inter", version = "4.5.0")
@Theme(value = "vflow")
@NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.8.14")
@StyleSheet(Aura.STYLESHEET)
@CssImport("./plugins-app.css")
@CssImport("./scrollbar.css")
@CssImport("./procoeton-ui.css")
public class Application implements AppShellConfigurator {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
Expand Down
8 changes: 6 additions & 2 deletions consulo.app/plugins-frontend/src/main/java/consulo/app/plugins/frontend/ui/IndexView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import com.vaadin.flow.router.AfterNavigationEvent;
import com.vaadin.flow.router.HasDynamicTitle;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.server.auth.AnonymousAllowed;
import consulo.app.plugins.frontend.backend.FeaturePluginsService;
import consulo.app.plugins.frontend.backend.PluginsCacheService;
import consulo.app.plugins.frontend.service.TagsLocalizeLoader;
Expand All @@ -20,6 +19,7 @@
import consulo.app.plugins.frontend.ui.indexView.WelcomePluginsPanel;
import consulo.procoeton.core.vaadin.ui.VChildLayout;
import consulo.procoeton.core.vaadin.ui.util.VaadinUIUtil;
import jakarta.annotation.security.PermitAll;
import org.apache.commons.lang3.StringUtils;
import org.vaadin.lineawesome.LineAwesomeIcon;

Expand All @@ -28,7 +28,7 @@
* @since 2025-05-10
*/
@Route(value = "/", layout = PluginsAppLayout.class)
@AnonymousAllowed
@PermitAll
public class IndexView extends VChildLayout implements HasDynamicTitle {
private final TagsLocalizeLoader myTagsLocalizeLoader;

Expand All @@ -43,10 +43,14 @@ public IndexView(PluginsCacheService pluginsCacheService,
searchLayout.setJustifyContentMode(JustifyContentMode.CENTER);
searchLayout.setWidthFull();

setPadding(false);

myWelcomePanel = new WelcomePluginsPanel(pluginsCacheService, featurePluginsService);
mySearchPluginPanel = new SearchPluginPanel(pluginsCacheService);

VerticalLayout holder = VaadinUIUtil.newVerticalLayout();
holder.setPadding(false);
holder.setMargin(false);

TextField searchField = new TextField();
searchField.setAutofocus(true);
Expand Down
Loading
Loading