From 8cc905eee2b35adb32b5b5cbcaae038c0fd7e103 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:53:17 -0300
Subject: [PATCH 1/5] build: set version to 4.0.0-SNAPSHOT
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 65f1700..996a4ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.flowingcode.vaadin.addons.demo
commons-demo
- 3.10.0-SNAPSHOT
+ 4.0.0-SNAPSHOT
Commons Demo
Common classes for add-ons demo
From 01df50e10cd04d9ec170ba46e164b84382a18ece Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:55:48 -0300
Subject: [PATCH 2/5] build: set vaadin version to 24.3.2
---
pom.xml | 66 ++++-----------------------------------------------------
1 file changed, 4 insertions(+), 62 deletions(-)
diff --git a/pom.xml b/pom.xml
index 996a4ae..3fc7ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
UTF-8
- 1.8
- 1.8
- 14.10.3
- 9.4.36.v20210114
+ 17
+ 17
+ 24.3.2
+ 11.0.12
@@ -79,36 +79,8 @@
com.vaadin
-
vaadin-core
true
-
-
-
- com.vaadin.webjar
- *
-
-
- org.webjars.bowergithub.insites
- *
-
-
- org.webjars.bowergithub.polymer
- *
-
-
- org.webjars.bowergithub.polymerelements
- *
-
-
- org.webjars.bowergithub.vaadin
- *
-
-
- org.webjars.bowergithub.webcomponents
- *
-
-
@@ -304,36 +276,6 @@
-
-
- v23
-
- 23.2.10
- 11
- 11
-
-
-
- v24
-
- 24.2.6
- 17
- 17
- 11.0.12
-
-
-
- vaadin-prerelease
- https://maven.vaadin.com/vaadin-prereleases
-
-
-
-
- vaadin-prerelease
- https://maven.vaadin.com/vaadin-prereleases
-
-
-
From 7f6ed5d9b2a9fca9cc4b4515f9b490b1972b0e32 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:57:22 -0300
Subject: [PATCH 3/5] chore: ignore bundles
---
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 8a30ffa..407f945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ types.d.ts
/frontend/index.html
vite.generated.ts
vite.config.ts
-/src/main/dev-bundle
\ No newline at end of file
+/src/main/dev-bundle
+/src/main/bundles
From b2e4acb368fb7c1bedb185a7b6c3781866096f8c Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:12:43 -0300
Subject: [PATCH 4/5] build!: remove hardcoded lit dependency
Close #78
---
.../com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java | 2 --
1 file changed, 2 deletions(-)
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 e678755..d8616b1 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/demo/SourceCodeViewer.java
@@ -26,7 +26,6 @@
import com.vaadin.flow.component.HasSize;
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.dependency.JsModule;
-import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.dom.Element;
import com.vaadin.flow.server.VaadinService;
@@ -36,7 +35,6 @@
@SuppressWarnings("serial")
@JsModule("./code-viewer.ts")
-@NpmPackage(value = "lit", version = "2.5.0")
public class SourceCodeViewer extends Div implements HasSize {
private final Element codeViewer;
From b15860735b4c987d32c30136d182efc8bcdeb7ce Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:23:36 -0300
Subject: [PATCH 5/5] fix: import customElement from lit/decorators
---
src/main/resources/META-INF/resources/frontend/code-viewer.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/META-INF/resources/frontend/code-viewer.ts b/src/main/resources/META-INF/resources/frontend/code-viewer.ts
index 9027bc3..e56a576 100644
--- a/src/main/resources/META-INF/resources/frontend/code-viewer.ts
+++ b/src/main/resources/META-INF/resources/frontend/code-viewer.ts
@@ -18,11 +18,11 @@
* #L%
*/
import {
- customElement,
html,
LitElement
} from "lit-element";
+import {customElement} from 'lit/decorators/custom-element.js';
import "./prism.js";
(function () {