Skip to content

Commit f3a42bc

Browse files
VISTALLVISTALL
authored
Merge pull request #54 from consulo/vaadin25
Vaadin 25
2 parents bf9cd30 + 574d488 commit f3a42bc

80 files changed

Lines changed: 9091 additions & 29299 deletions

File tree

Some content is hidden

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

‎.consulo/runConfigurations/_plugins_consulo_app__frontend.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<option name="PASS_PARENT_ENVS" value="true" />
1919
<envs />
2020
<ConfigurationWrapper RunnerId="Debug" />
21+
<ConfigurationWrapper RunnerId="Run" />
2122
<method />
2223
</configuration>
2324
</component>

‎consulo.app/plugins-frontend/frontend/themes/vflow/main-layout.css‎

Whitespace-only changes.

‎consulo.app/plugins-frontend/frontend/themes/vflow/theme-editor.css‎

Whitespace-only changes.

‎consulo.app/plugins-frontend/frontend/themes/vflow/theme.json‎

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

‎consulo.app/plugins-frontend/package-lock.json‎

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

‎consulo.app/plugins-frontend/package.json‎

Lines changed: 112 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,105 +3,148 @@
33
"license": "UNLICENSED",
44
"type": "module",
55
"dependencies": {
6-
"@fontsource/inter": "4.5.0",
7-
"@polymer/polymer": "3.5.2",
8-
"@vaadin/bundles": "24.7.5",
9-
"@vaadin/common-frontend": "0.0.19",
10-
"@vaadin/polymer-legacy-adapter": "24.7.5",
11-
"@vaadin/react-components": "24.7.5",
6+
"@vaadin/aura": "25.0.4",
7+
"@vaadin/common-frontend": "0.0.22",
8+
"@vaadin/polymer-legacy-adapter": "24.8.14",
9+
"@vaadin/react-components": "25.0.4",
1210
"@vaadin/vaadin-development-mode-detector": "2.0.7",
13-
"@vaadin/vaadin-lumo-styles": "24.7.5",
14-
"@vaadin/vaadin-material-styles": "24.7.5",
15-
"@vaadin/vaadin-themable-mixin": "24.7.5",
11+
"@vaadin/vaadin-lumo-styles": "25.0.4",
12+
"@vaadin/vaadin-themable-mixin": "25.0.4",
1613
"@vaadin/vaadin-usage-statistics": "2.1.3",
17-
"construct-style-sheets-polyfill": "3.1.0",
18-
"date-fns": "2.29.3",
19-
"lit": "3.3.0",
20-
"react": "18.3.1",
21-
"react-dom": "18.3.1",
22-
"react-router": "7.5.2"
14+
"date-fns": "4.1.0",
15+
"lit": "3.3.2",
16+
"react": "19.2.4",
17+
"react-dom": "19.2.4",
18+
"react-router": "7.12.0"
2319
},
2420
"devDependencies": {
25-
"@babel/preset-react": "7.26.3",
26-
"@preact/signals-react-transform": "0.5.1",
27-
"@rollup/plugin-replace": "6.0.2",
28-
"@rollup/pluginutils": "5.1.4",
29-
"@types/react": "18.3.20",
30-
"@types/react-dom": "18.3.6",
31-
"@vitejs/plugin-react": "4.4.1",
32-
"async": "3.2.6",
33-
"glob": "11.0.2",
21+
"@babel/preset-react": "7.28.5",
22+
"@preact/signals-react-transform": "0.6.0",
23+
"@rollup/plugin-replace": "6.0.3",
24+
"@rollup/pluginutils": "5.3.0",
25+
"@types/node": "25.0.10",
26+
"@types/react": "19.2.13",
27+
"@types/react-dom": "19.2.3",
28+
"@vitejs/plugin-react": "5.1.3",
29+
"magic-string": "0.30.21",
3430
"rollup-plugin-brotli": "3.1.0",
35-
"rollup-plugin-visualizer": "5.14.0",
31+
"rollup-plugin-visualizer": "6.0.5",
3632
"strip-css-comments": "5.0.0",
3733
"transform-ast": "2.4.4",
38-
"typescript": "5.7.3",
39-
"vite": "6.3.3",
40-
"vite-plugin-checker": "0.9.1",
41-
"workbox-build": "7.3.0",
42-
"workbox-core": "7.3.0",
43-
"workbox-precaching": "7.3.0"
34+
"typescript": "5.9.3",
35+
"vite": "7.3.1",
36+
"vite-plugin-checker": "0.12.0",
37+
"workbox-build": "7.4.0"
4438
},
4539
"overrides": {
46-
"@vaadin/bundles": "$@vaadin/bundles",
47-
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
4840
"@vaadin/vaadin-development-mode-detector": "$@vaadin/vaadin-development-mode-detector",
4941
"@vaadin/vaadin-usage-statistics": "$@vaadin/vaadin-usage-statistics",
5042
"@vaadin/react-components": "$@vaadin/react-components",
5143
"@vaadin/common-frontend": "$@vaadin/common-frontend",
5244
"react-dom": "$react-dom",
53-
"construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
5445
"lit": "$lit",
55-
"@polymer/polymer": "$@polymer/polymer",
5646
"react": "$react",
5747
"react-router": "$react-router",
5848
"date-fns": "$date-fns",
5949
"@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
6050
"@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
61-
"@vaadin/vaadin-material-styles": "$@vaadin/vaadin-material-styles",
62-
"@fontsource/inter": "$@fontsource/inter"
51+
"@vaadin/aura": "$@vaadin/aura",
52+
"@vaadin/router": "2.0.1",
53+
"@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
54+
"@vaadin/a11y-base": "25.0.4",
55+
"@vaadin/accordion": "25.0.4",
56+
"@vaadin/app-layout": "25.0.4",
57+
"@vaadin/avatar": "25.0.4",
58+
"@vaadin/avatar-group": "25.0.4",
59+
"@vaadin/button": "25.0.4",
60+
"@vaadin/card": "25.0.4",
61+
"@vaadin/checkbox": "25.0.4",
62+
"@vaadin/checkbox-group": "25.0.4",
63+
"@vaadin/combo-box": "25.0.4",
64+
"@vaadin/component-base": "25.0.4",
65+
"@vaadin/confirm-dialog": "25.0.4",
66+
"@vaadin/context-menu": "25.0.4",
67+
"@vaadin/custom-field": "25.0.4",
68+
"@vaadin/date-picker": "25.0.4",
69+
"@vaadin/date-time-picker": "25.0.4",
70+
"@vaadin/details": "25.0.4",
71+
"@vaadin/dialog": "25.0.4",
72+
"@vaadin/email-field": "25.0.4",
73+
"@vaadin/field-base": "25.0.4",
74+
"@vaadin/field-highlighter": "25.0.4",
75+
"@vaadin/form-layout": "25.0.4",
76+
"@vaadin/grid": "25.0.4",
77+
"@vaadin/horizontal-layout": "25.0.4",
78+
"@vaadin/icon": "25.0.4",
79+
"@vaadin/icons": "25.0.4",
80+
"@vaadin/input-container": "25.0.4",
81+
"@vaadin/integer-field": "25.0.4",
82+
"@vaadin/item": "25.0.4",
83+
"@vaadin/list-box": "25.0.4",
84+
"@vaadin/lit-renderer": "25.0.4",
85+
"@vaadin/login": "25.0.4",
86+
"@vaadin/markdown": "25.0.4",
87+
"@vaadin/master-detail-layout": "25.0.4",
88+
"@vaadin/menu-bar": "25.0.4",
89+
"@vaadin/message-input": "25.0.4",
90+
"@vaadin/message-list": "25.0.4",
91+
"@vaadin/multi-select-combo-box": "25.0.4",
92+
"@vaadin/notification": "25.0.4",
93+
"@vaadin/number-field": "25.0.4",
94+
"@vaadin/overlay": "25.0.4",
95+
"@vaadin/password-field": "25.0.4",
96+
"@vaadin/popover": "25.0.4",
97+
"@vaadin/progress-bar": "25.0.4",
98+
"@vaadin/radio-group": "25.0.4",
99+
"@vaadin/scroller": "25.0.4",
100+
"@vaadin/select": "25.0.4",
101+
"@vaadin/side-nav": "25.0.4",
102+
"@vaadin/split-layout": "25.0.4",
103+
"@vaadin/tabs": "25.0.4",
104+
"@vaadin/tabsheet": "25.0.4",
105+
"@vaadin/text-area": "25.0.4",
106+
"@vaadin/text-field": "25.0.4",
107+
"@vaadin/time-picker": "25.0.4",
108+
"@vaadin/tooltip": "25.0.4",
109+
"@vaadin/upload": "25.0.4",
110+
"@vaadin/vertical-layout": "25.0.4",
111+
"@vaadin/virtual-list": "25.0.4"
63112
},
64113
"vaadin": {
65114
"dependencies": {
66-
"@fontsource/inter": "4.5.0",
67-
"@polymer/polymer": "3.5.2",
68-
"@vaadin/bundles": "24.7.5",
69-
"@vaadin/common-frontend": "0.0.19",
70-
"@vaadin/polymer-legacy-adapter": "24.7.5",
71-
"@vaadin/react-components": "24.7.5",
115+
"@vaadin/aura": "25.0.4",
116+
"@vaadin/common-frontend": "0.0.22",
117+
"@vaadin/polymer-legacy-adapter": "24.8.14",
118+
"@vaadin/react-components": "25.0.4",
72119
"@vaadin/vaadin-development-mode-detector": "2.0.7",
73-
"@vaadin/vaadin-lumo-styles": "24.7.5",
74-
"@vaadin/vaadin-material-styles": "24.7.5",
75-
"@vaadin/vaadin-themable-mixin": "24.7.5",
120+
"@vaadin/vaadin-lumo-styles": "25.0.4",
121+
"@vaadin/vaadin-themable-mixin": "25.0.4",
76122
"@vaadin/vaadin-usage-statistics": "2.1.3",
77-
"construct-style-sheets-polyfill": "3.1.0",
78-
"date-fns": "2.29.3",
79-
"lit": "3.3.0",
80-
"react": "18.3.1",
81-
"react-dom": "18.3.1",
82-
"react-router": "7.5.2"
123+
"date-fns": "4.1.0",
124+
"lit": "3.3.2",
125+
"react": "19.2.4",
126+
"react-dom": "19.2.4",
127+
"react-router": "7.12.0"
83128
},
84129
"devDependencies": {
85-
"@babel/preset-react": "7.26.3",
86-
"@preact/signals-react-transform": "0.5.1",
87-
"@rollup/plugin-replace": "6.0.2",
88-
"@rollup/pluginutils": "5.1.4",
89-
"@types/react": "18.3.20",
90-
"@types/react-dom": "18.3.6",
91-
"@vitejs/plugin-react": "4.4.1",
92-
"async": "3.2.6",
93-
"glob": "11.0.2",
130+
"@babel/preset-react": "7.28.5",
131+
"@preact/signals-react-transform": "0.6.0",
132+
"@rollup/plugin-replace": "6.0.3",
133+
"@rollup/pluginutils": "5.3.0",
134+
"@types/node": "25.0.10",
135+
"@types/react": "19.2.13",
136+
"@types/react-dom": "19.2.3",
137+
"@vitejs/plugin-react": "5.1.3",
138+
"magic-string": "0.30.21",
94139
"rollup-plugin-brotli": "3.1.0",
95-
"rollup-plugin-visualizer": "5.14.0",
140+
"rollup-plugin-visualizer": "6.0.5",
96141
"strip-css-comments": "5.0.0",
97142
"transform-ast": "2.4.4",
98-
"typescript": "5.7.3",
99-
"vite": "6.3.3",
100-
"vite-plugin-checker": "0.9.1",
101-
"workbox-build": "7.3.0",
102-
"workbox-core": "7.3.0",
103-
"workbox-precaching": "7.3.0"
143+
"typescript": "5.9.3",
144+
"vite": "7.3.1",
145+
"vite-plugin-checker": "0.12.0",
146+
"workbox-build": "7.4.0"
104147
},
105-
"hash": "3c9d16ecf2f6659a06ae59fd9c6638bc403599ea4fb7d6babc164f31dc257601"
148+
"hash": "09da7888f54eee4012848b1e61dee6d08b5a57914ed16ca371311a0fa0e72eec"
106149
}
107150
}

