diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-item.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-item.json index 843b2d47d33..c599cb8ed9b 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-item.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-item.json @@ -15,7 +15,7 @@ { "name": "item", "type": [ - "STRING", + "OBJECT", "OBJECT" ], "objectType": [], diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-light.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-light.json index 117b4eee742..f20d86d7535 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-light.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box-light.json @@ -225,7 +225,7 @@ "name": "detail.value", "type": [ "OBJECT", - "STRING" + "OBJECT" ], "objectType": [], "description": "the selected item. Type is the same as the type of `items`." diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box.json index e85cde268c1..6ec8e08452e 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-combo-box.json @@ -264,7 +264,7 @@ "name": "detail.value", "type": [ "OBJECT", - "STRING" + "OBJECT" ], "objectType": [], "description": "the selected item. Type is the same as the type of `items`." diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-grid.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-grid.json index 2348dc57375..60af4356c18 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-grid.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-grid.json @@ -241,10 +241,15 @@ ], "variants": { "lumo": [ + "no-border", + "no-row-borders", "column-borders", "row-stripes", "compact", "wrap-cell-content" + ], + "material": [ + "column-dividers" ] }, "description": "`` is a free, high quality data grid / data table Polymer element.\n\n### Quick Start\n\nUse the [``](#/elements/vaadin-grid-column) element to configure the grid columns.\n\nThen assign an array to the [`items`](#/elements/vaadin-grid#property-items) property to visualize your data.\n\n#### Example:\n```html\n\n \n \n \n \n \n \n \n \n \n \n \n \n\n```\n\nThe following helper elements can be used for further customization:\n- [``](#/elements/vaadin-grid-column-group)\n- [``](#/elements/vaadin-grid-filter)\n- [``](#/elements/vaadin-grid-sorter)\n- [``](#/elements/vaadin-grid-selection-column)\n- [``](#/elements/vaadin-grid-tree-toggle)\n\n__Note that the helper elements must be explicitly imported.__\nIf you want to import everything at once you can use the `all-imports.html` bundle.\n\nA column template can be decorated with one the following class names to specify its purpose\n- `header`: Marks a header template\n- `footer`: Marks a footer template\n- `row-details`: Marks a row details template\n\nThe following built-in template variables can be bound to inside the column templates:\n- `[[index]]`: Number representing the row index\n- `[[item]]` and it's sub-properties: Data object (provided by a data provider / items array)\n- `{{selected}}`: True if the item is selected (can be two-way bound)\n- `{{detailsOpened}}`: True if the item has row details opened (can be two-way bound)\n- `{{expanded}}`: True if the item has tree sublevel expanded (can be two-way bound)\n- `[[level]]`: Number of the tree sublevel of the item, first level-items have 0\n\n### Lazy Loading with Function Data Provider\n\nIn addition to assigning an array to the items property, you can alternatively\nprovide the `` data through the\n[`dataProvider`](#/elements/vaadin-grid#property-dataProvider) function property.\nThe `` calls this function lazily, only when it needs more data\nto be displayed.\n\nSee the [`dataProvider`](#/elements/vaadin-grid#property-dataProvider) in\nthe API reference below for the detailed data provider arguments description,\nand the “Assigning Data” page in the demos.\n\n__Note that expanding the tree grid's item will trigger a call to the `dataProvider`.__\n\n__Also, note that when using function data providers, the total number of items\nneeds to be set manually. The total number of items can be returned\nin the second argument of the data provider callback:__\n\n```javascript\ngrid.dataProvider = function(params, callback) {\n var url = 'https://api.example/data' +\n '?page=' + params.page + // the requested page index\n '&per_page=' + params.pageSize; // number of items on the page\n var xhr = new XMLHttpRequest();\n xhr.onload = function() {\n var response = JSON.parse(xhr.responseText);\n callback(\n response.employees, // requested page of items\n response.totalSize // total number of items\n );\n };\n xhr.open('GET', url, true);\n xhr.send();\n};\n```\n\n__Alternatively, you can use the `size` property to set the total number of items:__\n\n```javascript\ngrid.size = 200; // The total number of items\ngrid.dataProvider = function(params, callback) {\n var url = 'https://api.example/data' +\n '?page=' + params.page + // the requested page index\n '&per_page=' + params.pageSize; // number of items on the page\n var xhr = new XMLHttpRequest();\n xhr.onload = function() {\n var response = JSON.parse(xhr.responseText);\n callback(response.employees);\n };\n xhr.open('GET', url, true);\n xhr.send();\n};\n```\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name | Description\n----------------|----------------\n`row` | Row in the internal table\n`cell` | Cell in the internal table\n`header-cell` | Header cell in the internal table\n`body-cell` | Body cell in the internal table\n`footer-cell` | Footer cell in the internal table\n`details-cell` | Row details cell in the internal table\n`resize-handle` | Handle for resizing the columns\n`reorder-ghost` | Ghost element of the header cell being dragged\n\nThe following state attributes are available for styling:\n\nAttribute | Description | Part name\n-------------|-------------|------------\n`loading` | Set when the grid is loading data from data provider | :host\n`interacting` | Keyboard navigation in interaction mode | :host\n`navigating` | Keyboard navigation in navigation mode | :host\n`overflow` | Set when rows are overflowing the grid viewport. Possible values: `top`, `bottom`, `left`, `right` | :host\n`reordering` | Set when the grid's columns are being reordered | :host\n`reorder-status` | Reflects the status of a cell while columns are being reordered | cell\n`frozen` | Frozen cell | cell\n`last-frozen` | Last frozen cell | cell\n`last-column` | Last visible cell on a row | cell\n`selected` | Selected row | row\n`expanded` | Expanded row | row\n`loading` | Row that is waiting for data from data provider | row\n`odd` | Odd row | row\n`first` | The first body row | row\n\nSee [ThemableMixin – how to apply styles for shadow parts](https://github.com/vaadin/vaadin-themable-mixin/wiki)" diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-infinite-scroller.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-infinite-scroller.json index 1fe3d59a172..3fcf4fae8a9 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-infinite-scroller.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-infinite-scroller.json @@ -117,7 +117,7 @@ { "name": "to", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -127,7 +127,7 @@ { "name": "from", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -144,7 +144,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -184,7 +184,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -209,7 +209,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -242,7 +242,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -267,7 +267,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -284,7 +284,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -325,7 +325,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], @@ -342,7 +342,7 @@ { "name": "path", "type": [ - "STRING", + "OBJECT", "OBJECT", "OBJECT" ], diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-area.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-area.json index 77a92e255cf..b6b19dbf29c 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-area.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-area.json @@ -172,6 +172,15 @@ "Vaadin.ThemableMixin", "Vaadin.ControlStateMixin" ], - "variants": {}, + "variants": { + "lumo": [ + "small", + "align-center", + "align-right" + ], + "material": [ + "always-float-label" + ] + }, "description": "`` is a Polymer 2 element for text area control in forms.\n\n```html\n\n\n```\n\n### Prefixes and suffixes\n\nThese are child elements of a `` that are displayed\ninline with the input, before or after.\nIn order for an element to be considered as a prefix, it must have the slot\nattribute set to `prefix` (and similarly for `suffix`).\n\n```html\n\n
Details:
\n
The end!
\n\n```\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name | Description\n----------------|----------------\n`label` | The label element\n`input-field` | The element that wraps prefix, value and suffix\n`value` | The text value element inside the `input-field` element\n`error-message` | The error message element\n\nThe following state attributes are available for styling:\n\nAttribute | Description | Part name\n-------------|-------------|------------\n`disabled` | Set to a disabled text field | :host\n`has-value` | Set when the element has a value | :host\n`has-label` | Set when the element has a label | :host\n`invalid` | Set when the element is invalid | :host\n`focused` | Set when the element is focused | :host\n`focus-ring` | Set when the element is keyboard focused | :host\n`readonly` | Set to a readonly text field | :host\n\nSee [ThemableMixin – how to apply styles for shadow parts](https://github.com/vaadin/vaadin-themable-mixin/wiki)" } diff --git a/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-field.json b/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-field.json index 9f84e63218e..19d4807050c 100644 --- a/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-field.json +++ b/flow-components-parent/flow-generated-components/json_metadata/vaadin-text-field.json @@ -201,6 +201,9 @@ "small", "align-center", "align-right" + ], + "material": [ + "always-float-label" ] }, "description": "`` is a Polymer 2 element for text field control in forms.\n\n```html\n\n\n```\n\n### Prefixes and suffixes\n\nThese are child elements of a `` that are displayed\ninline with the input, before or after.\nIn order for an element to be considered as a prefix, it must have the slot\nattribute set to `prefix` (and similarly for `suffix`).\n\n```html\n\n
Sent to:
\n
@vaadin.com
\n\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property | Description | Default\n----------------|-------------|-------------\n`--vaadin-text-field-default-width` | Set the default width of the input field | `12em`\n\nThe following shadow DOM parts are available for styling:\n\nPart name | Description\n----------------|----------------\n`label` | The label element\n`input-field` | The element that wraps prefix, value and suffix\n`value` | The text value element inside the `input-field` element\n`error-message` | The error message element\n\nThe following state attributes are available for styling:\n\nAttribute | Description | Part name\n-------------|-------------|------------\n`disabled` | Set to a disabled text field | :host\n`has-value` | Set when the element has a value | :host\n`has-label` | Set when the element has a label | :host\n`invalid` | Set when the element is invalid | :host\n`focused` | Set when the element is focused | :host\n`focus-ring` | Set when the element is keyboard focused | :host\n`readonly` | Set to a readonly text field | :host\n\nSee [ThemableMixin – how to apply styles for shadow parts](https://github.com/vaadin/vaadin-themable-mixin/wiki)" diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/button/GeneratedVaadinButton.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/button/GeneratedVaadinButton.java index 1874c744cd1..e404b5e13eb 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/button/GeneratedVaadinButton.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/button/GeneratedVaadinButton.java @@ -16,17 +16,16 @@ package com.vaadin.flow.component.button; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.ClickNotifier; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.Focusable; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.ClickNotifier; import com.vaadin.flow.component.HasText; +import com.vaadin.flow.component.Focusable; import com.vaadin.flow.component.HasTheme; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; /** diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckbox.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckbox.java index 0f306ae8138..b31e1bf298f 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckbox.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckbox.java @@ -16,20 +16,19 @@ package com.vaadin.flow.component.checkbox; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Focusable; import com.vaadin.flow.component.ClickNotifier; +import com.vaadin.flow.component.Synchronize; +import com.vaadin.flow.component.DomEvent; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.Focusable; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.function.SerializableBiFunction; -import com.vaadin.flow.function.SerializableFunction; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckboxGroup.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckboxGroup.java index 90c60977b85..1afbac722ea 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckboxGroup.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/checkbox/GeneratedVaadinCheckboxGroup.java @@ -16,21 +16,20 @@ package com.vaadin.flow.component.checkbox; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.HasTheme; -import com.vaadin.flow.component.NotSupported; +import java.util.stream.Stream; +import java.util.stream.Collectors; import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.function.SerializableBiFunction; -import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBox.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBox.java index 67b41389072..4ca297cf5af 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBox.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBox.java @@ -16,25 +16,24 @@ package com.vaadin.flow.component.combobox; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.EventData; -import com.vaadin.flow.component.Focusable; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.NotSupported; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasValue; +import com.vaadin.flow.component.Focusable; +import com.vaadin.flow.component.Synchronize; +import elemental.json.JsonArray; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.EventData; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; -import com.vaadin.flow.function.SerializableBiFunction; import com.vaadin.flow.function.SerializableFunction; -import com.vaadin.flow.shared.Registration; - -import elemental.json.JsonArray; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxItem.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxItem.java index 2fd33cc44f4..91e55dc7e25 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxItem.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxItem.java @@ -16,13 +16,11 @@ package com.vaadin.flow.component.combobox; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; - +import com.vaadin.flow.component.HasStyle; import elemental.json.JsonObject; +import com.vaadin.flow.component.Component; /** *

@@ -130,25 +128,10 @@ protected void setIndex(double index) { * * @return the {@code item} property from the webcomponent */ - protected JsonObject getItemObjectJsonObject() { + protected JsonObject getItemJsonObject() { return (JsonObject) getElement().getPropertyRaw("item"); } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * The item to render - *

- * - * @param item - * the String value to set - */ - protected void setItem(String item) { - getElement().setProperty("item", item == null ? "" : item); - } - /** *

* Description copied from corresponding location in WebComponent: diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxLight.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxLight.java index 4947094badc..f0fb02271b1 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxLight.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxLight.java @@ -16,23 +16,21 @@ package com.vaadin.flow.component.combobox; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.EventData; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.NotSupported; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.function.SerializableBiFunction; -import com.vaadin.flow.function.SerializableFunction; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; import elemental.json.JsonArray; import elemental.json.JsonObject; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.EventData; +import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxOverlay.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxOverlay.java index 5bd88cce510..a424fa13c7d 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxOverlay.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/combobox/GeneratedVaadinComboBoxOverlay.java @@ -16,18 +16,16 @@ package com.vaadin.flow.component.combobox; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; import elemental.json.JsonObject; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenu.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenu.java index 9416890dbfb..5d08a27104c 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenu.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenu.java @@ -16,18 +16,16 @@ package com.vaadin.flow.component.contextmenu; import javax.annotation.Generated; - +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.ClickNotifier; -import com.vaadin.flow.component.Component; +import com.vaadin.flow.component.Synchronize; +import elemental.json.JsonObject; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.shared.Registration; - -import elemental.json.JsonObject; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenuOverlay.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenuOverlay.java index fb66b876e1f..220ec51fe1d 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenuOverlay.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/contextmenu/GeneratedVaadinContextMenuOverlay.java @@ -16,18 +16,16 @@ package com.vaadin.flow.component.contextmenu; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; import elemental.json.JsonObject; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePicker.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePicker.java index 28668453bd5..45661bd3815 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePicker.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePicker.java @@ -16,24 +16,22 @@ package com.vaadin.flow.component.datepicker; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.Focusable; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.NotSupported; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Focusable; +import com.vaadin.flow.component.Synchronize; +import elemental.json.JsonObject; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; -import com.vaadin.flow.function.SerializableBiFunction; import com.vaadin.flow.function.SerializableFunction; -import com.vaadin.flow.shared.Registration; - -import elemental.json.JsonObject; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerLight.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerLight.java index ee5eb2eb7e8..fb58302b6ad 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerLight.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerLight.java @@ -16,21 +16,19 @@ package com.vaadin.flow.component.datepicker; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.NotSupported; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.function.SerializableBiFunction; -import com.vaadin.flow.function.SerializableFunction; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; import elemental.json.JsonObject; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerOverlay.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerOverlay.java index 43746dffdfa..24f6439cb1c 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerOverlay.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinDatePickerOverlay.java @@ -16,18 +16,16 @@ package com.vaadin.flow.component.datepicker; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; import elemental.json.JsonObject; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinInfiniteScroller.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinInfiniteScroller.java index 528a0a4acb4..ee35f24d746 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinInfiniteScroller.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/datepicker/GeneratedVaadinInfiniteScroller.java @@ -210,72 +210,6 @@ protected void setProperties(JsonObject props, JsonObject setReadOnly) { protected void linkPaths(JsonObject to, JsonObject from) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Aliases one data path as another, such that path notifications from one - * are routed to the other. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param to - * Target path to link. - * @param from - * Source path to link. - */ - @NotSupported - protected void linkPaths(JsonObject to, String from) { - } - - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Aliases one data path as another, such that path notifications from one - * are routed to the other. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param to - * Target path to link. - * @param from - * Source path to link. - */ - @NotSupported - protected void linkPaths(String to, JsonObject from) { - } - - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Aliases one data path as another, such that path notifications from one - * are routed to the other. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param to - * Target path to link. - * @param from - * Source path to link. - */ - @NotSupported - protected void linkPaths(String to, String from) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -299,29 +233,6 @@ protected void linkPaths(String to, String from) { protected void unlinkPaths(JsonObject path) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Removes a data path alias previously established with {@code _linkPaths}. - *

- *

- * Note, the path to unlink should be the target ({@code to}) used when - * linking the paths. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param path - * Target path to unlink. - */ - @NotSupported - protected void unlinkPaths(String path) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -400,38 +311,6 @@ protected void notifySplices(String path, JsonArray splices) { protected void get(JsonObject path, JsonObject root) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Convenience method for reading a value from a path. - *

- *

- * Note, if any part in the path is undefined, this method returns - * {@code undefined} (this method does not throw when dereferencing - * undefined paths). - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param path - * Path to the value to read. The path may be specified as a - * string (e.g. `foo.bar.baz`) or an array of path parts (e.g. - * `['foo.bar', 'baz']`). Note that bracketed expressions are not - * supported; string-based path parts must* be separated by dots. - * Note that when dereferencing array indices, the index may be - * used as a dotted part directly (e.g. `users.12.name` or - * `['users', 12, 'name']`). - * @param root - * Root object from which the path is evaluated. - */ - @NotSupported - protected void get(String path, JsonObject root) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -468,42 +347,6 @@ protected void get(String path, JsonObject root) { protected void set(JsonObject path, JsonObject value, JsonObject root) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Convenience method for setting a value to a path and notifying any - * elements bound to the same path. - *

- *

- * Note, if any part in the path except for the last is undefined, this - * method does nothing (this method does not throw when dereferencing - * undefined paths). - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param path - * Path to the value to write. The path may be specified as a - * string (e.g. `'foo.bar.baz'`) or an array of path parts (e.g. - * `['foo.bar', 'baz']`). Note that bracketed expressions are not - * supported; string-based path parts must* be separated by dots. - * Note that when dereferencing array indices, the index may be - * used as a dotted part directly (e.g. `'users.12.name'` or - * `['users', 12, 'name']`). - * @param value - * Value to set at the specified path. - * @param root - * Root object from which the path is evaluated. When specified, - * no notification will occur. - */ - @NotSupported - protected void set(String path, JsonObject value, JsonObject root) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -533,35 +376,6 @@ protected void set(String path, JsonObject value, JsonObject root) { protected void push(JsonObject path, JsonObject _Items) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Adds items onto the end of the array at the path specified. - *

- *

- * The arguments after {@code path} and return value match that of - * {@code Array.prototype.push}. - *

- *

- * This method notifies other paths to the same array that a splice occurred - * to the array. - *

- *

- * This function is not supported by Flow because it returns a - * double. Functions with return types different than void are - * not supported at this moment. - * - * @param path - * Path to array. - * @param _Items - * Missing documentation! - */ - @NotSupported - protected void push(String path, JsonObject _Items) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -589,33 +403,6 @@ protected void push(String path, JsonObject _Items) { protected void pop(JsonObject path) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Removes an item from the end of array at the path specified. - *

- *

- * The arguments after {@code path} and return value match that of - * {@code Array.prototype.pop}. - *

- *

- * This method notifies other paths to the same array that a splice occurred - * to the array. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param path - * Path to array. - */ - @NotSupported - protected void pop(String path) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -651,41 +438,6 @@ protected void splice(JsonObject path, double start, double deleteCount, JsonObject _Items) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Starting from the start index specified, removes 0 or more items from the - * array and inserts 0 or more new items in their place. - *

- *

- * The arguments after {@code path} and return value match that of - * {@code Array.prototype.splice}. - *

- *

- * This method notifies other paths to the same array that a splice occurred - * to the array. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonArray. Functions with return types - * different than void are not supported at this moment. - * - * @param path - * Path to array. - * @param start - * Index from which to start removing/inserting. - * @param deleteCount - * Number of items to remove. - * @param _Items - * Missing documentation! - */ - @NotSupported - protected void splice(String path, double start, double deleteCount, - JsonObject _Items) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -713,33 +465,6 @@ protected void splice(String path, double start, double deleteCount, protected void shift(JsonObject path) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Removes an item from the beginning of array at the path specified. - *

- *

- * The arguments after {@code path} and return value match that of - * {@code Array.prototype.pop}. - *

- *

- * This method notifies other paths to the same array that a splice occurred - * to the array. - *

- *

- * This function is not supported by Flow because it returns a - * elemental.json.JsonObject. Functions with return types - * different than void are not supported at this moment. - * - * @param path - * Path to array. - */ - @NotSupported - protected void shift(String path) { - } - /** *

* Description copied from corresponding location in WebComponent: @@ -769,35 +494,6 @@ protected void shift(String path) { protected void unshift(JsonObject path, JsonObject _Items) { } - /** - *

- * Description copied from corresponding location in WebComponent: - *

- *

- * Adds items onto the beginning of the array at the path specified. - *

- *

- * The arguments after {@code path} and return value match that of - * {@code Array.prototype.push}. - *

- *

- * This method notifies other paths to the same array that a splice occurred - * to the array. - *

- *

- * This function is not supported by Flow because it returns a - * double. Functions with return types different than void are - * not supported at this moment. - * - * @param path - * Path to array. - * @param _Items - * Missing documentation! - */ - @NotSupported - protected void unshift(String path, JsonObject _Items) { - } - /** *

* Description copied from corresponding location in WebComponent: diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/dialog/GeneratedVaadinDialogOverlay.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/dialog/GeneratedVaadinDialogOverlay.java index b3d902ea6b9..fdd6e16dc3e 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/dialog/GeneratedVaadinDialogOverlay.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/dialog/GeneratedVaadinDialogOverlay.java @@ -16,18 +16,16 @@ package com.vaadin.flow.component.dialog; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; import elemental.json.JsonObject; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormItem.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormItem.java index 65c6c10cf64..78fabef845c 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormItem.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormItem.java @@ -16,12 +16,11 @@ package com.vaadin.flow.component.formlayout; import javax.annotation.Generated; - -import com.vaadin.flow.component.ClickNotifier; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.ClickNotifier; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; /** diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormLayout.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormLayout.java index 2b62dbd80b3..d9cb0ec0ee5 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormLayout.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/formlayout/GeneratedVaadinFormLayout.java @@ -16,13 +16,11 @@ package com.vaadin.flow.component.formlayout; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; - +import com.vaadin.flow.component.HasStyle; import elemental.json.JsonObject; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGrid.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGrid.java index c1127e85ed2..62de1a66d84 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGrid.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGrid.java @@ -16,22 +16,20 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import elemental.json.JsonObject; import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.dom.Element; -import com.vaadin.flow.shared.Registration; - import elemental.json.JsonArray; -import elemental.json.JsonObject; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; +import com.vaadin.flow.dom.Element; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumn.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumn.java index 165095eff61..51bffd085a5 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumn.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumn.java @@ -16,11 +16,10 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumnGroup.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumnGroup.java index 584e8444a60..f53d4b7e2ec 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumnGroup.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridColumnGroup.java @@ -16,11 +16,10 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridFilter.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridFilter.java index d441f23a5ca..c111701c0e6 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridFilter.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridFilter.java @@ -16,15 +16,14 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; -import com.vaadin.flow.function.SerializableBiFunction; import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSelectionColumn.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSelectionColumn.java index 52323111af6..dd44db940f2 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSelectionColumn.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSelectionColumn.java @@ -16,13 +16,12 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; - -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.shared.Registration; /** diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSorter.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSorter.java index 7f534103eca..0b9fea2f74c 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSorter.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridSorter.java @@ -16,15 +16,14 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Synchronize; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridTreeToggle.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridTreeToggle.java index e49013083d4..436c7b9fb44 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridTreeToggle.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GeneratedVaadinGridTreeToggle.java @@ -16,18 +16,17 @@ package com.vaadin.flow.component.grid; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GridVariant.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GridVariant.java index 72eaab46c98..3a99ba15f88 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GridVariant.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/grid/GridVariant.java @@ -23,9 +23,13 @@ @Generated({ "Generator: com.vaadin.generator.ComponentGenerator#1.1-SNAPSHOT", "WebComponent: Vaadin.GridElement#5.1.0-alpha3", "Flow#1.1-SNAPSHOT" }) public enum GridVariant { - LUMO_COLUMN_BORDERS("column-borders"), LUMO_ROW_STRIPES( - "row-stripes"), LUMO_COMPACT( - "compact"), LUMO_WRAP_CELL_CONTENT("wrap-cell-content"); + LUMO_NO_BORDER("no-border"), LUMO_NO_ROW_BORDERS( + "no-row-borders"), LUMO_COLUMN_BORDERS( + "column-borders"), LUMO_ROW_STRIPES( + "row-stripes"), LUMO_COMPACT( + "compact"), LUMO_WRAP_CELL_CONTENT( + "wrap-cell-content"), MATERIAL_COLUMN_DIVIDERS( + "column-dividers"); private final String variant; diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/listbox/GeneratedVaadinListBox.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/listbox/GeneratedVaadinListBox.java index 04018013cf0..e0b6bc49354 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/listbox/GeneratedVaadinListBox.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/listbox/GeneratedVaadinListBox.java @@ -16,11 +16,10 @@ package com.vaadin.flow.component.listbox; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotification.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotification.java index 45f15d6f940..d0657cfb00b 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotification.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotification.java @@ -16,14 +16,13 @@ package com.vaadin.flow.component.notification; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.Synchronize; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotificationCard.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotificationCard.java index 82c0414748d..c27a2ea0204 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotificationCard.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/notification/GeneratedVaadinNotificationCard.java @@ -16,11 +16,10 @@ package com.vaadin.flow.component.notification; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinHorizontalLayout.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinHorizontalLayout.java index f22557a5c88..67fcf45a49d 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinHorizontalLayout.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinHorizontalLayout.java @@ -16,14 +16,13 @@ package com.vaadin.flow.component.orderedlayout; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.HasTheme; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinVerticalLayout.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinVerticalLayout.java index 5a32d26db9b..5ca5c810292 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinVerticalLayout.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/orderedlayout/GeneratedVaadinVerticalLayout.java @@ -16,14 +16,13 @@ package com.vaadin.flow.component.orderedlayout; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.HasTheme; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/progressbar/GeneratedVaadinProgressBar.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/progressbar/GeneratedVaadinProgressBar.java index b3e07b4d757..896c2798234 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/progressbar/GeneratedVaadinProgressBar.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/progressbar/GeneratedVaadinProgressBar.java @@ -16,14 +16,13 @@ package com.vaadin.flow.component.progressbar; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.HasTheme; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioButton.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioButton.java index 15a6cd8cd0f..908457327e0 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioButton.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioButton.java @@ -16,17 +16,16 @@ package com.vaadin.flow.component.radiobutton; import javax.annotation.Generated; - +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Focusable; import com.vaadin.flow.component.ClickNotifier; -import com.vaadin.flow.component.Component; +import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.Focusable; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioGroup.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioGroup.java index 9a066a94749..0aef655353b 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioGroup.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/radiobutton/GeneratedVaadinRadioGroup.java @@ -16,21 +16,20 @@ package com.vaadin.flow.component.radiobutton; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.HasTheme; -import com.vaadin.flow.component.NotSupported; +import java.util.stream.Stream; +import java.util.stream.Collectors; import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.function.SerializableBiFunction; -import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/splitlayout/GeneratedVaadinSplitLayout.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/splitlayout/GeneratedVaadinSplitLayout.java index 46723b51678..46319598eeb 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/splitlayout/GeneratedVaadinSplitLayout.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/splitlayout/GeneratedVaadinSplitLayout.java @@ -16,20 +16,19 @@ package com.vaadin.flow.component.splitlayout; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.ClickNotifier; -import com.vaadin.flow.component.Component; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.DomEvent; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.HasTheme; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.dom.Element; import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; +import com.vaadin.flow.dom.Element; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTab.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTab.java index f9e3f3ac543..004b4de5ba7 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTab.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTab.java @@ -16,14 +16,13 @@ package com.vaadin.flow.component.tabs; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.HasTheme; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTabs.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTabs.java index e00666dff1d..313d2a6fd4e 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTabs.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/tabs/GeneratedVaadinTabs.java @@ -16,14 +16,13 @@ package com.vaadin.flow.component.tabs; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.HasTheme; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinPasswordField.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinPasswordField.java index c67b47b8a5f..8e6c0ea847e 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinPasswordField.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinPasswordField.java @@ -16,12 +16,12 @@ package com.vaadin.flow.component.textfield; import javax.annotation.Generated; - -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.HasValue; import com.vaadin.flow.function.SerializableFunction; +import com.vaadin.flow.function.SerializableBiFunction; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextArea.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextArea.java index 08f06ae45dd..2e8fb196481 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextArea.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextArea.java @@ -16,22 +16,24 @@ package com.vaadin.flow.component.textfield; import javax.annotation.Generated; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.Focusable; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.NotSupported; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Focusable; +import com.vaadin.flow.component.HasTheme; +import java.util.stream.Stream; +import java.util.stream.Collectors; +import com.vaadin.flow.component.Synchronize; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; -import com.vaadin.flow.function.SerializableBiFunction; import com.vaadin.flow.function.SerializableFunction; -import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

@@ -147,7 +149,31 @@ @HtmlImport("frontend://bower_components/vaadin-text-field/src/vaadin-text-area.html") public abstract class GeneratedVaadinTextArea, T> extends AbstractSinglePropertyField - implements HasStyle, Focusable { + implements HasStyle, Focusable, HasTheme { + + /** + * Adds theme variants to the component. + * + * @param variants + * theme variants to add + */ + public void addThemeVariants(TextAreaVariant... variants) { + getThemeNames() + .addAll(Stream.of(variants).map(TextAreaVariant::getVariantName) + .collect(Collectors.toList())); + } + + /** + * Removes theme variants from the component. + * + * @param variants + * theme variants to remove + */ + public void removeThemeVariants(TextAreaVariant... variants) { + getThemeNames().removeAll( + Stream.of(variants).map(TextAreaVariant::getVariantName) + .collect(Collectors.toList())); + } /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextField.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextField.java index 392c2876411..9bd65e5b2f5 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextField.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/GeneratedVaadinTextField.java @@ -16,25 +16,24 @@ package com.vaadin.flow.component.textfield; import javax.annotation.Generated; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import com.vaadin.flow.component.AbstractSinglePropertyField; -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.Focusable; +import com.vaadin.flow.component.Tag; +import com.vaadin.flow.component.dependency.HtmlImport; import com.vaadin.flow.component.HasStyle; +import com.vaadin.flow.component.Focusable; import com.vaadin.flow.component.HasTheme; -import com.vaadin.flow.component.NotSupported; +import java.util.stream.Stream; +import java.util.stream.Collectors; import com.vaadin.flow.component.Synchronize; -import com.vaadin.flow.component.Tag; -import com.vaadin.flow.component.dependency.HtmlImport; +import com.vaadin.flow.component.NotSupported; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; import com.vaadin.flow.dom.Element; -import com.vaadin.flow.function.SerializableBiFunction; import com.vaadin.flow.function.SerializableFunction; -import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.function.SerializableBiFunction; +import com.vaadin.flow.component.AbstractSinglePropertyField; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java new file mode 100644 index 00000000000..6a6efff8c22 --- /dev/null +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java @@ -0,0 +1,44 @@ +/* + * Copyright 2000-2018 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.flow.component.textfield; + +import javax.annotation.Generated; + +/** + * Set of theme variants applicable for {@code vaadin-text-area} component. + */ +@Generated({ "Generator: com.vaadin.generator.ComponentGenerator#1.1-SNAPSHOT", + "WebComponent: Vaadin.TextAreaElement#2.1.0-alpha3", + "Flow#1.1-SNAPSHOT" }) +public enum TextAreaVariant { + LUMO_SMALL("small"), LUMO_ALIGN_CENTER("align-center"), LUMO_ALIGN_RIGHT( + "align-right"), MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label"); + + private final String variant; + + TextAreaVariant(String variant) { + this.variant = variant; + } + + /** + * Gets the variant name. + * + * @return variant name + */ + public String getVariantName() { + return variant; + } +} \ No newline at end of file diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java index c353fe905b8..1ba7b2693d9 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java @@ -25,7 +25,7 @@ "Flow#1.1-SNAPSHOT" }) public enum TextFieldVariant { LUMO_SMALL("small"), LUMO_ALIGN_CENTER("align-center"), LUMO_ALIGN_RIGHT( - "align-right"); + "align-right"), MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label"); private final String variant; diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUpload.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUpload.java index b3116131a8d..124886f7dae 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUpload.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUpload.java @@ -16,21 +16,19 @@ package com.vaadin.flow.component.upload; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.EventData; -import com.vaadin.flow.component.HasStyle; -import com.vaadin.flow.component.Synchronize; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.dom.Element; -import com.vaadin.flow.shared.Registration; - -import elemental.json.JsonArray; +import com.vaadin.flow.component.HasStyle; import elemental.json.JsonObject; +import elemental.json.JsonArray; +import com.vaadin.flow.component.Synchronize; +import com.vaadin.flow.component.EventData; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; +import com.vaadin.flow.dom.Element; /** *

diff --git a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUploadFile.java b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUploadFile.java index 29f9c7c10a3..40ed9522750 100644 --- a/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUploadFile.java +++ b/flow-components-parent/flow-generated-components/src/main/java/com/vaadin/flow/component/upload/GeneratedVaadinUploadFile.java @@ -16,18 +16,16 @@ package com.vaadin.flow.component.upload; import javax.annotation.Generated; - -import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.ComponentEvent; -import com.vaadin.flow.component.ComponentEventListener; -import com.vaadin.flow.component.DomEvent; -import com.vaadin.flow.component.EventData; -import com.vaadin.flow.component.HasStyle; import com.vaadin.flow.component.Tag; import com.vaadin.flow.component.dependency.HtmlImport; -import com.vaadin.flow.shared.Registration; - +import com.vaadin.flow.component.HasStyle; import elemental.json.JsonObject; +import com.vaadin.flow.component.EventData; +import com.vaadin.flow.component.DomEvent; +import com.vaadin.flow.component.ComponentEvent; +import com.vaadin.flow.component.ComponentEventListener; +import com.vaadin.flow.shared.Registration; +import com.vaadin.flow.component.Component; /** *

diff --git a/flow-components-parent/flow-webcomponent-api-analyzer/gulpfile.js b/flow-components-parent/flow-webcomponent-api-analyzer/gulpfile.js index dc7fa86ff5c..8b44b2ecc17 100644 --- a/flow-components-parent/flow-webcomponent-api-analyzer/gulpfile.js +++ b/flow-components-parent/flow-webcomponent-api-analyzer/gulpfile.js @@ -17,17 +17,14 @@ const gulp = require('gulp'); const fs = require('fs-extra'); -const path = require('path'); const globalVar = require('./lib/js/global-variables'); const ElementFilter = require('./lib/js/element-filter'); const VersionReader = require('./lib/js/version-transform'); const MixinCollector = require('./lib/js/mixin-collector'); const AnalyzerTransform = require('./lib/js/analyzer-transform'); const ElementJsonTransform = require('./lib/js/element-json-transform'); +const VariantsTransform = require('./lib/js/variants-transform'); const gulpIgnore = require('gulp-ignore'); -const through = require('through2'); - -const variantsData = {}; gulp.task('prepare', cb => { if (!fs.existsSync(globalVar.bowerSrcDir) || fs.readdirSync(globalVar.bowerSrcDir).length === 0) { @@ -40,44 +37,10 @@ gulp.task('prepare', cb => { cb(); }); +const variantsData = {}; gulp.task('gather-variants-data', ['prepare'], () => { - console.log(`Gathering variants data from ${globalVar.bowerSrcDir}`); - - const themeFilesExtension = '.html'; - const themeNameRegex = /theme\/([^\/]+)\//; - const variantsRegex = /:host\(\[theme~=["|']([^'"]+)["|']/ig; - const themeRegex = /theme-for="([^"]+)"/; - - return gulp.src([`${globalVar.bowerSrcDir}/*/theme/**/*${themeFilesExtension}`]) - .pipe(through.obj((file, enc, cb) => { - try { - const themeName = (file.path.match(themeNameRegex) || [])[1]; - if (!themeName) { - return cb(new Error(`Failed to find a theme for path '${file.path}'`)); - } - - const variants = new Set(); - - let matches; - const fileContents = file.contents.toString(enc); - while ((matches = variantsRegex.exec(fileContents))) { - const newVariant = matches[1]; - if (newVariant) { - variants.add(newVariant); - } - } - - if (variants.size) { - const componentName = (fileContents.match(themeRegex) || [])[1] || path.basename(file.path, themeFilesExtension); - const componentThemes = (variantsData[componentName] || (variantsData[componentName] = {})); - (componentThemes[themeName] || (componentThemes[themeName] = [])).push(...variants); - } - return cb(); - } catch (e) { - console.error(`Failed to read the file '${file.path}', reason: '${e.stack}'`); - throw e; - } - })) + return gulp.src('/Users/someonetoignore/Work/components/*/theme/*/vaadin-*-styles.html') + .pipe(new VariantsTransform(variantsData)); }); gulp.task('generate', ['gather-variants-data'], () => { diff --git a/flow-components-parent/flow-webcomponent-api-analyzer/lib/js/variants-transform.js b/flow-components-parent/flow-webcomponent-api-analyzer/lib/js/variants-transform.js new file mode 100644 index 00000000000..9883fa5ed09 --- /dev/null +++ b/flow-components-parent/flow-webcomponent-api-analyzer/lib/js/variants-transform.js @@ -0,0 +1,160 @@ +/* + * Copyright 2000-2018 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +'use strict'; + +const {Transform} = require('readable-stream'); +const cheerio = require('cheerio'); + +function _extractVariants(text) { + const variantsRegex = /\[theme~=["|']([^'"]+)["|']/ig; + const variants = new Set(); + + let matches; + while ((matches = variantsRegex.exec(text))) { + const newVariant = matches[1]; + if (newVariant) { + variants.add(newVariant); + } + } + return variants; +} + +function _fillVariantsFromDependencies(variantsToFill, modules, dependencyIds) { + if (dependencyIds && dependencyIds.length) { + for (const dependencyId of dependencyIds) { + const dependencyData = modules[dependencyId]; + if (dependencyData) { + (dependencyData.variants || []).forEach(variant => variantsToFill.add(variant)); + _fillVariantsFromDependencies(variantsToFill, modules, dependencyData.dependencies); + } else { + // If we would like to have a complete dependency tree, lumo and material packages need to be analyzed also. + // Those packages do not contain theme declarations currently and addin them into the current project + // is really complicated, so simple logging is preferred currently. + console.debug(`Module data for module id '${dependencyId}' is missing. Ignoring its dependencies.`); + } + } + } +} + +const modulesData = {}; +const themeToTagToModuleId = {}; + +module.exports = class VariantsTransform extends Transform { + /** + * Fills `variantsData` object with variants from the files parsed. + * + * @param variantsData the object to fill with variants parsed + */ + constructor(variantsData) { + super({objectMode: true}); + if (!variantsData || typeof variantsData !== 'object') { + throw new Error(`Expected constructor parameter to be non-null object but got: '${variantsData}'`); + } + this.variantsData = variantsData; + } + + /** + * First step, where style file is processed. + * Style files are investigated for `dom-module` presence. + * Each of the `dom-module` tag contents is parsed and the data required is extracted: + * * `id` attribute value – module id + * * `theme-for` attribute value – tag name of the component the theme is applicable to + * * [theme~="small"] theme variants that are present in the theme + * * style tags with `include` attribute are retrieved. + * The value of the attribute is a whitespace-separated `dom-module` ids that are looked for variants + * (including their style tags with `include` attributes, recursively). + * + * After the module data is parsed: + * * each module data is saved in the map under its id (`modulesData`) + * * if present, relation between component tag and module id is saved for each theme name (`themeToTagToModuleId`) + * + * Whenever possible, `variantsData` is populated with the data. + */ + _transform(styleFile, enc, cb) { + const $ = cheerio.load(styleFile.contents.toString(enc)); + $('dom-module').each((_, domModuleElement) => { + const themeName = (styleFile.path.match(/theme\/([^\/]+)\//) || [])[1]; + if (!themeName) { + return cb(new Error(`Failed to find a theme for path '${styleFile.path}'`)); + } + + const themeModules = modulesData[themeName] || (modulesData[themeName] = {}); + const moduleId = domModuleElement.attribs['id']; + if (themeModules[moduleId]) { + throw new Error(`Have found multiple 'dom-module' element declarations with the same id: '${moduleId}'. File with the second declaration: '${styleFile.path}'`); + } + + const domModuleSelector = $(domModuleElement); + const variants = _extractVariants(domModuleSelector.text()); + const dependencies = domModuleSelector + .find('style[include]') + .map((i, styleElement) => { + const includeAttributeValue = styleElement.attribs['include']; + if (includeAttributeValue) { + return includeAttributeValue.split(' '); + } + }) + .get(); + const componentTag = domModuleElement.attribs['theme-for']; + if (componentTag) { + const tagToModuleId = themeToTagToModuleId[themeName] || (themeToTagToModuleId[themeName] = {}); + tagToModuleId[componentTag] = moduleId; + if (variants.size || dependencies.length) { + const componentThemes = (this.variantsData[componentTag] || (this.variantsData[componentTag] = {})); + const componentVariants = (componentThemes[themeName] || (componentThemes[themeName] = new Set())); + if (variants.size) { + variants.forEach(variant => componentVariants.add(variant)); + } + } + } + themeModules[moduleId] = {dependencies, variants, componentTag}; + }); + cb(); + } + + /** + * After all modules are parsed and the supplementary data is collected, + * `variantsData` is additionally filled with all dependencies' variants, recursively. + */ + _flush(cb) { + for (const componentTag in this.variantsData) { + if (!this.variantsData.hasOwnProperty(componentTag)) { + continue; + } + + const componentThemes = this.variantsData[componentTag]; + for (const themeName in componentThemes) { + if (!componentThemes.hasOwnProperty(themeName)) { + continue; + } + + const themeModules = modulesData[themeName]; + const moduleId = themeToTagToModuleId[themeName][componentTag]; + const variantsToFill = componentThemes[themeName]; + _fillVariantsFromDependencies(variantsToFill, themeModules, (themeModules[moduleId] || {}).dependencies); + if (!variantsToFill.size) { + delete componentThemes[themeName]; + } else { + componentThemes[themeName] = [...variantsToFill]; + } + } + if (!Object.keys(componentThemes).length) { + delete this.variantsData[componentTag]; + } + } + cb(); + } +}; diff --git a/flow-components-parent/flow-webcomponent-api-analyzer/package-lock.json b/flow-components-parent/flow-webcomponent-api-analyzer/package-lock.json index deffe6a309e..ae4b30aa4a4 100644 --- a/flow-components-parent/flow-webcomponent-api-analyzer/package-lock.json +++ b/flow-components-parent/flow-webcomponent-api-analyzer/package-lock.json @@ -5,14 +5,14 @@ "requires": true, "dependencies": { "@types/chai": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.0.1.tgz", - "integrity": "sha512-DWrdkraJO+KvBB7+Jc6AuDd2+fwV6Z9iK8cqEEoYpcurYrH7GiUZmwjFuQIIWj5HhFz6NsSxdN72YMIHT7Fy2Q==" + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.4.tgz", + "integrity": "sha512-h6+VEw2Vr3ORiFCyyJmcho2zALnUq9cvdB/IO8Xs9itrJVCenC7o26A6+m7D0ihTTr65eS259H5/Ghl/VjYs6g==" }, "@types/chai-subset": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.0.tgz", - "integrity": "sha1-dM7M7zsvwtpzkbcT3rcv6afl94I=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.1.tgz", + "integrity": "sha512-Aof+FLfWzBPzDgJ2uuBuPNOBHVx9Siyw4vmOcsMgsuxX1nfUWSlzpq4pdvQiaBgGjGS7vP/Oft5dpJbX4krT1A==", "requires": { "@types/chai": "*" } @@ -48,9 +48,9 @@ "integrity": "sha1-qnr2mjqRkiFx7kEbPJ2Pa+tK8yE=" }, "@types/node": { - "version": "6.0.84", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.84.tgz", - "integrity": "sha512-1SvEazClhUBRNroJM3oB3xf3u2r6xGmHDGbdigqNPHvNKLl8/BtATgO9eC04ZLuovpSh0B20BF1QJxdi+qmTlg==" + "version": "6.0.114", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.114.tgz", + "integrity": "sha512-5ViC9dwf1VIAtrOFTvOuN04lJgw28eKjuy0Vg2Bd/fSlxKP2feCSkIw04ZgOENL2ywdWrtbkthp1XVLEjJmouw==" }, "@types/parse5": { "version": "2.2.34", @@ -61,9 +61,9 @@ } }, "acorn": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", - "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==" + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", + "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==" }, "acorn-jsx": { "version": "3.0.1", @@ -80,12 +80,6 @@ } } }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "optional": true - }, "ansi-cyan": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", @@ -253,10 +247,15 @@ "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, "bower": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.2.tgz", - "integrity": "sha1-rfU1KcjUrwLvJPuNU0HBQZ0z4vc=" + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz", + "integrity": "sha1-54dqB23rgTf30GUl3F6MZtuC8oo=" }, "brace-expansion": { "version": "1.1.11", @@ -322,6 +321,29 @@ "supports-color": "^2.0.0" } }, + "cheerio": { + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", + "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash.assignin": "^4.0.9", + "lodash.bind": "^4.1.4", + "lodash.defaults": "^4.0.1", + "lodash.filter": "^4.4.0", + "lodash.flatten": "^4.2.0", + "lodash.foreach": "^4.3.0", + "lodash.map": "^4.4.0", + "lodash.merge": "^4.4.0", + "lodash.pick": "^4.2.1", + "lodash.reduce": "^4.4.0", + "lodash.reject": "^4.4.0", + "lodash.some": "^4.4.0" + } + }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -344,9 +366,9 @@ } }, "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" }, "clone-stats": { "version": "0.0.1", @@ -395,6 +417,22 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "requires": { + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" + } + }, + "css-what": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", + "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=" + }, "cssbeautify": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/cssbeautify/-/cssbeautify-0.3.1.tgz", @@ -479,18 +517,26 @@ "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" }, "doctrine": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz", - "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" + "esutils": "^2.0.2" + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "requires": { + "domelementtype": "~1.1.1", + "entities": "~1.1.1" }, "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" } } }, @@ -513,12 +559,57 @@ } } }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" + }, + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, "duplexer2": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "requires": { "readable-stream": "~1.1.9" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + } } }, "end-of-stream": { @@ -529,43 +620,49 @@ "once": "~1.3.0" } }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", - "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.11.0.tgz", + "integrity": "sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==", "requires": { - "esprima": "^2.7.1", - "estraverse": "^1.9.1", + "esprima": "^3.1.3", + "estraverse": "^4.2.0", "esutils": "^2.0.2", "optionator": "^0.8.1", - "source-map": "~0.2.0" + "source-map": "~0.6.1" }, "dependencies": { - "estraverse": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", - "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=" + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true } } }, "espree": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", - "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", + "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", "requires": { - "acorn": "^5.0.1", + "acorn": "^5.5.0", "acorn-jsx": "^3.0.0" } }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" }, "estraverse": { "version": "4.2.0", @@ -842,6 +939,11 @@ "unique-stream": "^1.0.0" }, "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, "readable-stream": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", @@ -853,6 +955,11 @@ "string_decoder": "~0.10.x" } }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", @@ -1111,6 +1218,19 @@ "parse-passwd": "^1.0.0" } }, + "htmlparser2": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "requires": { + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" + } + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1273,9 +1393,9 @@ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" }, "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -1296,9 +1416,9 @@ } }, "jsonschema": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.1.1.tgz", - "integrity": "sha1-PO3o4+QR03eHLu+8n98mODy8Ptk=" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz", + "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw==" }, "kind-of": { "version": "6.0.2", @@ -1379,6 +1499,21 @@ "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" }, + "lodash.assignin": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", + "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + }, + "lodash.bind": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", + "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=" + }, "lodash.escape": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", @@ -1387,6 +1522,21 @@ "lodash._root": "^3.0.0" } }, + "lodash.filter": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", + "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=" + }, + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -1407,11 +1557,41 @@ "lodash.isarray": "^3.0.0" } }, + "lodash.map": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", + "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=" + }, + "lodash.merge": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz", + "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==" + }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + }, + "lodash.reduce": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", + "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=" + }, + "lodash.reject": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", + "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=" + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" }, + "lodash.some": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", + "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" + }, "lodash.template": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", @@ -1587,6 +1767,14 @@ "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz", "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==" }, + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "requires": { + "boolbase": "~1.0.0" + } + }, "object-assign": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", @@ -1842,19 +2030,22 @@ "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" }, "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rechoir": { @@ -2000,11 +2191,6 @@ "requires": { "is-extendable": "^0.1.0" } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" } } }, @@ -2073,13 +2259,9 @@ } }, "source-map": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", - "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", - "optional": true, - "requires": { - "amdefine": ">=0.0.4" - } + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { "version": "0.5.2", @@ -2141,41 +2323,15 @@ "integrity": "sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==", "requires": { "readable-stream": "^2.0.2" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } } }, "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } }, "strip-ansi": { "version": "3.0.1", @@ -2211,35 +2367,6 @@ "requires": { "readable-stream": "^2.1.5", "xtend": "~4.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } } }, "tildify": { @@ -2381,11 +2508,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" } } }, @@ -2455,6 +2577,11 @@ "natives": "^1.1.0" } }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, "readable-stream": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", @@ -2466,6 +2593,11 @@ "string_decoder": "~0.10.x" } }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "through2": { "version": "0.6.5", "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", diff --git a/flow-components-parent/flow-webcomponent-api-analyzer/package.json b/flow-components-parent/flow-webcomponent-api-analyzer/package.json index d89799cee6d..babb68edf89 100644 --- a/flow-components-parent/flow-webcomponent-api-analyzer/package.json +++ b/flow-components-parent/flow-webcomponent-api-analyzer/package.json @@ -6,6 +6,7 @@ "license": "Apache License 2.0", "dependencies": { "bower": "^1.8.2", + "cheerio": "^0.22.0", "coa": "~1.0.1", "fs-extra": "latest", "gulp": "latest",