From 7f93f0a192d58fbd176f0abdbf224a0857830950 Mon Sep 17 00:00:00 2001 From: web-padawan Date: Mon, 23 Dec 2024 13:15:24 +0200 Subject: [PATCH 1/6] chore: update components to use Lit based entrypoints --- .../java/com/vaadin/flow/component/accordion/Accordion.java | 2 +- .../com/vaadin/flow/component/accordion/AccordionPanel.java | 2 +- .../java/com/vaadin/flow/component/applayout/AppLayout.java | 2 +- .../java/com/vaadin/flow/component/applayout/DrawerToggle.java | 2 +- .../src/main/java/com/vaadin/flow/component/avatar/Avatar.java | 2 +- .../main/java/com/vaadin/flow/component/avatar/AvatarGroup.java | 2 +- .../com/vaadin/flow/component/contextmenu/ContextMenuBase.java | 2 +- .../java/com/vaadin/flow/component/customfield/CustomField.java | 2 +- .../main/java/com/vaadin/flow/component/details/Details.java | 2 +- .../src/main/java/com/vaadin/flow/component/dialog/Dialog.java | 2 +- .../java/com/vaadin/flow/component/listbox/ListBoxBase.java | 2 +- .../main/java/com/vaadin/flow/component/listbox/VaadinItem.java | 2 +- .../com/vaadin/flow/component/notification/Notification.java | 2 +- .../vaadin/flow/component/orderedlayout/HorizontalLayout.java | 2 +- .../java/com/vaadin/flow/component/orderedlayout/Scroller.java | 2 +- .../com/vaadin/flow/component/orderedlayout/VerticalLayout.java | 2 +- .../java/com/vaadin/flow/component/radiobutton/RadioButton.java | 2 +- .../com/vaadin/flow/component/radiobutton/RadioButtonGroup.java | 2 +- .../java/com/vaadin/flow/component/splitlayout/SplitLayout.java | 2 +- .../src/main/java/com/vaadin/flow/component/tabs/Tab.java | 2 +- .../src/main/java/com/vaadin/flow/component/tabs/TabSheet.java | 2 +- .../src/main/java/com/vaadin/flow/component/tabs/Tabs.java | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java index eeb8c9b95aa..97389b38254 100644 --- a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java +++ b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/accordion", version = "24.7.0-alpha2") -@JsModule("@vaadin/accordion/src/vaadin-accordion.js") +@JsModule("@vaadin/accordion/src/vaadin-lit-accordion.js") public class Accordion extends Component implements HasSize, HasStyle { private static final String OPENED_PROPERTY = "opened"; diff --git a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java index a985d8d142b..b65253304d5 100644 --- a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java +++ b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java @@ -28,7 +28,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/accordion", version = "24.7.0-alpha2") -@JsModule("@vaadin/accordion/src/vaadin-accordion-panel.js") +@JsModule("@vaadin/accordion/src/vaadin-lit-accordion-panel.js") public class AccordionPanel extends Details { /** diff --git a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java index 69f60c2f74d..3fda7a089d6 100644 --- a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java +++ b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/app-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/app-layout/src/vaadin-app-layout.js") +@JsModule("@vaadin/app-layout/src/vaadin-lit-app-layout.js") public class AppLayout extends Component implements RouterLayout, HasStyle { private static final PropertyDescriptor primarySectionProperty = PropertyDescriptors .propertyWithDefault("primarySection", diff --git a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java index 73c09be02a1..e1d6ef43b84 100644 --- a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java +++ b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java @@ -33,7 +33,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/app-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/app-layout/src/vaadin-drawer-toggle.js") +@JsModule("@vaadin/app-layout/src/vaadin-lit-drawer-toggle.js") public class DrawerToggle extends Button { public void setIcon(Component icon) { diff --git a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java index 0c7cdee4eba..d12bdf70ccc 100644 --- a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java +++ b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java @@ -55,7 +55,7 @@ @Tag("vaadin-avatar") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/avatar/src/vaadin-avatar.js") +@JsModule("@vaadin/avatar/src/vaadin-lit-avatar.js") @NpmPackage(value = "@vaadin/avatar", version = "24.7.0-alpha2") public class Avatar extends Component implements HasStyle, HasSize, HasThemeVariant { diff --git a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java index ebc06176429..c6ed82efb41 100644 --- a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java +++ b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java @@ -67,7 +67,7 @@ @Tag("vaadin-avatar-group") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/avatar-group/src/vaadin-avatar-group.js") +@JsModule("@vaadin/avatar-group/src/vaadin-lit-avatar-group.js") @NpmPackage(value = "@vaadin/avatar-group", version = "24.7.0-alpha2") public class AvatarGroup extends Component implements HasOverlayClassName, HasStyle, HasSize, HasThemeVariant { diff --git a/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java b/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java index a35522f090b..449d77300ba 100644 --- a/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java +++ b/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/context-menu", version = "24.7.0-alpha2") -@JsModule("@vaadin/context-menu/src/vaadin-context-menu.js") +@JsModule("@vaadin/context-menu/src/vaadin-lit-context-menu.js") @JsModule("./flow-component-renderer.js") @JsModule("./contextMenuConnector.js") @JsModule("./contextMenuTargetConnector.js") diff --git a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java index aef9e4806c9..1e002c73441 100644 --- a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java +++ b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java @@ -50,7 +50,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/custom-field", version = "24.7.0-alpha2") -@JsModule("@vaadin/custom-field/src/vaadin-custom-field.js") +@JsModule("@vaadin/custom-field/src/vaadin-lit-custom-field.js") public abstract class CustomField extends AbstractField, T> implements Focusable>, InputField, T>, T>, diff --git a/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java b/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java index 0226222c3cd..fb8798361e3 100644 --- a/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java +++ b/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/details", version = "24.7.0-alpha2") -@JsModule("@vaadin/details/src/vaadin-details.js") +@JsModule("@vaadin/details/src/vaadin-lit-details.js") public class Details extends Component implements HasComponents, HasSize, HasThemeVariant, HasTooltip { diff --git a/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java b/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java index fcd3edb36ee..f4bccdbc917 100644 --- a/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java +++ b/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java @@ -80,7 +80,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/dialog", version = "24.7.0-alpha2") -@JsModule("@vaadin/dialog/src/vaadin-dialog.js") +@JsModule("@vaadin/dialog/src/vaadin-lit-dialog.js") @JsModule("./flow-component-renderer.js") public class Dialog extends Component implements HasComponents, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java index dd87317fa69..a5f680670ea 100644 --- a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java +++ b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java @@ -70,7 +70,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/list-box", version = "24.7.0-alpha2") -@JsModule("@vaadin/list-box/src/vaadin-list-box.js") +@JsModule("@vaadin/list-box/src/vaadin-lit-list-box.js") public abstract class ListBoxBase, ITEM, VALUE> extends AbstractSinglePropertyField implements HasAriaLabel, HasItemComponents, HasSize, diff --git a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java index fe706963238..60feaf794c0 100644 --- a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java +++ b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java @@ -35,7 +35,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/item", version = "24.7.0-alpha2") -@JsModule("@vaadin/item/src/vaadin-item.js") +@JsModule("@vaadin/item/src/vaadin-lit-item.js") class VaadinItem extends Component implements HasItemComponents.ItemComponent, HasComponents { diff --git a/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java b/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java index b3097d351b9..b2f55fc314c 100644 --- a/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java +++ b/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java @@ -57,7 +57,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/notification", version = "24.7.0-alpha2") -@JsModule("@vaadin/notification/src/vaadin-notification.js") +@JsModule("@vaadin/notification/src/vaadin-lit-notification.js") @JsModule("./flow-component-renderer.js") public class Notification extends Component implements HasComponents, HasStyle, HasThemeVariant { diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java index 58dc7abf376..44251404cfa 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java @@ -31,7 +31,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/horizontal-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/horizontal-layout/src/vaadin-horizontal-layout.js") +@JsModule("@vaadin/horizontal-layout/src/vaadin-lit-horizontal-layout.js") public class HorizontalLayout extends Component implements ThemableLayout, FlexComponent, ClickNotifier { diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java index fa3e1d77fbd..fd3595fe2c6 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java @@ -39,7 +39,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/scroller", version = "24.7.0-alpha2") -@JsModule("@vaadin/scroller/src/vaadin-scroller.js") +@JsModule("@vaadin/scroller/src/vaadin-lit-scroller.js") public class Scroller extends Component implements Focusable, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java index a11bea4d1c8..eb0eb1d000b 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java @@ -31,7 +31,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/vertical-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/vertical-layout/src/vaadin-vertical-layout.js") +@JsModule("@vaadin/vertical-layout/src/vaadin-lit-vertical-layout.js") public class VerticalLayout extends Component implements ThemableLayout, FlexComponent, ClickNotifier { diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java index 26087a0b17d..f423e3f6463 100644 --- a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java +++ b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java @@ -37,7 +37,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/radio-group", version = "24.7.0-alpha2") -@JsModule("@vaadin/radio-group/src/vaadin-radio-button.js") +@JsModule("@vaadin/radio-group/src/vaadin-lit-radio-button.js") class RadioButton extends Component implements ClickNotifier>, Focusable>, HasComponents, HasItemComponents.ItemComponent, HasStyle { diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java index f519a220348..8d366e5167b 100755 --- a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java +++ b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java @@ -105,7 +105,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/radio-group", version = "24.7.0-alpha2") -@JsModule("@vaadin/radio-group/src/vaadin-radio-group.js") +@JsModule("@vaadin/radio-group/src/vaadin-lit-radio-group.js") public class RadioButtonGroup extends AbstractSinglePropertyField, T> implements HasAriaLabel, HasClientValidation, diff --git a/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java b/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java index 91b5092c8f9..ba88e0809ed 100644 --- a/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java +++ b/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java @@ -46,7 +46,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/split-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/split-layout/src/vaadin-split-layout.js") +@JsModule("@vaadin/split-layout/src/vaadin-lit-split-layout.js") public class SplitLayout extends Component implements ClickNotifier, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java index 5e0c9ee0c8f..4e06a72b386 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java @@ -35,7 +35,7 @@ @Tag("vaadin-tab") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/tabs/src/vaadin-tab.js") +@JsModule("@vaadin/tabs/src/vaadin-lit-tab.js") @NpmPackage(value = "@vaadin/tabs", version = "24.7.0-alpha2") public class Tab extends Component implements HasAriaLabel, HasComponents, HasLabel, HasStyle, HasThemeVariant, HasTooltip { diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java index 351c38c85d5..7d1e2b16e4c 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java @@ -46,7 +46,7 @@ */ @Tag("vaadin-tabsheet") @NpmPackage(value = "@vaadin/tabsheet", version = "24.7.0-alpha2") -@JsModule("@vaadin/tabsheet/src/vaadin-tabsheet.js") +@JsModule("@vaadin/tabsheet/src/vaadin-lit-tabsheet.js") public class TabSheet extends Component implements HasPrefix, HasStyle, HasSize, HasSuffix, HasThemeVariant { diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java index dd7c8cea8aa..a6b416cd4e3 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java @@ -68,7 +68,7 @@ @Tag("vaadin-tabs") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/tabs/src/vaadin-tabs.js") +@JsModule("@vaadin/tabs/src/vaadin-lit-tabs.js") @NpmPackage(value = "@vaadin/tabs", version = "24.7.0-alpha2") public class Tabs extends Component implements HasEnabled, HasSize, HasStyle, HasThemeVariant { From 7dd1361f6eef7a40526debbcf3fe76da34b747e5 Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Sun, 12 Jan 2025 11:01:04 +0400 Subject: [PATCH 2/6] use vite plugin to load lit versions --- shared/web-components-vite-plugin.ts | 40 +++++++++++++++++++ .../vite.config.ts | 4 ++ .../flow/component/accordion/Accordion.java | 3 +- .../component/accordion/AccordionPanel.java | 2 +- .../vite.config.ts | 4 ++ .../flow/component/applayout/AppLayout.java | 2 +- .../component/applayout/DrawerToggle.java | 2 +- .../vite.config.ts | 4 ++ .../vaadin/flow/component/avatar/Avatar.java | 2 +- .../flow/component/avatar/AvatarGroup.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../contextmenu/ContextMenuBase.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../component/customfield/CustomField.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../flow/component/details/Details.java | 2 +- .../vite.config.ts | 4 ++ .../vaadin/flow/component/dialog/Dialog.java | 2 +- .../vite.config.ts | 4 ++ .../com/vaadin/tests/AbstractComponentIT.java | 2 + .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../flow/component/listbox/ListBoxBase.java | 2 +- .../flow/component/listbox/VaadinItem.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../component/notification/Notification.java | 2 +- .../vite.config.ts | 4 ++ .../orderedlayout/HorizontalLayout.java | 2 +- .../component/orderedlayout/Scroller.java | 2 +- .../orderedlayout/VerticalLayout.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../component/radiobutton/RadioButton.java | 2 +- .../radiobutton/RadioButtonGroup.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../component/splitlayout/SplitLayout.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../com/vaadin/flow/component/tabs/Tab.java | 2 +- .../vaadin/flow/component/tabs/TabSheet.java | 2 +- .../com/vaadin/flow/component/tabs/Tabs.java | 2 +- .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ .../vite.config.ts | 4 ++ 69 files changed, 245 insertions(+), 22 deletions(-) diff --git a/shared/web-components-vite-plugin.ts b/shared/web-components-vite-plugin.ts index ce1d588a8dd..308bd39ab8f 100644 --- a/shared/web-components-vite-plugin.ts +++ b/shared/web-components-vite-plugin.ts @@ -25,3 +25,43 @@ export function useLocalWebComponents(webComponentsNodeModulesPath: string): Plu }, } } + +/** + * Vite plugin that resolves Vaadin web components to Lit versions + */ +export function useLitWebComponents(): PluginOption { + return { + name: 'use-lit-web-components', + config() { + return { + resolve: { + alias: [ + 'accordion', + 'app-layout', + 'avatar-group', + 'context-menu', + 'custom-field', + 'details', + 'dialog', + 'horizontal-layout', + 'list-box', + 'notification', + 'radio-button-group', + 'scroller', + 'split-layout', + 'tabs', + 'vertical-layout' + ].flatMap((component) => { + return [ + { + find: new RegExp(`^@vaadin/${component}\/(src\/)?vaadin-(?!lit)`), + replacement: `@vaadin/${component}/$1vaadin-lit-` + } + ] + }) + }, + } + } + } +} + diff --git a/vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/vite.config.ts b/vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/vite.config.ts +++ b/vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java index 97389b38254..ea25f31a129 100644 --- a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java +++ b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/Accordion.java @@ -55,7 +55,8 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/accordion", version = "24.7.0-alpha2") -@JsModule("@vaadin/accordion/src/vaadin-lit-accordion.js") + +@JsModule("@vaadin/accordion/src/vaadin-accordion.js") public class Accordion extends Component implements HasSize, HasStyle { private static final String OPENED_PROPERTY = "opened"; diff --git a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java index b65253304d5..a985d8d142b 100644 --- a/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java +++ b/vaadin-accordion-flow-parent/vaadin-accordion-flow/src/main/java/com/vaadin/flow/component/accordion/AccordionPanel.java @@ -28,7 +28,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/accordion", version = "24.7.0-alpha2") -@JsModule("@vaadin/accordion/src/vaadin-lit-accordion-panel.js") +@JsModule("@vaadin/accordion/src/vaadin-accordion-panel.js") public class AccordionPanel extends Details { /** diff --git a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow-integration-tests/vite.config.ts b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow-integration-tests/vite.config.ts +++ b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java index 3fda7a089d6..69f60c2f74d 100644 --- a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java +++ b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/AppLayout.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/app-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/app-layout/src/vaadin-lit-app-layout.js") +@JsModule("@vaadin/app-layout/src/vaadin-app-layout.js") public class AppLayout extends Component implements RouterLayout, HasStyle { private static final PropertyDescriptor primarySectionProperty = PropertyDescriptors .propertyWithDefault("primarySection", diff --git a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java index e1d6ef43b84..73c09be02a1 100644 --- a/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java +++ b/vaadin-app-layout-flow-parent/vaadin-app-layout-flow/src/main/java/com/vaadin/flow/component/applayout/DrawerToggle.java @@ -33,7 +33,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/app-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/app-layout/src/vaadin-lit-drawer-toggle.js") +@JsModule("@vaadin/app-layout/src/vaadin-drawer-toggle.js") public class DrawerToggle extends Button { public void setIcon(Component icon) { diff --git a/vaadin-avatar-flow-parent/vaadin-avatar-flow-integration-tests/vite.config.ts b/vaadin-avatar-flow-parent/vaadin-avatar-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-avatar-flow-parent/vaadin-avatar-flow-integration-tests/vite.config.ts +++ b/vaadin-avatar-flow-parent/vaadin-avatar-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java index d12bdf70ccc..0c7cdee4eba 100644 --- a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java +++ b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/Avatar.java @@ -55,7 +55,7 @@ @Tag("vaadin-avatar") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/avatar/src/vaadin-lit-avatar.js") +@JsModule("@vaadin/avatar/src/vaadin-avatar.js") @NpmPackage(value = "@vaadin/avatar", version = "24.7.0-alpha2") public class Avatar extends Component implements HasStyle, HasSize, HasThemeVariant { diff --git a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java index c6ed82efb41..ebc06176429 100644 --- a/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java +++ b/vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarGroup.java @@ -67,7 +67,7 @@ @Tag("vaadin-avatar-group") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/avatar-group/src/vaadin-lit-avatar-group.js") +@JsModule("@vaadin/avatar-group/src/vaadin-avatar-group.js") @NpmPackage(value = "@vaadin/avatar-group", version = "24.7.0-alpha2") public class AvatarGroup extends Component implements HasOverlayClassName, HasStyle, HasSize, HasThemeVariant { diff --git a/vaadin-board-flow-parent/vaadin-board-flow-integration-tests/vite.config.ts b/vaadin-board-flow-parent/vaadin-board-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-board-flow-parent/vaadin-board-flow-integration-tests/vite.config.ts +++ b/vaadin-board-flow-parent/vaadin-board-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-button-flow-parent/vaadin-button-flow-integration-tests/vite.config.ts b/vaadin-button-flow-parent/vaadin-button-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-button-flow-parent/vaadin-button-flow-integration-tests/vite.config.ts +++ b/vaadin-button-flow-parent/vaadin-button-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-charts-flow-parent/vaadin-charts-flow-integration-tests/vite.config.ts b/vaadin-charts-flow-parent/vaadin-charts-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-charts-flow-parent/vaadin-charts-flow-integration-tests/vite.config.ts +++ b/vaadin-charts-flow-parent/vaadin-charts-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-checkbox-flow-parent/vaadin-checkbox-flow-integration-tests/vite.config.ts b/vaadin-checkbox-flow-parent/vaadin-checkbox-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-checkbox-flow-parent/vaadin-checkbox-flow-integration-tests/vite.config.ts +++ b/vaadin-checkbox-flow-parent/vaadin-checkbox-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/vite.config.ts b/vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/vite.config.ts +++ b/vaadin-combo-box-flow-parent/vaadin-combo-box-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-confirm-dialog-flow-parent/vaadin-confirm-dialog-flow-integration-tests/vite.config.ts b/vaadin-confirm-dialog-flow-parent/vaadin-confirm-dialog-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-confirm-dialog-flow-parent/vaadin-confirm-dialog-flow-integration-tests/vite.config.ts +++ b/vaadin-confirm-dialog-flow-parent/vaadin-confirm-dialog-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-context-menu-flow-parent/vaadin-context-menu-flow-integration-tests/vite.config.ts b/vaadin-context-menu-flow-parent/vaadin-context-menu-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-context-menu-flow-parent/vaadin-context-menu-flow-integration-tests/vite.config.ts +++ b/vaadin-context-menu-flow-parent/vaadin-context-menu-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java b/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java index 449d77300ba..a35522f090b 100644 --- a/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java +++ b/vaadin-context-menu-flow-parent/vaadin-context-menu-flow/src/main/java/com/vaadin/flow/component/contextmenu/ContextMenuBase.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/context-menu", version = "24.7.0-alpha2") -@JsModule("@vaadin/context-menu/src/vaadin-lit-context-menu.js") +@JsModule("@vaadin/context-menu/src/vaadin-context-menu.js") @JsModule("./flow-component-renderer.js") @JsModule("./contextMenuConnector.js") @JsModule("./contextMenuTargetConnector.js") diff --git a/vaadin-cookie-consent-flow-parent/vaadin-cookie-consent-flow-integration-tests/vite.config.ts b/vaadin-cookie-consent-flow-parent/vaadin-cookie-consent-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-cookie-consent-flow-parent/vaadin-cookie-consent-flow-integration-tests/vite.config.ts +++ b/vaadin-cookie-consent-flow-parent/vaadin-cookie-consent-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-crud-flow-parent/vaadin-crud-flow-integration-tests/vite.config.ts b/vaadin-crud-flow-parent/vaadin-crud-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-crud-flow-parent/vaadin-crud-flow-integration-tests/vite.config.ts +++ b/vaadin-crud-flow-parent/vaadin-crud-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow-integration-tests/vite.config.ts b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow-integration-tests/vite.config.ts +++ b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java index 1e002c73441..aef9e4806c9 100644 --- a/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java +++ b/vaadin-custom-field-flow-parent/vaadin-custom-field-flow/src/main/java/com/vaadin/flow/component/customfield/CustomField.java @@ -50,7 +50,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/custom-field", version = "24.7.0-alpha2") -@JsModule("@vaadin/custom-field/src/vaadin-lit-custom-field.js") +@JsModule("@vaadin/custom-field/src/vaadin-custom-field.js") public abstract class CustomField extends AbstractField, T> implements Focusable>, InputField, T>, T>, diff --git a/vaadin-dashboard-flow-parent/vaadin-dashboard-flow-integration-tests/vite.config.ts b/vaadin-dashboard-flow-parent/vaadin-dashboard-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-dashboard-flow-parent/vaadin-dashboard-flow-integration-tests/vite.config.ts +++ b/vaadin-dashboard-flow-parent/vaadin-dashboard-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-date-picker-flow-parent/vaadin-date-picker-flow-integration-tests/vite.config.ts b/vaadin-date-picker-flow-parent/vaadin-date-picker-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-date-picker-flow-parent/vaadin-date-picker-flow-integration-tests/vite.config.ts +++ b/vaadin-date-picker-flow-parent/vaadin-date-picker-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/vite.config.ts b/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/vite.config.ts +++ b/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-details-flow-parent/vaadin-details-flow-integration-tests/vite.config.ts b/vaadin-details-flow-parent/vaadin-details-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-details-flow-parent/vaadin-details-flow-integration-tests/vite.config.ts +++ b/vaadin-details-flow-parent/vaadin-details-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java b/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java index fb8798361e3..0226222c3cd 100644 --- a/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java +++ b/vaadin-details-flow-parent/vaadin-details-flow/src/main/java/com/vaadin/flow/component/details/Details.java @@ -55,7 +55,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/details", version = "24.7.0-alpha2") -@JsModule("@vaadin/details/src/vaadin-lit-details.js") +@JsModule("@vaadin/details/src/vaadin-details.js") public class Details extends Component implements HasComponents, HasSize, HasThemeVariant, HasTooltip { diff --git a/vaadin-dialog-flow-parent/vaadin-dialog-flow-integration-tests/vite.config.ts b/vaadin-dialog-flow-parent/vaadin-dialog-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-dialog-flow-parent/vaadin-dialog-flow-integration-tests/vite.config.ts +++ b/vaadin-dialog-flow-parent/vaadin-dialog-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java b/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java index f4bccdbc917..fcd3edb36ee 100644 --- a/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java +++ b/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/Dialog.java @@ -80,7 +80,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/dialog", version = "24.7.0-alpha2") -@JsModule("@vaadin/dialog/src/vaadin-lit-dialog.js") +@JsModule("@vaadin/dialog/src/vaadin-dialog.js") @JsModule("./flow-component-renderer.js") public class Dialog extends Component implements HasComponents, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-field-highlighter-flow-parent/vaadin-field-highlighter-flow-integration-tests/vite.config.ts b/vaadin-field-highlighter-flow-parent/vaadin-field-highlighter-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-field-highlighter-flow-parent/vaadin-field-highlighter-flow-integration-tests/vite.config.ts +++ b/vaadin-field-highlighter-flow-parent/vaadin-field-highlighter-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-flow-components-shared-parent/vaadin-flow-components-test-util/src/main/java/com/vaadin/tests/AbstractComponentIT.java b/vaadin-flow-components-shared-parent/vaadin-flow-components-test-util/src/main/java/com/vaadin/tests/AbstractComponentIT.java index 11bdae98258..5e318a5ae99 100644 --- a/vaadin-flow-components-shared-parent/vaadin-flow-components-test-util/src/main/java/com/vaadin/tests/AbstractComponentIT.java +++ b/vaadin-flow-components-shared-parent/vaadin-flow-components-test-util/src/main/java/com/vaadin/tests/AbstractComponentIT.java @@ -15,6 +15,8 @@ */ package com.vaadin.tests; +import org.openqa.selenium.chrome.ChromeDriver; + public abstract class AbstractComponentIT extends com.vaadin.flow.testutil.AbstractComponentIT { diff --git a/vaadin-form-layout-flow-parent/vaadin-form-layout-flow-integration-tests/vite.config.ts b/vaadin-form-layout-flow-parent/vaadin-form-layout-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-form-layout-flow-parent/vaadin-form-layout-flow-integration-tests/vite.config.ts +++ b/vaadin-form-layout-flow-parent/vaadin-form-layout-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow-integration-tests/vite.config.ts b/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow-integration-tests/vite.config.ts +++ b/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-icons-flow-parent/vaadin-icons-flow-integration-tests/vite.config.ts b/vaadin-icons-flow-parent/vaadin-icons-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-icons-flow-parent/vaadin-icons-flow-integration-tests/vite.config.ts +++ b/vaadin-icons-flow-parent/vaadin-icons-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-list-box-flow-parent/vaadin-list-box-flow-integration-tests/vite.config.ts b/vaadin-list-box-flow-parent/vaadin-list-box-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-list-box-flow-parent/vaadin-list-box-flow-integration-tests/vite.config.ts +++ b/vaadin-list-box-flow-parent/vaadin-list-box-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java index a5f680670ea..dd87317fa69 100644 --- a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java +++ b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/ListBoxBase.java @@ -70,7 +70,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/list-box", version = "24.7.0-alpha2") -@JsModule("@vaadin/list-box/src/vaadin-lit-list-box.js") +@JsModule("@vaadin/list-box/src/vaadin-list-box.js") public abstract class ListBoxBase, ITEM, VALUE> extends AbstractSinglePropertyField implements HasAriaLabel, HasItemComponents, HasSize, diff --git a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java index 60feaf794c0..fe706963238 100644 --- a/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java +++ b/vaadin-list-box-flow-parent/vaadin-list-box-flow/src/main/java/com/vaadin/flow/component/listbox/VaadinItem.java @@ -35,7 +35,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/item", version = "24.7.0-alpha2") -@JsModule("@vaadin/item/src/vaadin-lit-item.js") +@JsModule("@vaadin/item/src/vaadin-item.js") class VaadinItem extends Component implements HasItemComponents.ItemComponent, HasComponents { diff --git a/vaadin-login-flow-parent/vaadin-login-flow-integration-tests/vite.config.ts b/vaadin-login-flow-parent/vaadin-login-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-login-flow-parent/vaadin-login-flow-integration-tests/vite.config.ts +++ b/vaadin-login-flow-parent/vaadin-login-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-lumo-theme-flow-parent/vaadin-lumo-theme-flow-integration-tests/vite.config.ts b/vaadin-lumo-theme-flow-parent/vaadin-lumo-theme-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-lumo-theme-flow-parent/vaadin-lumo-theme-flow-integration-tests/vite.config.ts +++ b/vaadin-lumo-theme-flow-parent/vaadin-lumo-theme-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-map-flow-parent/vaadin-map-flow-integration-tests/vite.config.ts b/vaadin-map-flow-parent/vaadin-map-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-map-flow-parent/vaadin-map-flow-integration-tests/vite.config.ts +++ b/vaadin-map-flow-parent/vaadin-map-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-material-theme-flow-parent/vaadin-material-theme-flow-integration-tests/vite.config.ts b/vaadin-material-theme-flow-parent/vaadin-material-theme-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-material-theme-flow-parent/vaadin-material-theme-flow-integration-tests/vite.config.ts +++ b/vaadin-material-theme-flow-parent/vaadin-material-theme-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-menu-bar-flow-parent/vaadin-menu-bar-flow-integration-tests/vite.config.ts b/vaadin-menu-bar-flow-parent/vaadin-menu-bar-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-menu-bar-flow-parent/vaadin-menu-bar-flow-integration-tests/vite.config.ts +++ b/vaadin-menu-bar-flow-parent/vaadin-menu-bar-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-messages-flow-parent/vaadin-messages-flow-integration-tests/vite.config.ts b/vaadin-messages-flow-parent/vaadin-messages-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-messages-flow-parent/vaadin-messages-flow-integration-tests/vite.config.ts +++ b/vaadin-messages-flow-parent/vaadin-messages-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-notification-flow-parent/vaadin-notification-flow-integration-tests/vite.config.ts b/vaadin-notification-flow-parent/vaadin-notification-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-notification-flow-parent/vaadin-notification-flow-integration-tests/vite.config.ts +++ b/vaadin-notification-flow-parent/vaadin-notification-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java b/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java index b2f55fc314c..b3097d351b9 100644 --- a/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java +++ b/vaadin-notification-flow-parent/vaadin-notification-flow/src/main/java/com/vaadin/flow/component/notification/Notification.java @@ -57,7 +57,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/notification", version = "24.7.0-alpha2") -@JsModule("@vaadin/notification/src/vaadin-lit-notification.js") +@JsModule("@vaadin/notification/src/vaadin-notification.js") @JsModule("./flow-component-renderer.js") public class Notification extends Component implements HasComponents, HasStyle, HasThemeVariant { diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow-integration-tests/vite.config.ts b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow-integration-tests/vite.config.ts +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java index 44251404cfa..58dc7abf376 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/HorizontalLayout.java @@ -31,7 +31,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/horizontal-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/horizontal-layout/src/vaadin-lit-horizontal-layout.js") +@JsModule("@vaadin/horizontal-layout/src/vaadin-horizontal-layout.js") public class HorizontalLayout extends Component implements ThemableLayout, FlexComponent, ClickNotifier { diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java index fd3595fe2c6..fa3e1d77fbd 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/Scroller.java @@ -39,7 +39,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/scroller", version = "24.7.0-alpha2") -@JsModule("@vaadin/scroller/src/vaadin-lit-scroller.js") +@JsModule("@vaadin/scroller/src/vaadin-scroller.js") public class Scroller extends Component implements Focusable, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java index eb0eb1d000b..a11bea4d1c8 100644 --- a/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java +++ b/vaadin-ordered-layout-flow-parent/vaadin-ordered-layout-flow/src/main/java/com/vaadin/flow/component/orderedlayout/VerticalLayout.java @@ -31,7 +31,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/vertical-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/vertical-layout/src/vaadin-lit-vertical-layout.js") +@JsModule("@vaadin/vertical-layout/src/vaadin-vertical-layout.js") public class VerticalLayout extends Component implements ThemableLayout, FlexComponent, ClickNotifier { diff --git a/vaadin-popover-flow-parent/vaadin-popover-flow-integration-tests/vite.config.ts b/vaadin-popover-flow-parent/vaadin-popover-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-popover-flow-parent/vaadin-popover-flow-integration-tests/vite.config.ts +++ b/vaadin-popover-flow-parent/vaadin-popover-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-progress-bar-flow-parent/vaadin-progress-bar-flow-integration-tests/vite.config.ts b/vaadin-progress-bar-flow-parent/vaadin-progress-bar-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-progress-bar-flow-parent/vaadin-progress-bar-flow-integration-tests/vite.config.ts +++ b/vaadin-progress-bar-flow-parent/vaadin-progress-bar-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/vite.config.ts b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/vite.config.ts +++ b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java index f423e3f6463..26087a0b17d 100644 --- a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java +++ b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButton.java @@ -37,7 +37,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/radio-group", version = "24.7.0-alpha2") -@JsModule("@vaadin/radio-group/src/vaadin-lit-radio-button.js") +@JsModule("@vaadin/radio-group/src/vaadin-radio-button.js") class RadioButton extends Component implements ClickNotifier>, Focusable>, HasComponents, HasItemComponents.ItemComponent, HasStyle { diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java index 8d366e5167b..f519a220348 100755 --- a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java +++ b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioButtonGroup.java @@ -105,7 +105,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/radio-group", version = "24.7.0-alpha2") -@JsModule("@vaadin/radio-group/src/vaadin-lit-radio-group.js") +@JsModule("@vaadin/radio-group/src/vaadin-radio-group.js") public class RadioButtonGroup extends AbstractSinglePropertyField, T> implements HasAriaLabel, HasClientValidation, diff --git a/vaadin-renderer-flow-parent/vaadin-renderer-flow-integration-tests/vite.config.ts b/vaadin-renderer-flow-parent/vaadin-renderer-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-renderer-flow-parent/vaadin-renderer-flow-integration-tests/vite.config.ts +++ b/vaadin-renderer-flow-parent/vaadin-renderer-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-rich-text-editor-flow-parent/vaadin-rich-text-editor-flow-integration-tests/vite.config.ts b/vaadin-rich-text-editor-flow-parent/vaadin-rich-text-editor-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-rich-text-editor-flow-parent/vaadin-rich-text-editor-flow-integration-tests/vite.config.ts +++ b/vaadin-rich-text-editor-flow-parent/vaadin-rich-text-editor-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-select-flow-parent/vaadin-select-flow-integration-tests/vite.config.ts b/vaadin-select-flow-parent/vaadin-select-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-select-flow-parent/vaadin-select-flow-integration-tests/vite.config.ts +++ b/vaadin-select-flow-parent/vaadin-select-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-side-nav-flow-parent/vaadin-side-nav-flow-integration-tests/vite.config.ts b/vaadin-side-nav-flow-parent/vaadin-side-nav-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-side-nav-flow-parent/vaadin-side-nav-flow-integration-tests/vite.config.ts +++ b/vaadin-side-nav-flow-parent/vaadin-side-nav-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-split-layout-flow-parent/vaadin-split-layout-flow-integration-tests/vite.config.ts b/vaadin-split-layout-flow-parent/vaadin-split-layout-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-split-layout-flow-parent/vaadin-split-layout-flow-integration-tests/vite.config.ts +++ b/vaadin-split-layout-flow-parent/vaadin-split-layout-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java b/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java index ba88e0809ed..91b5092c8f9 100644 --- a/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java +++ b/vaadin-split-layout-flow-parent/vaadin-split-layout-flow/src/main/java/com/vaadin/flow/component/splitlayout/SplitLayout.java @@ -46,7 +46,7 @@ @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") @NpmPackage(value = "@vaadin/split-layout", version = "24.7.0-alpha2") -@JsModule("@vaadin/split-layout/src/vaadin-lit-split-layout.js") +@JsModule("@vaadin/split-layout/src/vaadin-split-layout.js") public class SplitLayout extends Component implements ClickNotifier, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/vite.config.ts b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/vite.config.ts +++ b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow-integration-tests/vite.config.ts b/vaadin-tabs-flow-parent/vaadin-tabs-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow-integration-tests/vite.config.ts +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java index 4e06a72b386..5e0c9ee0c8f 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tab.java @@ -35,7 +35,7 @@ @Tag("vaadin-tab") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/tabs/src/vaadin-lit-tab.js") +@JsModule("@vaadin/tabs/src/vaadin-tab.js") @NpmPackage(value = "@vaadin/tabs", version = "24.7.0-alpha2") public class Tab extends Component implements HasAriaLabel, HasComponents, HasLabel, HasStyle, HasThemeVariant, HasTooltip { diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java index 7d1e2b16e4c..351c38c85d5 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheet.java @@ -46,7 +46,7 @@ */ @Tag("vaadin-tabsheet") @NpmPackage(value = "@vaadin/tabsheet", version = "24.7.0-alpha2") -@JsModule("@vaadin/tabsheet/src/vaadin-lit-tabsheet.js") +@JsModule("@vaadin/tabsheet/src/vaadin-tabsheet.js") public class TabSheet extends Component implements HasPrefix, HasStyle, HasSize, HasSuffix, HasThemeVariant { diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java index a6b416cd4e3..dd7c8cea8aa 100644 --- a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java +++ b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/Tabs.java @@ -68,7 +68,7 @@ @Tag("vaadin-tabs") @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha2") @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js") -@JsModule("@vaadin/tabs/src/vaadin-lit-tabs.js") +@JsModule("@vaadin/tabs/src/vaadin-tabs.js") @NpmPackage(value = "@vaadin/tabs", version = "24.7.0-alpha2") public class Tabs extends Component implements HasEnabled, HasSize, HasStyle, HasThemeVariant { diff --git a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/vite.config.ts b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/vite.config.ts +++ b/vaadin-text-field-flow-parent/vaadin-text-field-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-time-picker-flow-parent/vaadin-time-picker-flow-integration-tests/vite.config.ts b/vaadin-time-picker-flow-parent/vaadin-time-picker-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-time-picker-flow-parent/vaadin-time-picker-flow-integration-tests/vite.config.ts +++ b/vaadin-time-picker-flow-parent/vaadin-time-picker-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-upload-flow-parent/vaadin-upload-flow-integration-tests/vite.config.ts b/vaadin-upload-flow-parent/vaadin-upload-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-upload-flow-parent/vaadin-upload-flow-integration-tests/vite.config.ts +++ b/vaadin-upload-flow-parent/vaadin-upload-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); diff --git a/vaadin-virtual-list-flow-parent/vaadin-virtual-list-flow-integration-tests/vite.config.ts b/vaadin-virtual-list-flow-parent/vaadin-virtual-list-flow-integration-tests/vite.config.ts index d8518d74ada..1c5b58b6990 100644 --- a/vaadin-virtual-list-flow-parent/vaadin-virtual-list-flow-integration-tests/vite.config.ts +++ b/vaadin-virtual-list-flow-parent/vaadin-virtual-list-flow-integration-tests/vite.config.ts @@ -3,6 +3,7 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters @@ -18,6 +19,9 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [ + useLitWebComponents() + ] }); export default overrideVaadinConfig(customConfig); From 3088833e4b1333057c6bd886e8b74e55279ca9ba Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Sun, 12 Jan 2025 11:11:28 +0400 Subject: [PATCH 3/6] revert unintended changes --- .../vaadin-spreadsheet-styles.js | 212 +++++++++--------- 1 file changed, 103 insertions(+), 109 deletions(-) diff --git a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/resources/META-INF/resources/frontend/vaadin-spreadsheet/vaadin-spreadsheet-styles.js b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/resources/META-INF/resources/frontend/vaadin-spreadsheet/vaadin-spreadsheet-styles.js index 2737858f659..5fcc1fec0e0 100644 --- a/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/resources/META-INF/resources/frontend/vaadin-spreadsheet/vaadin-spreadsheet-styles.js +++ b/vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/resources/META-INF/resources/frontend/vaadin-spreadsheet/vaadin-spreadsheet-styles.js @@ -1062,13 +1062,13 @@ export const spreadsheetStyles = css` /* * Lumo theme variant styles */ - :host([theme~='lumo']) { - --default-background-color: var(--lumo-base-color); - --default-color: var(--lumo-body-text-color); + :host([theme~="lumo"]) { + --default-background-color: var(--lumo-base-color); + --default-color: var(--lumo-body-text-color); background-color: var(--lumo-base-color); } - :where(:host([theme~='lumo'])) .v-spreadsheet .sheet .cell { + :where(:host([theme~="lumo"])) .v-spreadsheet .sheet .cell { font-family: var(--lumo-font-family); color: var(--lumo-body-text-color); background-color: var(--lumo-base-color); @@ -1078,179 +1078,178 @@ export const spreadsheetStyles = css` padding: 0 var(--lumo-space-xs); --default-font-family: var(--lumo-font-family) !important; --default-font-size: var(--lumo-font-size-s) !important; - } + } - :host([theme~='lumo']) .v-spreadsheet { + :host([theme~="lumo"]) .v-spreadsheet { border: 1px solid var(--lumo-contrast-20pct); font-family: var(--lumo-font-family); font-size: var(--lumo-font-size-m); color: var(--lumo-body-text-color); } - :host([theme~='lumo']) .v-spreadsheet .functionbar { + :host([theme~="lumo"]) .v-spreadsheet .functionbar { background-color: var(--lumo-base-color); border-bottom: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .functionbar .functionfield, - :host([theme~='lumo']) .v-spreadsheet .functionbar .addressfield { + :host([theme~="lumo"]) .v-spreadsheet .functionbar .functionfield, + :host([theme~="lumo"]) .v-spreadsheet .functionbar .addressfield { font-size: var(--lumo-font-size-s); font-family: var(--lumo-font-family); color: var(--lumo-body-text-color); background-color: var(--lumo-base-color); - padding: 0px 0px 0px var(--lumo-space-s); - } - :host([theme~='lumo']) .v-spreadsheet .functionbar .arrow { + padding: 0px 0px 0px var(--lumo-space-s); } + :host([theme~="lumo"]) .v-spreadsheet .functionbar .arrow { font-size: var(--lumo-font-size-xs); } - :host([theme~='lumo']) .v-spreadsheet .functionbar .fixed-left-panel { + :host([theme~="lumo"]) .v-spreadsheet .functionbar .fixed-left-panel { border-right: 1px solid var(--lumo-contrast-20pct); background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); } - :host([theme~='lumo']) .v-spreadsheet .functionbar .adjusting-right-panel { + :host([theme~="lumo"]) .v-spreadsheet .functionbar .adjusting-right-panel { padding-right: var(--lumo-space-xs); } - :host([theme~='lumo']) .v-spreadsheet .functionbar .addressfield { + :host([theme~="lumo"]) .v-spreadsheet .functionbar .addressfield { background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); } - :host([theme~='lumo']) .v-spreadsheet .functionbar .formulaoverlay { + :host([theme~="lumo"]) .v-spreadsheet .functionbar .formulaoverlay { color: var(--lumo-contrast-20pct); font-family: var(--lumo-font-family); font-size: var(--lumo-font-size-s); } - :host([theme~='lumo']) .v-spreadsheet .functionbar .formulaoverlay span { + :host([theme~="lumo"]) .v-spreadsheet .functionbar .formulaoverlay span { border-radius: var(--lumo-border-radius-s); } - :host([theme~='lumo']) .v-spreadsheet .sheet .cell.selected-cell-highlight { + :host([theme~="lumo"]) .v-spreadsheet .sheet .cell.selected-cell-highlight { outline: solid var(--lumo-contrast-80pct) 1px; } - :host([theme~='lumo']) .v-spreadsheet .sheet div.custom-editor-cell { + :host([theme~="lumo"]) .v-spreadsheet .sheet div.custom-editor-cell { padding: var(--lumo-space-xs); } - :host([theme~='lumo']) .v-spreadsheet .sheet > input[type='text'] { + :host([theme~="lumo"]) .v-spreadsheet .sheet > input[type='text'] { margin-left: -1px; margin-top: -1px; box-shadow: var(--lumo-box-shadow-s); color: var(--lumo-body-text-color); outline: 1px solid var(--lumo-primary-color) !important; } - :host([theme~='lumo']) .v-spreadsheet .sheet .floater { + :host([theme~="lumo"]) .v-spreadsheet .sheet .floater { background-color: var(--lumo-base-color); } - :host([theme~='lumo']) .v-spreadsheet .top-left-pane, - :host([theme~='lumo']) .v-spreadsheet .top-right-pane, - :host([theme~='lumo']) .v-spreadsheet .bottom-left-pane { + :host([theme~="lumo"]) .v-spreadsheet .top-left-pane, + :host([theme~="lumo"]) .v-spreadsheet .top-right-pane, + :host([theme~="lumo"]) .v-spreadsheet .bottom-left-pane { border-right: 1px solid var(--lumo-contrast-50pct); - border-bottom: 1px solid var(--lumo-contrast-50pct); + border-bottom: 1px solid var(--lumo-contrast-50pct); } - :host([theme~='lumo']) .v-spreadsheet .top-left-pane.inactive, - :host([theme~='lumo']) .v-spreadsheet .top-right-pane.inactive, - :host([theme~='lumo']) .v-spreadsheet .bottom-left-pane.inactive { + :host([theme~="lumo"]) .v-spreadsheet .top-left-pane.inactive, + :host([theme~="lumo"]) .v-spreadsheet .top-right-pane.inactive, + :host([theme~="lumo"]) .v-spreadsheet .bottom-left-pane.inactive { border-right: 0; border-bottom: 0; - } - :host([theme~='lumo']) .v-spreadsheet .ch, - :host([theme~='lumo']) .v-spreadsheet .rh, - :host([theme~='lumo']) .v-spreadsheet .corner { + } + :host([theme~="lumo"]) .v-spreadsheet .ch, + :host([theme~="lumo"]) .v-spreadsheet .rh, + :host([theme~="lumo"]) .v-spreadsheet .corner { background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); background-color: var(--lumo-base-color); font-family: var(--lumo-font-family); font-size: var(--lumo-font-size-s); } - :host([theme~='lumo']) .v-spreadsheet .rh { + :host([theme~="lumo"]) .v-spreadsheet .rh { border-right: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .rh.selected-row-header { + :host([theme~="lumo"]) .v-spreadsheet .rh.selected-row-header { border-right: 2px solid var(--lumo-primary-color-50pct); background-image: linear-gradient(var(--lumo-primary-color-10pct), var(--lumo-primary-color-10pct)) !important; background-color: var(--lumo-base-color) !important; } - :host([theme~='lumo']) .v-spreadsheet .rh .header-resize-dnd-second { + :host([theme~="lumo"]) .v-spreadsheet .rh .header-resize-dnd-second { border-bottom: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .rh.resize-extra { + :host([theme~="lumo"]) .v-spreadsheet .rh.resize-extra { border-bottom: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .ch { + :host([theme~="lumo"]) .v-spreadsheet .ch { background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); border-bottom: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .ch.selected-column-header { + :host([theme~="lumo"]) .v-spreadsheet .ch.selected-column-header { border-bottom: 2px solid var(--lumo-primary-color-50pct); background-image: linear-gradient(var(--lumo-primary-color-10pct), var(--lumo-primary-color-10pct)) !important; background-color: var(--lumo-base-color) !important; } - :host([theme~='lumo']) .v-spreadsheet .ch .header-resize-dnd-second { + :host([theme~="lumo"]) .v-spreadsheet .ch .header-resize-dnd-second { border-right: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .ch.resize-extra { + :host([theme~="lumo"]) .v-spreadsheet .ch.resize-extra { border-right: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet > div.resize-line { + :host([theme~="lumo"]) .v-spreadsheet > div.resize-line { background: var(--lumo-primary-color); } - :host([theme~='lumo']) .v-spreadsheet .corner { + :host([theme~="lumo"]) .v-spreadsheet .corner { border-bottom: 1px solid var(--lumo-contrast-20pct); border-right: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .sheet .cell-comment-triangle { + :host([theme~="lumo"]) .v-spreadsheet .sheet .cell-comment-triangle { border-color: transparent var(--lumo-warning-color) transparent transparent; } - :host([theme~='lumo']) .v-spreadsheet .sheet .cell-invalidformula-triangle { + :host([theme~="lumo"]) .v-spreadsheet .sheet .cell-invalidformula-triangle { border-color: transparent var(--lumo-error-color) transparent transparent; } - :host([theme~='lumo']) .v-spreadsheet .sheet .comment-overlay-line { + :host([theme~="lumo"]) .v-spreadsheet .sheet .comment-overlay-line { background-color: var(--lumo-contrast-10pct) !important; } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-top, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-left, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-bottom, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-right { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-top, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-left, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-bottom, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-right { background-color: var(--lumo-primary-color); } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-top.extend, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-left.extend, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-bottom.extend, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-right.extend { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-top.extend, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-left.extend, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-bottom.extend, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-right.extend { background-color: var(--lumo-success-color) !important; } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection .s-corner { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection .s-corner { background-color: var(--lumo-success-color); outline: 2px solid var(--lumo-base-color); } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.paintmode { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.paintmode { background-color: var(--lumo-success-color-10pct) !important; } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.paintmode .s-top, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.paintmode .s-left, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.paintmode .s-bottom, - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.paintmode .s-right { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.paintmode .s-top, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.paintmode .s-left, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.paintmode .s-bottom, + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.paintmode .s-right { background-color: var(--lumo-success-color); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet { background: var(--lumo-base-color); border-top: 1px solid var(--lumo-contrast-20pct); height: calc(var(--lumo-font-size-s) + 14px); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options { background: var(--lumo-base-color); cursor: var(--lumo-clickable-cursor); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options div { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options div { cursor: var(--lumo-clickable-cursor); color: var(--lumo-primary-text-color); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options div:hover { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options div:hover { background: var(--lumo-primary-color-10pct); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options div.hidden { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-options div.hidden { color: var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container { height: calc(var(--lumo-font-size-s) + 12px); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container .sheet-tabsheet-tab { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container .sheet-tabsheet-tab { font-family: var(--lumo-font-family); font-size: var(--lumo-font-size-s); font-weight: 400; @@ -1267,33 +1266,28 @@ export const spreadsheetStyles = css` margin-left: var(--lumo-space-s); padding: var(--lumo-space-xs) var(--lumo-space-xs); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container .sheet-tabsheet-tab.selected-tab { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container .sheet-tabsheet-tab.selected-tab { background: var(--lumo-base-color); color: var(--lumo-primary-text-color); box-shadow: var(--lumo-box-shadow-xs); } - :host([theme~='lumo']) - .v-spreadsheet - .sheet-tabsheet - .sheet-tabsheet-container - .sheet-tabsheet-tab.selected-tab - input[type='text'] { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-container .sheet-tabsheet-tab.selected-tab input[type='text'] { font-family: var(--lumo-font-familty); font-size: var(--lumo-font-size-s); color: var(--lumo-primary-text-color); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-temp { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-temp { font-family: var(--lumo-font-family); font-size: var(--lumo-font-size-s); } - :host([theme~='lumo']) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-infolabel { + :host([theme~="lumo"]) .v-spreadsheet .sheet-tabsheet .sheet-tabsheet-infolabel { background: var(--lumo-contrast-5pct); font-size: var(--lumo-font-size-s); border-left: 1px solid var(--lumo-contrast-20pct); padding-left: var(--lumo-space-xs); padding-right: var(--lumo-space-xs); } - :host([theme~='lumo']) .v-spreadsheet .sheet div div.popupbutton { + :host([theme~="lumo"]) .v-spreadsheet .sheet div div.popupbutton { color: var(--lumo-body-text-color); cursor: var(--lumo-clickable-cursor); height: 100%; @@ -1304,116 +1298,116 @@ export const spreadsheetStyles = css` background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); border-radius: var(--lumo-border-radius-s); } - :host([theme~='lumo']) .v-spreadsheet .sheet div div.popupbutton:after { + :host([theme~="lumo"]) .v-spreadsheet .sheet div div.popupbutton:after { font-family: 'lumo-icons'; content: var(--lumo-icons-angle-down); font-size: var(--lumo-font-size-xs); color: var(--lumo-body-text-color); vertical-align: top; } - :host([theme~='lumo']) .popupbutton.active { + :host([theme~="lumo"]) .popupbutton.active { box-shadow: var(--lumo-box-shadow-xs) inset; } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.touch.fill .fill-touch-square > .square { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.touch.fill .fill-touch-square > .square { background-color: var(--lumo-success-color); border: 2px solid var(--lumo-base-color); } - :host([theme~='lumo']) .v-spreadsheet .sheet-selection.touch .s-corner { + :host([theme~="lumo"]) .v-spreadsheet .sheet-selection.touch .s-corner { background-color: var(--lumo-primary-color); border-radius: var(--lumo-border-radius-m); } - :host([theme~='lumo']) .v-spreadsheet .col-group-pane, - :host([theme~='lumo']) .v-spreadsheet .col-group-freeze-pane { + :host([theme~="lumo"]) .v-spreadsheet .col-group-pane, + :host([theme~="lumo"]) .v-spreadsheet .col-group-freeze-pane { background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); border-bottom: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .col-group-pane .grouping, - :host([theme~='lumo']) .v-spreadsheet .col-group-freeze-pane .grouping { + :host([theme~="lumo"]) .v-spreadsheet .col-group-pane .grouping, + :host([theme~="lumo"]) .v-spreadsheet .col-group-freeze-pane .grouping { border-top: 2px solid var(--lumo-contrast-20pct); border-left: 2px solid var(--lumo-contrast-20pct); cursor: var(--lumo-clickable-cursor); } - :host([theme~='lumo']) .v-spreadsheet .col-group-pane .grouping .expand, - :host([theme~='lumo']) .v-spreadsheet .col-group-freeze-pane .grouping .expand { + :host([theme~="lumo"]) .v-spreadsheet .col-group-pane .grouping .expand, + :host([theme~="lumo"]) .v-spreadsheet .col-group-freeze-pane .grouping .expand { background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-30pct), var(--lumo-contrast-30pct)); font-size: var(--lumo-font-size-s); } - :host([theme~='lumo']) .v-spreadsheet .col-group-pane .grouping.inversed, - :host([theme~='lumo']) .v-spreadsheet .col-group-freeze-pane .grouping.inversed { + :host([theme~="lumo"]) .v-spreadsheet .col-group-pane .grouping.inversed, + :host([theme~="lumo"]) .v-spreadsheet .col-group-freeze-pane .grouping.inversed { border-right: 2px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .col-group-freeze-pane { + :host([theme~="lumo"]) .v-spreadsheet .col-group-freeze-pane { border-right: 1px solid var(--lumo-contrast-50pct); } - :host([theme~='lumo']) .v-spreadsheet .col-group-border .border { + :host([theme~="lumo"]) .v-spreadsheet .col-group-border .border { border-bottom: 1px dotted var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .row-group-pane, - :host([theme~='lumo']) .v-spreadsheet .row-group-freeze-pane { + :host([theme~="lumo"]) .v-spreadsheet .row-group-pane, + :host([theme~="lumo"]) .v-spreadsheet .row-group-freeze-pane { background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); border-right: 1px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .row-group-pane .grouping, - :host([theme~='lumo']) .v-spreadsheet .row-group-freeze-pane .grouping { + :host([theme~="lumo"]) .v-spreadsheet .row-group-pane .grouping, + :host([theme~="lumo"]) .v-spreadsheet .row-group-freeze-pane .grouping { border-top: 2px solid var(--lumo-contrast-20pct); border-left: 2px solid var(--lumo-contrast-20pct); cursor: var(--lumo-clickable-cursor); } - :host([theme~='lumo']) .v-spreadsheet .row-group-pane .grouping .expand, + :host([theme~="lumo"]) .v-spreadsheet .row-group-pane .grouping .expand, .v-spreadsheet .row-group-freeze-pane .grouping .expand { background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-30pct), var(--lumo-contrast-30pct)); font-size: var(--lumo-font-size-xs); } - :host([theme~='lumo']) .v-spreadsheet .row-group-pane .grouping.inversed, - :host([theme~='lumo']) .v-spreadsheet .row-group-freeze-pane .grouping.inversed { + :host([theme~="lumo"]) .v-spreadsheet .row-group-pane .grouping.inversed, + :host([theme~="lumo"]) .v-spreadsheet .row-group-freeze-pane .grouping.inversed { border-bottom: 2px solid var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .row-group-freeze-pane { + :host([theme~="lumo"]) .v-spreadsheet .row-group-freeze-pane { border-bottom: 1px solid var(--lumo-contrast-50pct); } - :host([theme~='lumo']) .v-spreadsheet .row-group-border .border { + :host([theme~="lumo"]) .v-spreadsheet .row-group-border .border { border-right: 1px dotted var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .expandbutton { + :host([theme~="lumo"]) .v-spreadsheet .expandbutton { font-size: var(--lumo-font-size-s); cursor: var(--lumo-clickable-cursor); color: var(--lumo-body-text-color); } - :host([theme~='lumo']) .v-spreadsheet .expandbutton:active { + :host([theme~="lumo"]) .v-spreadsheet .expandbutton:active { border-color: var(--lumo-contrast-20pct); } - :host([theme~='lumo']) .v-spreadsheet .col-group-summary .expandbutton { + :host([theme~="lumo"]) .v-spreadsheet .col-group-summary .expandbutton { margin-right: var(--lumo-space-xs); } - :host([theme~='lumo']) .v-spreadsheet .row-group-summary .expandbutton { + :host([theme~="lumo"]) .v-spreadsheet .row-group-summary .expandbutton { margin-left: var(--lumo-space-xs); } - :host([theme~='lumo']) .v-spreadsheet .grouping-corner { + :host([theme~="lumo"]) .v-spreadsheet .grouping-corner { border-right: 1px solid var(--lumo-contrast-20pct); border-bottom: 1px solid var(--lumo-contrast-20pct); background-color: var(--lumo-base-color); - background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); + background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); } - :host([theme~='lumo']) .v-spreadsheet .col-group-summary { + :host([theme~="lumo"]) .v-spreadsheet .col-group-summary { border-bottom: 1px solid var(--lumo-contrast-20pct); border-right: 1px solid var(--lumo-contrast-20pct); background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); } - :host([theme~='lumo']) .v-spreadsheet .row-group-summary { + :host([theme~="lumo"]) .v-spreadsheet .row-group-summary { border-bottom: 1px solid var(--lumo-contrast-20pct); border-right: 1px solid var(--lumo-contrast-20pct); background-color: var(--lumo-base-color); background-image: linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct)); } - :host([theme~='lumo']) .cell-range-bg-color { + :host([theme~="lumo"]) .cell-range-bg-color { background-color: var(--lumo-primary-color-10pct); } - :host([theme~='lumo']) .v-spreadsheet .sheet .cell .cell-range { + :host([theme~="lumo"]) .v-spreadsheet .sheet .cell .cell-range { background-image: var(--lumo-primary-color-10pct) !important; background-color: var(--lumo-primary-color-10pct) !important; } From 2267adf465868ac66af3e4953759aa5cbc0f12dc Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Sun, 12 Jan 2025 11:12:27 +0400 Subject: [PATCH 4/6] update card's vite config --- .../vaadin-card-flow-integration-tests/vite.config.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vaadin-card-flow-parent/vaadin-card-flow-integration-tests/vite.config.ts b/vaadin-card-flow-parent/vaadin-card-flow-integration-tests/vite.config.ts index 6e3f79d38e4..94e0336f0fb 100644 --- a/vaadin-card-flow-parent/vaadin-card-flow-integration-tests/vite.config.ts +++ b/vaadin-card-flow-parent/vaadin-card-flow-integration-tests/vite.config.ts @@ -3,10 +3,12 @@ import { UserConfigFn } from 'vite'; // @ts-ignore can not be resolved until Flow generates base Vite config import { overrideVaadinConfig } from './vite.generated'; // import { useLocalWebComponents } from '../../shared/web-components-vite-plugin'; +import { useLitWebComponents } from '../../shared/web-components-vite-plugin'; const customConfig: UserConfigFn = (env) => ({ // Here you can add custom Vite parameters // https://vitejs.dev/config/ + // Use local version of web-components, disabled by default // To use this un-comment the lines below and change the path to // the absolute path of your web-components repo's node_modules @@ -17,6 +19,7 @@ const customConfig: UserConfigFn = (env) => ({ useLocalWebComponents('/path/to/web-components/node_modules') ] */ + plugins: [useLitWebComponents()] }); export default overrideVaadinConfig(customConfig); From 7031c4482c771d12658cbc5d98482dc1dc6e7d8f Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Sun, 12 Jan 2025 11:13:17 +0400 Subject: [PATCH 5/6] revert unintended changes --- .../resources/META-INF/resources/frontend/gridProConnector.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow/src/main/resources/META-INF/resources/frontend/gridProConnector.js b/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow/src/main/resources/META-INF/resources/frontend/gridProConnector.js index 432ced12fdb..8a8347d35a8 100644 --- a/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow/src/main/resources/META-INF/resources/frontend/gridProConnector.js +++ b/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow/src/main/resources/META-INF/resources/frontend/gridProConnector.js @@ -79,10 +79,10 @@ window.Vaadin.Flow.gridProConnector = { }, initCellEditableProvider(column) { - column.isCellEditable = function (model) { + column.isCellEditable = function(model) { // If there is no cell editable data, assume the cell is editable const isEditable = model.item.cellEditable && model.item.cellEditable[column._flowId]; return isEditable === undefined || isEditable; }; - } + }, }; From 95fceb8ca629d769e608c6e3254642f7c6186dfb Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Sun, 12 Jan 2025 14:53:39 +0400 Subject: [PATCH 6/6] improve regexp --- shared/web-components-vite-plugin.ts | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/shared/web-components-vite-plugin.ts b/shared/web-components-vite-plugin.ts index 308bd39ab8f..1c27a6fec5f 100644 --- a/shared/web-components-vite-plugin.ts +++ b/shared/web-components-vite-plugin.ts @@ -22,8 +22,8 @@ export function useLocalWebComponents(webComponentsNodeModulesPath: string): Plu if (/^(@polymer|@vaadin)/.test(id)) { return this.resolve(path.join(webComponentsNodeModulesPath, id)); } - }, - } + } + }; } /** @@ -37,7 +37,10 @@ export function useLitWebComponents(): PluginOption { resolve: { alias: [ 'accordion', + 'accordion-panel', 'app-layout', + 'drawer-toggle', + 'avatar', 'avatar-group', 'context-menu', 'custom-field', @@ -45,23 +48,26 @@ export function useLitWebComponents(): PluginOption { 'dialog', 'horizontal-layout', 'list-box', + 'item', 'notification', + 'radio-button', 'radio-button-group', 'scroller', 'split-layout', 'tabs', + 'tab', + 'tabsheet', 'vertical-layout' ].flatMap((component) => { return [ { - find: new RegExp(`^@vaadin/${component}\/(src\/)?vaadin-(?!lit)`), - replacement: `@vaadin/${component}/$1vaadin-lit-` + find: new RegExp(`^@vaadin/[^\/]+\/(src\/)?vaadin-${component}.js`), + replacement: `@vaadin/[^\/]+/$1vaadin-lit-${component}.js` } - ] + ]; }) - }, - } + } + }; } - } + }; } -