‎consulo.app/plugins-frontend/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@
170170
<artifactId>jakarta.servlet-api</artifactId>
171171
</dependency>
172172

173+
<dependency>
174+
<groupId>com.fasterxml.jackson.core</groupId>
175+
<artifactId>jackson-core</artifactId>
176+
</dependency>
177+
173178
<dependency>
174179
<groupId>org.lz4</groupId>
175180
<artifactId>lz4-java</artifactId>

‎consulo.app/plugins-frontend/src/main/bundles/dev.bundle‎

181 KB
Binary file not shown.

‎consulo.app/plugins-frontend/src/main/java/consulo/app/plugins/frontend/Application.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package consulo.app.plugins.frontend;
22

3+
import com.vaadin.flow.component.dependency.CssImport;
34
import com.vaadin.flow.component.dependency.NpmPackage;
5+
import com.vaadin.flow.component.dependency.StyleSheet;
46
import com.vaadin.flow.component.page.AppShellConfigurator;
57
import com.vaadin.flow.component.page.Push;
68
import com.vaadin.flow.server.AppShellSettings;
79
import com.vaadin.flow.shared.communication.PushMode;
810
import com.vaadin.flow.spring.annotation.EnableVaadin;
9-
import com.vaadin.flow.theme.Theme;
11+
import com.vaadin.flow.theme.aura.Aura;
1012
import consulo.procoeton.core.ProCore;
1113
import jakarta.annotation.Nonnull;
1214
import org.springframework.boot.SpringApplication;
1315
import org.springframework.boot.autoconfigure.SpringBootApplication;
14-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
15-
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
16-
import org.springframework.cache.annotation.EnableCaching;
16+
import org.springframework.boot.security.autoconfigure.UserDetailsServiceAutoConfiguration;
1717
import org.springframework.context.annotation.ComponentScan;
1818
import org.springframework.scheduling.annotation.EnableScheduling;
1919
import org.springframework.web.socket.config.annotation.EnableWebSocket;
@@ -22,18 +22,19 @@
2222
* @author VISTALL
2323
* @since 2025-05-10
2424
*/
25-
@EnableCaching
2625
@EnableScheduling
2726
@EnableWebSocket
2827
@SpringBootApplication(exclude = {
29-
DataSourceAutoConfiguration.class,
3028
UserDetailsServiceAutoConfiguration.class
3129
})
3230
@EnableVaadin({"consulo.app.plugins.frontend", "consulo.procoeton.core"})
3331
@ComponentScan(basePackageClasses = {ProCore.class, Application.class}, basePackages = "consulo.app.plugins.frontend")
3432
@Push(PushMode.MANUAL)
35-
@NpmPackage(value = "@fontsource/inter", version = "4.5.0")
36-
@Theme(value = "vflow")
33+
@NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.8.14")
34+
@StyleSheet(Aura.STYLESHEET)
35+
@CssImport("./plugins-app.css")
36+
@CssImport("./scrollbar.css")
37+
@CssImport("./procoeton-ui.css")
3738
public class Application implements AppShellConfigurator {
3839
public static void main(String[] args) {
3940
SpringApplication.run(Application.class, args);

‎consulo.app/plugins-frontend/src/main/java/consulo/app/plugins/frontend/ui/IndexView.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.vaadin.flow.router.AfterNavigationEvent;
1212
import com.vaadin.flow.router.HasDynamicTitle;
1313
import com.vaadin.flow.router.Route;
14-
import com.vaadin.flow.server.auth.AnonymousAllowed;
1514
import consulo.app.plugins.frontend.backend.FeaturePluginsService;
1615
import consulo.app.plugins.frontend.backend.PluginsCacheService;
1716
import consulo.app.plugins.frontend.service.TagsLocalizeLoader;
@@ -20,6 +19,7 @@
2019
import consulo.app.plugins.frontend.ui.indexView.WelcomePluginsPanel;
2120
import consulo.procoeton.core.vaadin.ui.VChildLayout;
2221
import consulo.procoeton.core.vaadin.ui.util.VaadinUIUtil;
22+
import jakarta.annotation.security.PermitAll;
2323
import org.apache.commons.lang3.StringUtils;
2424
import org.vaadin.lineawesome.LineAwesomeIcon;
2525

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

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

46+
setPadding(false);
47+
4648
myWelcomePanel = new WelcomePluginsPanel(pluginsCacheService, featurePluginsService);
4749
mySearchPluginPanel = new SearchPluginPanel(pluginsCacheService);
4850

4951
VerticalLayout holder = VaadinUIUtil.newVerticalLayout();
52+
holder.setPadding(false);
53+
holder.setMargin(false);
5054

5155
TextField searchField = new TextField();
5256
searchField.setAutofocus(true);

0 commit comments

Comments
 (0)