From 3a408c235580d35f8e35b4ef1589d60d11250f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=B3tay-Szab=C3=B3=20K=C3=A1roly?= Date: Tue, 2 Jul 2024 22:18:54 +0200 Subject: [PATCH 1/2] Vaadin 24.4.1 compatibility --- README.md | 2 + package-lock.json | 48 +++++++++++++++++++ pom.xml | 4 +- .../vaadin/textfieldformatter/MainView.java | 6 +-- .../it/AbstractCustomTestBenchTestCase.java | 2 +- 5 files changed, 55 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c2f2b93..2156418 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ This is an awesome TextField formatter extension built on top [Cleave.js](https: Supports credit card formatting and custom blocks e.g. IBAN. # Builds +### Vaadin 24 (5.5.0 branch) + ### Vaadin 14 (master) [![Build Status](https://travis-ci.org/johannesh2/textfieldformatter.svg?branch=master)](https://travis-ci.org/johannesh2/textfieldformatter) diff --git a/package-lock.json b/package-lock.json index d1b0486..e0a22a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4439,6 +4439,16 @@ "node": ">=8" } }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://otp.intrend.hu:8443/repository/npm-group/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -6726,6 +6736,13 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://otp.intrend.hu:8443/repository/npm-group/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "node_modules/fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -8664,6 +8681,13 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, + "node_modules/nan": { + "version": "2.20.0", + "resolved": "https://otp.intrend.hu:8443/repository/npm-group/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "dev": true, + "optional": true + }, "node_modules/nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -16402,6 +16426,16 @@ "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://otp.intrend.hu:8443/repository/npm-group/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -18317,6 +18351,13 @@ } } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://otp.intrend.hu:8443/repository/npm-group/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -19859,6 +19900,13 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, + "nan": { + "version": "2.20.0", + "resolved": "https://otp.intrend.hu:8443/repository/npm-group/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", diff --git a/pom.xml b/pom.xml index 462a374..74cc0e3 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.vaadin textfieldformatter - 5.5-SNAPSHOT + 5.5.0-SNAPSHOT TextField Formatter jar @@ -10,7 +10,7 @@ UTF-8 - 14.8.4 + 24.4.1 ${vaadin.version} ${project.version} diff --git a/src/test/java/org/vaadin/textfieldformatter/MainView.java b/src/test/java/org/vaadin/textfieldformatter/MainView.java index 52c8265..fc2a41f 100644 --- a/src/test/java/org/vaadin/textfieldformatter/MainView.java +++ b/src/test/java/org/vaadin/textfieldformatter/MainView.java @@ -10,11 +10,9 @@ import com.vaadin.flow.router.RouteData; import com.vaadin.flow.router.RouterLayout; import com.vaadin.flow.router.RouterLink; -import com.vaadin.flow.theme.Theme; -import com.vaadin.flow.theme.lumo.Lumo; @Route -@Theme(Lumo.class) +//@Theme(Lumo.class) public class MainView extends HorizontalLayout implements RouterLayout { private VerticalLayout menu; @@ -40,7 +38,7 @@ public MainView() { menu.add(link); } } else { - menu.add(new RouterLink(route.getUrl(), route.getNavigationTarget())); + menu.add(new RouterLink(route.getNavigationTarget())); } } } diff --git a/src/test/java/org/vaadin/textfieldformatter/it/AbstractCustomTestBenchTestCase.java b/src/test/java/org/vaadin/textfieldformatter/it/AbstractCustomTestBenchTestCase.java index 8eebae0..83f9996 100644 --- a/src/test/java/org/vaadin/textfieldformatter/it/AbstractCustomTestBenchTestCase.java +++ b/src/test/java/org/vaadin/textfieldformatter/it/AbstractCustomTestBenchTestCase.java @@ -38,7 +38,7 @@ protected void startBrowser(WebDriver driver) { ChromeOptions opt = new ChromeOptions(); String headless = System.getProperty("test.headless"); if (headless != null && Boolean.valueOf(headless)) { - opt.setHeadless(true); + opt.addArguments("--headless=new"); } driver = new ChromeDriver(opt); setDriver(driver); From 28e7669bd2f274f263f6f156e56e69ab58c3e70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=B3tay-Szab=C3=B3=20K=C3=A1roly?= Date: Sun, 7 Jul 2024 20:56:11 +0200 Subject: [PATCH 2/2] Vaadin 24.4.1 compatibility, commented out code has removed --- src/test/java/org/vaadin/textfieldformatter/MainView.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/vaadin/textfieldformatter/MainView.java b/src/test/java/org/vaadin/textfieldformatter/MainView.java index fc2a41f..4ef2ddd 100644 --- a/src/test/java/org/vaadin/textfieldformatter/MainView.java +++ b/src/test/java/org/vaadin/textfieldformatter/MainView.java @@ -12,7 +12,6 @@ import com.vaadin.flow.router.RouterLink; @Route -//@Theme(Lumo.class) public class MainView extends HorizontalLayout implements RouterLayout { private VerticalLayout menu;