From bfc3fa0f8dc1105857d4fc65b29a5c764d49fc0a Mon Sep 17 00:00:00 2001 From: Sergey Vinogradov Date: Mon, 8 Nov 2021 15:50:34 +0300 Subject: [PATCH] refactor: sort import statements in src files (#2915) --- .eslintrc.json | 48 ++++++++++++++++++- package.json | 1 + packages/accordion/src/vaadin-accordion.js | 2 +- packages/app-layout/src/vaadin-app-layout.js | 12 ++--- .../src/vaadin-avatar-group-overlay.js | 2 +- .../avatar-group/src/vaadin-avatar-group.d.ts | 2 +- .../avatar-group/src/vaadin-avatar-group.js | 16 +++---- packages/avatar/src/vaadin-avatar.js | 4 +- packages/board/src/vaadin-board-row.js | 10 ++-- packages/board/src/vaadin-board.js | 8 ++-- packages/button/src/vaadin-button.js | 2 +- packages/charts/src/vaadin-chart-series.js | 2 +- packages/charts/src/vaadin-chart.d.ts | 2 +- packages/charts/src/vaadin-chart.js | 15 +++--- .../src/vaadin-checkbox-group.js | 4 +- packages/checkbox/src/vaadin-checkbox.js | 2 +- .../src/vaadin-combo-box-dropdown.js | 6 +-- .../combo-box/src/vaadin-combo-box-item.js | 2 +- .../combo-box/src/vaadin-combo-box-light.js | 6 +-- .../combo-box/src/vaadin-combo-box-overlay.js | 2 +- .../src/vaadin-combo-box-scroller.js | 2 +- packages/combo-box/src/vaadin-combo-box.js | 10 ++-- .../component-base/src/element-mixin.d.ts | 4 +- packages/component-base/src/iron-list-core.js | 2 +- .../src/virtualizer-iron-list-adapter.js | 2 +- .../src/vaadin-confirm-dialog.js | 6 +-- .../src/vaadin-context-menu-overlay.js | 2 +- .../context-menu/src/vaadin-context-menu.js | 10 ++-- .../src/vaadin-contextmenu-event.js | 2 +- .../src/vaadin-device-detector.js | 2 +- .../src/vaadin-cookie-consent.js | 4 +- packages/crud/src/vaadin-crud-edit-column.js | 2 +- packages/crud/src/vaadin-crud-edit.js | 2 +- packages/crud/src/vaadin-crud-form.js | 2 +- packages/crud/src/vaadin-crud-grid.js | 4 +- packages/crud/src/vaadin-crud.d.ts | 2 +- packages/crud/src/vaadin-crud.js | 10 ++-- packages/crud/src/vaadin-dialog-layout.js | 4 +- .../custom-field/src/vaadin-custom-field.js | 2 +- .../src/vaadin-date-picker-light.js | 6 +-- .../src/vaadin-date-picker-overlay-content.js | 16 +++---- .../date-picker/src/vaadin-date-picker.js | 14 +++--- .../src/vaadin-infinite-scroller.js | 4 +- .../date-picker/src/vaadin-month-calendar.js | 2 +- .../src/vaadin-date-time-picker.d.ts | 4 +- .../src/vaadin-date-time-picker.js | 12 ++--- packages/details/src/vaadin-details.js | 2 +- .../src/vaadin-dialog-draggable-mixin.js | 2 +- .../src/vaadin-dialog-resizable-mixin.js | 4 +- packages/dialog/src/vaadin-dialog.js | 4 +- .../email-field/src/vaadin-email-field.js | 2 +- packages/field-base/src/field-mixin.js | 2 +- packages/field-base/src/pattern-mixin.js | 2 +- packages/form-layout/src/vaadin-form-item.js | 2 +- .../form-layout/src/vaadin-form-layout.js | 6 +-- .../src/vaadin-grid-pro-edit-column.d.ts | 2 +- .../src/vaadin-grid-pro-edit-column.js | 4 +- .../src/vaadin-grid-pro-edit-select.js | 2 +- packages/grid-pro/src/vaadin-grid-pro.d.ts | 2 +- packages/grid-pro/src/vaadin-grid-pro.js | 2 +- .../grid/src/vaadin-grid-column-group.d.ts | 2 +- packages/grid/src/vaadin-grid-column-group.js | 2 +- packages/grid/src/vaadin-grid-column.js | 4 +- .../src/vaadin-grid-data-provider-mixin.js | 2 +- .../src/vaadin-grid-dynamic-columns-mixin.js | 4 +- .../grid/src/vaadin-grid-filter-column.d.ts | 2 +- .../grid/src/vaadin-grid-filter-column.js | 2 +- packages/grid/src/vaadin-grid-filter.js | 6 +-- packages/grid/src/vaadin-grid-scroll-mixin.js | 2 +- .../src/vaadin-grid-selection-column.d.ts | 2 +- .../grid/src/vaadin-grid-selection-column.js | 2 +- .../grid/src/vaadin-grid-sort-column.d.ts | 2 +- packages/grid/src/vaadin-grid-sort-column.js | 2 +- packages/grid/src/vaadin-grid-sorter.js | 2 +- packages/grid/src/vaadin-grid-styles.js | 2 +- .../grid/src/vaadin-grid-styling-mixin.d.ts | 2 +- .../grid/src/vaadin-grid-tree-column.d.ts | 2 +- packages/grid/src/vaadin-grid-tree-column.js | 2 +- packages/grid/src/vaadin-grid-tree-toggle.js | 2 +- packages/grid/src/vaadin-grid.d.ts | 6 +-- packages/grid/src/vaadin-grid.js | 12 ++--- .../src/vaadin-horizontal-layout.js | 2 +- packages/icon/src/vaadin-icon.js | 4 +- .../src/vaadin-input-container.js | 4 +- packages/item/src/vaadin-item.js | 2 +- packages/list-box/src/vaadin-list-box.d.ts | 2 +- packages/list-box/src/vaadin-list-box.js | 4 +- .../login/src/vaadin-login-form-wrapper.js | 4 +- packages/login/src/vaadin-login-form.js | 6 +-- packages/login/src/vaadin-login-overlay.js | 6 +-- .../menu-bar/src/vaadin-menu-bar-button.js | 2 +- packages/menu-bar/src/vaadin-menu-bar.js | 6 +-- .../src/vaadin-message-input-button.js | 2 +- .../src/vaadin-message-input-text-area.js | 2 +- .../message-input/src/vaadin-message-input.js | 6 +-- .../message-list/src/vaadin-message-avatar.js | 2 +- .../message-list/src/vaadin-message-list.js | 2 +- packages/message-list/src/vaadin-message.js | 4 +- .../notification/src/vaadin-notification.js | 2 +- .../number-field/src/vaadin-number-field.js | 6 +-- .../src/template-renderer.js | 2 +- .../progress-bar/src/vaadin-progress-bar.js | 2 +- .../radio-group/src/vaadin-radio-button.js | 2 +- .../radio-group/src/vaadin-radio-group.d.ts | 2 +- .../radio-group/src/vaadin-radio-group.js | 4 +- .../vaadin-rich-text-editor-content-styles.js | 2 +- .../src/vaadin-rich-text-editor-icons.js | 2 +- .../vaadin-rich-text-editor-toolbar-styles.js | 2 +- .../src/vaadin-rich-text-editor.js | 16 +++---- packages/scroller/src/vaadin-scroller.js | 2 +- packages/select/src/vaadin-select-overlay.js | 2 +- .../select/src/vaadin-select-value-button.js | 2 +- packages/select/src/vaadin-select.js | 10 ++-- .../split-layout/src/vaadin-split-layout.js | 4 +- packages/tabs/src/vaadin-tab.js | 2 +- packages/tabs/src/vaadin-tabs.js | 8 ++-- packages/text-area/src/vaadin-text-area.js | 8 ++-- packages/text-field/src/vaadin-text-field.js | 6 +-- .../src/vaadin-time-picker-combo-box.js | 4 +- .../src/vaadin-time-picker-dropdown.js | 4 +- .../src/vaadin-time-picker-overlay.js | 2 +- .../time-picker/src/vaadin-time-picker.js | 10 ++-- packages/upload/src/vaadin-upload-file.js | 4 +- packages/upload/src/vaadin-upload.js | 8 ++-- .../vaadin-list-mixin/vaadin-list-mixin.js | 4 +- packages/vaadin-overlay/src/vaadin-overlay.js | 6 +-- .../vaadin-themable-mixin.js | 2 +- .../src/vaadin-vertical-layout.js | 2 +- .../virtual-list/src/vaadin-virtual-list.js | 2 +- yarn.lock | 5 ++ 130 files changed, 317 insertions(+), 264 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 3de5e36d06..1383078054 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,7 +10,8 @@ }, "plugins": [ "prettier", - "@typescript-eslint" + "@typescript-eslint", + "simple-import-sort" ], "extends": [ "eslint:recommended", @@ -18,6 +19,25 @@ "plugin:@typescript-eslint/recommended" ], "rules": { + "simple-import-sort/imports": [ + "error", + { + "groups": [ + [ + // Side-effects group + "^\\u0000", + // External group + "^", + // Vaadin group + "^@vaadin", + // Parent group + "^\\.\\.", + // Sibling group + "^\\." + ] + ] + } + ], "no-unused-vars": "off", "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" @@ -34,6 +54,32 @@ "rules": { "@typescript-eslint/no-var-requires": "off" } + }, + { + "files": ["packages/**/test/**"], + "rules": { + "simple-import-sort/imports": [ + "error", + { + "groups": [ + [ + // Testing tools group + "^(@esm-bundle|@web|@vaadin/testing-helpers|sinon)", + // Side-effects group + "^\\u0000", + // External group + "^", + // Vaadin group + "^@vaadin", + // Parent group + "^\\.\\.", + // Sibling group + "^\\." + ] + ] + } + ] + } } ] } diff --git a/package.json b/package.json index a1c7d5ca00..bfcad3153b 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "eslint": "^8.1.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-simple-import-sort": "7.0.0", "glob": "^7.2.0", "husky": "^7.0.4", "lerna": "^4.0.0", diff --git a/packages/accordion/src/vaadin-accordion.js b/packages/accordion/src/vaadin-accordion.js index 594077eb51..d20f676f41 100644 --- a/packages/accordion/src/vaadin-accordion.js +++ b/packages/accordion/src/vaadin-accordion.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { AccordionPanel } from './vaadin-accordion-panel.js'; diff --git a/packages/app-layout/src/vaadin-app-layout.js b/packages/app-layout/src/vaadin-app-layout.js index 7c0b0f0860..3bbb846bd4 100644 --- a/packages/app-layout/src/vaadin-app-layout.js +++ b/packages/app-layout/src/vaadin-app-layout.js @@ -3,15 +3,15 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { beforeNextRender, afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; -import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import './safe-area-inset.js'; +import './detect-ios-navbar.js'; import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { afterNextRender, beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import './safe-area-inset.js'; -import './detect-ios-navbar.js'; /** * `` is a Web Component providing a quick and easy way to get a common application layout structure done. diff --git a/packages/avatar-group/src/vaadin-avatar-group-overlay.js b/packages/avatar-group/src/vaadin-avatar-group-overlay.js index 6b50fbdff5..e7998ea588 100644 --- a/packages/avatar-group/src/vaadin-avatar-group-overlay.js +++ b/packages/avatar-group/src/vaadin-avatar-group-overlay.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-avatar-group-overlay', diff --git a/packages/avatar-group/src/vaadin-avatar-group.d.ts b/packages/avatar-group/src/vaadin-avatar-group.d.ts index ace6546aa0..b2f271065c 100644 --- a/packages/avatar-group/src/vaadin-avatar-group.d.ts +++ b/packages/avatar-group/src/vaadin-avatar-group.d.ts @@ -3,9 +3,9 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ +import { AvatarI18n } from '@vaadin/avatar/src/vaadin-avatar.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { AvatarI18n } from '@vaadin/avatar/src/vaadin-avatar.js'; export { AvatarI18n }; diff --git a/packages/avatar-group/src/vaadin-avatar-group.js b/packages/avatar-group/src/vaadin-avatar-group.js index 403ed9f646..87bd184c2e 100644 --- a/packages/avatar-group/src/vaadin-avatar-group.js +++ b/packages/avatar-group/src/vaadin-avatar-group.js @@ -3,20 +3,20 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; -import { calculateSplices } from '@polymer/polymer/lib/utils/array-splice.js'; -import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import '@vaadin/avatar/src/vaadin-avatar.js'; +import '@vaadin/item/src/vaadin-item.js'; +import './vaadin-avatar-group-list-box.js'; +import './vaadin-avatar-group-overlay.js'; import { IronA11yAnnouncer } from '@polymer/iron-a11y-announcer/iron-a11y-announcer.js'; import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { calculateSplices } from '@polymer/polymer/lib/utils/array-splice.js'; +import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import '@vaadin/avatar/src/vaadin-avatar.js'; -import '@vaadin/item/src/vaadin-item.js'; -import './vaadin-avatar-group-list-box.js'; -import './vaadin-avatar-group-overlay.js'; const MINIMUM_DISPLAYED_AVATARS = 2; diff --git a/packages/avatar/src/vaadin-avatar.js b/packages/avatar/src/vaadin-avatar.js index 47853c88ae..351924e220 100644 --- a/packages/avatar/src/vaadin-avatar.js +++ b/packages/avatar/src/vaadin-avatar.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-avatar-icons.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import './vaadin-avatar-icons.js'; /** * `` is a Web Component providing avatar displaying functionality. diff --git a/packages/board/src/vaadin-board-row.js b/packages/board/src/vaadin-board-row.js index 75c1f10626..f064ef3d30 100644 --- a/packages/board/src/vaadin-board-row.js +++ b/packages/board/src/vaadin-board-row.js @@ -3,12 +3,12 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; -import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; -import { DomRepeat } from '@polymer/polymer/lib/elements/dom-repeat.js'; -import { DomIf } from '@polymer/polymer/lib/elements/dom-if.js'; import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { DomIf } from '@polymer/polymer/lib/elements/dom-if.js'; +import { DomRepeat } from '@polymer/polymer/lib/elements/dom-repeat.js'; +import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; const CLASSES = { diff --git a/packages/board/src/vaadin-board.js b/packages/board/src/vaadin-board.js index 1de2dbbe5a..479537841b 100644 --- a/packages/board/src/vaadin-board.js +++ b/packages/board/src/vaadin-board.js @@ -3,12 +3,12 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; -import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; import './vaadin-board-row.js'; +import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; /** * `` is a web component to create flexible responsive layouts diff --git a/packages/button/src/vaadin-button.js b/packages/button/src/vaadin-button.js index 51a4becfbe..5c95515f70 100644 --- a/packages/button/src/vaadin-button.js +++ b/packages/button/src/vaadin-button.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ActiveMixin } from '@vaadin/component-base/src/active-mixin.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; diff --git a/packages/charts/src/vaadin-chart-series.js b/packages/charts/src/vaadin-chart-series.js index a7dbeb6b41..88fd54ed4d 100644 --- a/packages/charts/src/vaadin-chart-series.js +++ b/packages/charts/src/vaadin-chart-series.js @@ -4,7 +4,7 @@ * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ import { PolymerElement } from '@polymer/polymer/polymer-element.js'; -import { deepMerge, Chart } from './vaadin-chart.js'; +import { Chart, deepMerge } from './vaadin-chart.js'; /** * `` is a custom element for creating series for Vaadin Charts. diff --git a/packages/charts/src/vaadin-chart.d.ts b/packages/charts/src/vaadin-chart.d.ts index 49627ec9bd..3ecf873f58 100644 --- a/packages/charts/src/vaadin-chart.d.ts +++ b/packages/charts/src/vaadin-chart.d.ts @@ -3,9 +3,9 @@ * Copyright (c) 2015 - 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ +import { Axis, Chart as HighchartsChart, ExtremesObject, Options, Point, Series } from 'highcharts'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { Axis, Chart as HighchartsChart, ExtremesObject, Options, Point, Series } from 'highcharts'; export type ChartCategories = Array | { [key: number]: string }; diff --git a/packages/charts/src/vaadin-chart.js b/packages/charts/src/vaadin-chart.js index 5bfa228225..c9ede7ac63 100644 --- a/packages/charts/src/vaadin-chart.js +++ b/packages/charts/src/vaadin-chart.js @@ -3,14 +3,8 @@ * Copyright (c) 2015 - 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; -import { ChartSeries } from './vaadin-chart-series.js'; -import Highcharts from 'highcharts/es-modules/masters/highstock.src.js'; +import 'highcharts/es-modules/masters/highstock.src.js'; import 'highcharts/es-modules/masters/modules/accessibility.src.js'; import 'highcharts/es-modules/masters/highcharts-more.src.js'; import 'highcharts/es-modules/masters/highcharts-3d.src.js'; @@ -27,6 +21,13 @@ import 'highcharts/es-modules/masters/modules/timeline.src.js'; import 'highcharts/es-modules/masters/modules/organization.src.js'; import 'highcharts/es-modules/masters/modules/xrange.src.js'; import 'highcharts/es-modules/masters/modules/bullet.src.js'; +import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import Highcharts from 'highcharts/es-modules/masters/highstock.src.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; +import { ChartSeries } from './vaadin-chart-series.js'; /** @private */ export const deepMerge = function deepMerge(target, source) { diff --git a/packages/checkbox-group/src/vaadin-checkbox-group.js b/packages/checkbox-group/src/vaadin-checkbox-group.js index 7e56b6f8d9..872eadbc1b 100644 --- a/packages/checkbox-group/src/vaadin-checkbox-group.js +++ b/packages/checkbox-group/src/vaadin-checkbox-group.js @@ -3,14 +3,14 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { Checkbox } from '@vaadin/checkbox/src/vaadin-checkbox.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { Checkbox } from '@vaadin/checkbox/src/vaadin-checkbox.js'; /** * `` is a web component that allows the user to choose several items from a group of binary choices. diff --git a/packages/checkbox/src/vaadin-checkbox.js b/packages/checkbox/src/vaadin-checkbox.js index 6e62173be0..f746d3aa48 100644 --- a/packages/checkbox/src/vaadin-checkbox.js +++ b/packages/checkbox/src/vaadin-checkbox.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ActiveMixin } from '@vaadin/component-base/src/active-mixin.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; diff --git a/packages/combo-box/src/vaadin-combo-box-dropdown.js b/packages/combo-box/src/vaadin-combo-box-dropdown.js index e0791f5def..a5471d27a7 100644 --- a/packages/combo-box/src/vaadin-combo-box-dropdown.js +++ b/packages/combo-box/src/vaadin-combo-box-dropdown.js @@ -3,12 +3,12 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; -import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; import './vaadin-combo-box-item.js'; import './vaadin-combo-box-overlay.js'; import './vaadin-combo-box-scroller.js'; +import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; const TOUCH_DEVICE = (() => { try { diff --git a/packages/combo-box/src/vaadin-combo-box-item.js b/packages/combo-box/src/vaadin-combo-box-item.js index 4765911cbc..4216b6395b 100644 --- a/packages/combo-box/src/vaadin-combo-box-item.js +++ b/packages/combo-box/src/vaadin-combo-box-item.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/combo-box/src/vaadin-combo-box-light.js b/packages/combo-box/src/vaadin-combo-box-light.js index 4fb29b0631..b38cca5a1f 100644 --- a/packages/combo-box/src/vaadin-combo-box-light.js +++ b/packages/combo-box/src/vaadin-combo-box-light.js @@ -3,12 +3,12 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-combo-box-dropdown.js'; import { dashToCamelCase } from '@polymer/polymer/lib/utils/case-map.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { ComboBoxMixin } from './vaadin-combo-box-mixin.js'; import { ComboBoxDataProviderMixin } from './vaadin-combo-box-data-provider-mixin.js'; -import './vaadin-combo-box-dropdown.js'; +import { ComboBoxMixin } from './vaadin-combo-box-mixin.js'; /** * `` is a customizable version of the `` providing diff --git a/packages/combo-box/src/vaadin-combo-box-overlay.js b/packages/combo-box/src/vaadin-combo-box-overlay.js index ec412a1cce..07a01daea0 100644 --- a/packages/combo-box/src/vaadin-combo-box-overlay.js +++ b/packages/combo-box/src/vaadin-combo-box-overlay.js @@ -4,8 +4,8 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import { PositionMixin } from '@vaadin/vaadin-overlay/src/vaadin-overlay-position-mixin.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-combo-box-overlay', diff --git a/packages/combo-box/src/vaadin-combo-box-scroller.js b/packages/combo-box/src/vaadin-combo-box-scroller.js index 1a4d1d23c9..be35c6567a 100644 --- a/packages/combo-box/src/vaadin-combo-box-scroller.js +++ b/packages/combo-box/src/vaadin-combo-box-scroller.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { Virtualizer } from '@vaadin/component-base/src/virtualizer.js'; import { ComboBoxPlaceholder } from './vaadin-combo-box-placeholder.js'; diff --git a/packages/combo-box/src/vaadin-combo-box.js b/packages/combo-box/src/vaadin-combo-box.js index cdd307178c..a906c63b81 100644 --- a/packages/combo-box/src/vaadin-combo-box.js +++ b/packages/combo-box/src/vaadin-combo-box.js @@ -3,19 +3,19 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import './vaadin-combo-box-dropdown.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; -import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js'; +import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { PatternMixin } from '@vaadin/field-base/src/pattern-mixin.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { ComboBoxDataProviderMixin } from './vaadin-combo-box-data-provider-mixin.js'; import { ComboBoxMixin } from './vaadin-combo-box-mixin.js'; -import './vaadin-combo-box-dropdown.js'; registerStyles('vaadin-combo-box', inputFieldShared, { moduleId: 'vaadin-combo-box-styles' }); diff --git a/packages/component-base/src/element-mixin.d.ts b/packages/component-base/src/element-mixin.d.ts index a4b0806ecf..bf9076fc7d 100644 --- a/packages/component-base/src/element-mixin.d.ts +++ b/packages/component-base/src/element-mixin.d.ts @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { Constructor } from '@open-wc/dedupe-mixin'; -import { ReactiveControllerHost } from 'lit'; import '../custom_typings/vaadin-usage-statistics.js'; import '../custom_typings/vaadin.js'; +import { Constructor } from '@open-wc/dedupe-mixin'; +import { ReactiveControllerHost } from 'lit'; import { DirMixinClass } from './dir-mixin.js'; /** diff --git a/packages/component-base/src/iron-list-core.js b/packages/component-base/src/iron-list-core.js index cc176170e1..6c3c691710 100644 --- a/packages/component-base/src/iron-list-core.js +++ b/packages/component-base/src/iron-list-core.js @@ -7,8 +7,8 @@ * Code distributed by Google as part of the polymer project is also * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt */ -import { Debouncer, enqueueDebouncer, flush } from '@vaadin/component-base/src/debounce.js'; import { animationFrame, idlePeriod, microTask } from '@vaadin/component-base/src/async.js'; +import { Debouncer, enqueueDebouncer, flush } from '@vaadin/component-base/src/debounce.js'; const IOS = navigator.userAgent.match(/iP(?:hone|ad;(?: U;)? CPU) OS (\d+)/); const IOS_TOUCH_SCROLLING = IOS && IOS[1] >= 8; diff --git a/packages/component-base/src/virtualizer-iron-list-adapter.js b/packages/component-base/src/virtualizer-iron-list-adapter.js index 6cddf9b7c8..74beba7e03 100644 --- a/packages/component-base/src/virtualizer-iron-list-adapter.js +++ b/packages/component-base/src/virtualizer-iron-list-adapter.js @@ -1,4 +1,4 @@ -import { timeOut, animationFrame } from '@vaadin/component-base/src/async.js'; +import { animationFrame, timeOut } from '@vaadin/component-base/src/async.js'; import { Debouncer, flush } from '@vaadin/component-base/src/debounce.js'; import { ironList } from './iron-list-core.js'; diff --git a/packages/confirm-dialog/src/vaadin-confirm-dialog.js b/packages/confirm-dialog/src/vaadin-confirm-dialog.js index 0443601be7..687c4fb687 100644 --- a/packages/confirm-dialog/src/vaadin-confirm-dialog.js +++ b/packages/confirm-dialog/src/vaadin-confirm-dialog.js @@ -3,12 +3,12 @@ * Copyright (c) 2018 - 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; import '@vaadin/button/src/vaadin-button.js'; import '@vaadin/dialog/src/vaadin-dialog.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** * `` is a Web Component for showing alerts and asking for user confirmation. diff --git a/packages/context-menu/src/vaadin-context-menu-overlay.js b/packages/context-menu/src/vaadin-context-menu-overlay.js index 537208f7f3..f568e36b19 100644 --- a/packages/context-menu/src/vaadin-context-menu-overlay.js +++ b/packages/context-menu/src/vaadin-context-menu-overlay.js @@ -3,9 +3,9 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js'; import { PositionMixin } from '@vaadin/vaadin-overlay/src/vaadin-overlay-position-mixin.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-context-menu-overlay', diff --git a/packages/context-menu/src/vaadin-context-menu.js b/packages/context-menu/src/vaadin-context-menu.js index 1ffcc69640..28244fc86b 100644 --- a/packages/context-menu/src/vaadin-context-menu.js +++ b/packages/context-menu/src/vaadin-context-menu.js @@ -3,16 +3,16 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { gestures, addListener, removeListener } from '@polymer/polymer/lib/utils/gestures.js'; +import './vaadin-contextmenu-event.js'; +import './vaadin-device-detector.js'; +import './vaadin-context-menu-overlay.js'; import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; +import { addListener, gestures, removeListener } from '@polymer/polymer/lib/utils/gestures.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { processTemplates } from '@vaadin/component-base/src/templates.js'; import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js'; import { ItemsMixin } from './vaadin-contextmenu-items-mixin.js'; -import './vaadin-contextmenu-event.js'; -import './vaadin-device-detector.js'; -import './vaadin-context-menu-overlay.js'; /** * `` is a Web Component for creating context menus. diff --git a/packages/context-menu/src/vaadin-contextmenu-event.js b/packages/context-menu/src/vaadin-contextmenu-event.js index ca1ff9f06c..435d5c8e40 100644 --- a/packages/context-menu/src/vaadin-contextmenu-event.js +++ b/packages/context-menu/src/vaadin-contextmenu-event.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { register, prevent } from '@polymer/polymer/lib/utils/gestures.js'; +import { prevent, register } from '@polymer/polymer/lib/utils/gestures.js'; register({ name: 'vaadin-contextmenu', diff --git a/packages/context-menu/src/vaadin-device-detector.js b/packages/context-menu/src/vaadin-device-detector.js index caef890310..e90765faf5 100644 --- a/packages/context-menu/src/vaadin-device-detector.js +++ b/packages/context-menu/src/vaadin-device-detector.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import '@polymer/iron-media-query/iron-media-query.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; /** * Element for internal use only. diff --git a/packages/cookie-consent/src/vaadin-cookie-consent.js b/packages/cookie-consent/src/vaadin-cookie-consent.js index 5035d1554f..515b105d18 100644 --- a/packages/cookie-consent/src/vaadin-cookie-consent.js +++ b/packages/cookie-consent/src/vaadin-cookie-consent.js @@ -3,10 +3,10 @@ * Copyright (c) 2018 - 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; import 'cookieconsent/build/cookieconsent.min.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; /** * `` is used to show a cookie consent banner the first diff --git a/packages/crud/src/vaadin-crud-edit-column.js b/packages/crud/src/vaadin-crud-edit-column.js index cbbcea819b..3db8e582a7 100644 --- a/packages/crud/src/vaadin-crud-edit-column.js +++ b/packages/crud/src/vaadin-crud-edit-column.js @@ -3,8 +3,8 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd. * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js'; import './vaadin-crud-edit.js'; +import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/crud/src/vaadin-crud-edit.js b/packages/crud/src/vaadin-crud-edit.js index 6300f68450..4bd4bccb8e 100644 --- a/packages/crud/src/vaadin-crud-edit.js +++ b/packages/crud/src/vaadin-crud-edit.js @@ -3,7 +3,7 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd. * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** diff --git a/packages/crud/src/vaadin-crud-form.js b/packages/crud/src/vaadin-crud-form.js index 39bd11ef70..1dde35d387 100644 --- a/packages/crud/src/vaadin-crud-form.js +++ b/packages/crud/src/vaadin-crud-form.js @@ -3,8 +3,8 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd. * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { FormLayout } from '@vaadin/form-layout/src/vaadin-form-layout.js'; import '@vaadin/text-field/src/vaadin-text-field.js'; +import { FormLayout } from '@vaadin/form-layout/src/vaadin-form-layout.js'; import { IncludedMixin } from './vaadin-crud-include-mixin.js'; /** diff --git a/packages/crud/src/vaadin-crud-grid.js b/packages/crud/src/vaadin-crud-grid.js index 83f27545f9..e352c29fb0 100644 --- a/packages/crud/src/vaadin-crud-grid.js +++ b/packages/crud/src/vaadin-crud-grid.js @@ -3,13 +3,13 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd. * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { Grid } from '@vaadin/grid/src/vaadin-grid.js'; import '@vaadin/grid/src/vaadin-grid-column.js'; import '@vaadin/grid/src/vaadin-grid-column-group.js'; import '@vaadin/grid/src/vaadin-grid-sorter.js'; import '@vaadin/grid/src/vaadin-grid-filter.js'; -import { IncludedMixin } from './vaadin-crud-include-mixin.js'; import './vaadin-crud-edit-column.js'; +import { Grid } from '@vaadin/grid/src/vaadin-grid.js'; +import { IncludedMixin } from './vaadin-crud-include-mixin.js'; /** * An element used internally by ``. Not intended to be used separately. diff --git a/packages/crud/src/vaadin-crud.d.ts b/packages/crud/src/vaadin-crud.d.ts index 7deb1bede7..a6a2bd9109 100644 --- a/packages/crud/src/vaadin-crud.d.ts +++ b/packages/crud/src/vaadin-crud.d.ts @@ -4,8 +4,8 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { GridFilterDefinition, GridSorterDefinition } from '@vaadin/grid/src/vaadin-grid.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; export type CrudDataProviderCallback = (items: Array, size?: number) => void; diff --git a/packages/crud/src/vaadin-crud.js b/packages/crud/src/vaadin-crud.js index 75292812e9..78ea20a16f 100644 --- a/packages/crud/src/vaadin-crud.js +++ b/packages/crud/src/vaadin-crud.js @@ -3,12 +3,7 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd. * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; import '@polymer/iron-media-query/iron-media-query.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import '@vaadin/button/src/vaadin-button.js'; import '@vaadin/dialog/src/vaadin-dialog.js'; import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js'; @@ -16,6 +11,11 @@ import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; import './vaadin-dialog-layout.js'; import './vaadin-crud-grid.js'; import './vaadin-crud-form.js'; +import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; const HOST_PROPS = { save: [{ attr: 'disabled', prop: '__isDirty', parseProp: '__isSaveBtnDisabled' }, { prop: 'i18n.saveItem' }], diff --git a/packages/crud/src/vaadin-dialog-layout.js b/packages/crud/src/vaadin-dialog-layout.js index eaec09b4e0..b316b1d4cd 100644 --- a/packages/crud/src/vaadin-dialog-layout.js +++ b/packages/crud/src/vaadin-dialog-layout.js @@ -3,10 +3,10 @@ * Copyright (c) 2017 - 2021 Vaadin Ltd. * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import '@vaadin/dialog/src/vaadin-dialog.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import '@vaadin/dialog/src/vaadin-dialog.js'; /** * An element used internally by ``. Not intended to be used separately. diff --git a/packages/custom-field/src/vaadin-custom-field.js b/packages/custom-field/src/vaadin-custom-field.js index 75dc975615..68757187dd 100644 --- a/packages/custom-field/src/vaadin-custom-field.js +++ b/packages/custom-field/src/vaadin-custom-field.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; diff --git a/packages/date-picker/src/vaadin-date-picker-light.js b/packages/date-picker/src/vaadin-date-picker-light.js index f4f595c7e3..53d01c5b4b 100644 --- a/packages/date-picker/src/vaadin-date-picker-light.js +++ b/packages/date-picker/src/vaadin-date-picker-light.js @@ -3,12 +3,12 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { dashToCamelCase } from '@polymer/polymer/lib/utils/case-map.js'; import '@polymer/iron-media-query/iron-media-query.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import './vaadin-date-picker-overlay.js'; import './vaadin-date-picker-overlay-content.js'; +import { dashToCamelCase } from '@polymer/polymer/lib/utils/case-map.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { DatePickerMixin } from './vaadin-date-picker-mixin.js'; /** diff --git a/packages/date-picker/src/vaadin-date-picker-overlay-content.js b/packages/date-picker/src/vaadin-date-picker-overlay-content.js index 22bb7f3eba..0811bd41c6 100644 --- a/packages/date-picker/src/vaadin-date-picker-overlay-content.js +++ b/packages/date-picker/src/vaadin-date-picker-overlay-content.js @@ -3,20 +3,20 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; -import { addListener, setTouchAction } from '@polymer/polymer/lib/utils/gestures.js'; -import { IronA11yKeysBehavior } from '@polymer/iron-a11y-keys-behavior/iron-a11y-keys-behavior.js'; -import { IronA11yAnnouncer } from '@polymer/iron-a11y-announcer/iron-a11y-announcer.js'; import '@polymer/iron-media-query/iron-media-query.js'; import '@vaadin/button/src/vaadin-button.js'; +import './vaadin-month-calendar.js'; +import './vaadin-infinite-scroller.js'; +import { IronA11yAnnouncer } from '@polymer/iron-a11y-announcer/iron-a11y-announcer.js'; +import { IronA11yKeysBehavior } from '@polymer/iron-a11y-keys-behavior/iron-a11y-keys-behavior.js'; +import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; +import { addListener, setTouchAction } from '@polymer/polymer/lib/utils/gestures.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import './vaadin-month-calendar.js'; -import './vaadin-infinite-scroller.js'; -import { dateEquals, getClosestDate, getISOWeekNumber, extractDateParts } from './vaadin-date-picker-helper.js'; +import { dateEquals, extractDateParts, getClosestDate, getISOWeekNumber } from './vaadin-date-picker-helper.js'; /** * @extends HTMLElement diff --git a/packages/date-picker/src/vaadin-date-picker.js b/packages/date-picker/src/vaadin-date-picker.js index 0bf7ef0164..1ae972c52b 100644 --- a/packages/date-picker/src/vaadin-date-picker.js +++ b/packages/date-picker/src/vaadin-date-picker.js @@ -3,21 +3,21 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; import '@polymer/iron-media-query/iron-media-query.js'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import './vaadin-date-picker-overlay.js'; +import './vaadin-date-picker-overlay-content.js'; +import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; -import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js'; +import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { DatePickerMixin } from './vaadin-date-picker-mixin.js'; import { datePickerStyles } from './vaadin-date-picker-styles.js'; -import './vaadin-date-picker-overlay.js'; -import './vaadin-date-picker-overlay-content.js'; registerStyles('vaadin-date-picker', [inputFieldShared, datePickerStyles], { moduleId: 'vaadin-date-picker-styles' }); diff --git a/packages/date-picker/src/vaadin-infinite-scroller.js b/packages/date-picker/src/vaadin-infinite-scroller.js index b62c064453..895dc3c25e 100644 --- a/packages/date-picker/src/vaadin-infinite-scroller.js +++ b/packages/date-picker/src/vaadin-infinite-scroller.js @@ -3,9 +3,9 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { templatize } from '@polymer/polymer/lib/utils/templatize.js'; import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { templatize } from '@polymer/polymer/lib/utils/templatize.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; import { Debouncer } from '@vaadin/component-base/src/debounce.js'; diff --git a/packages/date-picker/src/vaadin-month-calendar.js b/packages/date-picker/src/vaadin-month-calendar.js index ff03c6ba70..71679126bb 100644 --- a/packages/date-picker/src/vaadin-month-calendar.js +++ b/packages/date-picker/src/vaadin-month-calendar.js @@ -3,9 +3,9 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import '@polymer/polymer/lib/elements/dom-repeat.js'; import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { dateAllowed, dateEquals, getISOWeekNumber } from './vaadin-date-picker-helper.js'; diff --git a/packages/date-time-picker/src/vaadin-date-time-picker.d.ts b/packages/date-time-picker/src/vaadin-date-time-picker.d.ts index 6583ce0bca..6add7c83df 100644 --- a/packages/date-time-picker/src/vaadin-date-time-picker.d.ts +++ b/packages/date-time-picker/src/vaadin-date-time-picker.d.ts @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js'; -import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { DatePickerI18n } from '@vaadin/date-picker/src/vaadin-date-picker.js'; +import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { TimePickerI18n } from '@vaadin/time-picker/src/vaadin-time-picker.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/date-time-picker/src/vaadin-date-time-picker.js b/packages/date-time-picker/src/vaadin-date-time-picker.js index 05536923a9..7dc73ef789 100644 --- a/packages/date-time-picker/src/vaadin-date-time-picker.js +++ b/packages/date-time-picker/src/vaadin-date-time-picker.js @@ -3,17 +3,17 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import './vaadin-date-time-picker-date-picker.js'; +import './vaadin-date-time-picker-time-picker.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js'; +import { dateEquals } from '@vaadin/date-picker/src/vaadin-date-picker-helper.js'; import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import { dateEquals } from '@vaadin/date-picker/src/vaadin-date-picker-helper.js'; -import './vaadin-date-time-picker-date-picker.js'; -import './vaadin-date-time-picker-time-picker.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; registerStyles('vaadin-date-time-picker', inputFieldShared, { moduleId: 'vaadin-date-time-picker' }); diff --git a/packages/details/src/vaadin-details.js b/packages/details/src/vaadin-details.js index 0bc851c6cc..3c207637e1 100644 --- a/packages/details/src/vaadin-details.js +++ b/packages/details/src/vaadin-details.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ShadowFocusMixin } from '@vaadin/field-base/src/shadow-focus-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/dialog/src/vaadin-dialog-draggable-mixin.js b/packages/dialog/src/vaadin-dialog-draggable-mixin.js index e81e587c27..46add0326b 100644 --- a/packages/dialog/src/vaadin-dialog-draggable-mixin.js +++ b/packages/dialog/src/vaadin-dialog-draggable-mixin.js @@ -1,4 +1,4 @@ -import { getMouseOrFirstTouchEvent, eventInWindow } from './vaadin-dialog-utils.js'; +import { eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js'; const TOUCH_DEVICE = (() => { try { diff --git a/packages/dialog/src/vaadin-dialog-resizable-mixin.js b/packages/dialog/src/vaadin-dialog-resizable-mixin.js index 2ca4a9a4d2..88431ba4e7 100644 --- a/packages/dialog/src/vaadin-dialog-resizable-mixin.js +++ b/packages/dialog/src/vaadin-dialog-resizable-mixin.js @@ -1,5 +1,5 @@ -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import { getMouseOrFirstTouchEvent, eventInWindow } from './vaadin-dialog-utils.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { eventInWindow, getMouseOrFirstTouchEvent } from './vaadin-dialog-utils.js'; registerStyles( 'vaadin-dialog-overlay', diff --git a/packages/dialog/src/vaadin-dialog.js b/packages/dialog/src/vaadin-dialog.js index 92c549ec34..e7ce5bb8b2 100644 --- a/packages/dialog/src/vaadin-dialog.js +++ b/packages/dialog/src/vaadin-dialog.js @@ -3,14 +3,14 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { processTemplates } from '@vaadin/component-base/src/templates.js'; import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import { ThemePropertyMixin } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import { DialogDraggableMixin } from './vaadin-dialog-draggable-mixin.js'; import { DialogResizableMixin } from './vaadin-dialog-resizable-mixin.js'; diff --git a/packages/email-field/src/vaadin-email-field.js b/packages/email-field/src/vaadin-email-field.js index da5edd7baf..cd8998f511 100644 --- a/packages/email-field/src/vaadin-email-field.js +++ b/packages/email-field/src/vaadin-email-field.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { TextField } from '@vaadin/text-field/src/vaadin-text-field.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; // See https://github.com/vaadin/vaadin-text-field/issues/466 registerStyles( diff --git a/packages/field-base/src/field-mixin.js b/packages/field-base/src/field-mixin.js index 2f37ac18ec..c918c6a4b0 100644 --- a/packages/field-base/src/field-mixin.js +++ b/packages/field-base/src/field-mixin.js @@ -4,8 +4,8 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { animationFrame } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { LabelMixin } from './label-mixin.js'; import { ValidateMixin } from './validate-mixin.js'; diff --git a/packages/field-base/src/pattern-mixin.js b/packages/field-base/src/pattern-mixin.js index 7028f8b279..aa04951944 100644 --- a/packages/field-base/src/pattern-mixin.js +++ b/packages/field-base/src/pattern-mixin.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { InputConstraintsMixin } from './input-constraints-mixin.js'; /** diff --git a/packages/form-layout/src/vaadin-form-item.js b/packages/form-layout/src/vaadin-form-item.js index 99a007cdf4..fb2b2c130c 100644 --- a/packages/form-layout/src/vaadin-form-item.js +++ b/packages/form-layout/src/vaadin-form-item.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** diff --git a/packages/form-layout/src/vaadin-form-layout.js b/packages/form-layout/src/vaadin-form-layout.js index a1751069f4..08c1b04551 100644 --- a/packages/form-layout/src/vaadin-form-layout.js +++ b/packages/form-layout/src/vaadin-form-layout.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/grid-pro/src/vaadin-grid-pro-edit-column.d.ts b/packages/grid-pro/src/vaadin-grid-pro-edit-column.d.ts index c70dbf9c8c..e0d1117905 100644 --- a/packages/grid-pro/src/vaadin-grid-pro-edit-column.d.ts +++ b/packages/grid-pro/src/vaadin-grid-pro-edit-column.d.ts @@ -4,8 +4,8 @@ * This program is available under Commercial Vaadin Developer License 4.0 (CVDLv4). * See the website for the complete license. */ +import { GridBodyRenderer, GridDefaultItem, GridItemModel } from '@vaadin/grid/src/vaadin-grid.js'; import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js'; -import { GridDefaultItem, GridBodyRenderer, GridItemModel } from '@vaadin/grid/src/vaadin-grid.js'; export type GridProEditorType = 'text' | 'checkbox' | 'select' | 'custom'; diff --git a/packages/grid-pro/src/vaadin-grid-pro-edit-column.js b/packages/grid-pro/src/vaadin-grid-pro-edit-column.js index 8c9742ac0f..e3c542bd4c 100644 --- a/packages/grid-pro/src/vaadin-grid-pro-edit-column.js +++ b/packages/grid-pro/src/vaadin-grid-pro-edit-column.js @@ -4,11 +4,11 @@ * This program is available under Commercial Vaadin Developer License 4.0 (CVDLv4). * See the website for the complete license. */ -import { get, set } from '@polymer/polymer/lib/utils/path.js'; -import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js'; import './vaadin-grid-pro-edit-checkbox.js'; import './vaadin-grid-pro-edit-select.js'; import './vaadin-grid-pro-edit-text-field.js'; +import { get, set } from '@polymer/polymer/lib/utils/path.js'; +import { GridColumn } from '@vaadin/grid/src/vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid-pro/src/vaadin-grid-pro-edit-select.js b/packages/grid-pro/src/vaadin-grid-pro-edit-select.js index 406a239353..6d0777bcbd 100644 --- a/packages/grid-pro/src/vaadin-grid-pro-edit-select.js +++ b/packages/grid-pro/src/vaadin-grid-pro-edit-select.js @@ -4,9 +4,9 @@ * This program is available under Commercial Vaadin Developer License 4.0 (CVDLv4). * See the website for the complete license. */ -import { Select } from '@vaadin/select/src/vaadin-select.js'; import '@vaadin/item/src/vaadin-item.js'; import '@vaadin/list-box/src/vaadin-list-box.js'; +import { Select } from '@vaadin/select/src/vaadin-select.js'; /** * An element used internally by ``. Not intended to be used separately. diff --git a/packages/grid-pro/src/vaadin-grid-pro.d.ts b/packages/grid-pro/src/vaadin-grid-pro.d.ts index 42898f86fc..8f8f908771 100644 --- a/packages/grid-pro/src/vaadin-grid-pro.d.ts +++ b/packages/grid-pro/src/vaadin-grid-pro.d.ts @@ -4,7 +4,7 @@ * This program is available under Commercial Vaadin Developer License 4.0 (CVDLv4). * See the website for the complete license. */ -import { GridDefaultItem, Grid, GridCustomEventMap } from '@vaadin/grid/src/vaadin-grid.js'; +import { Grid, GridCustomEventMap, GridDefaultItem } from '@vaadin/grid/src/vaadin-grid.js'; import { InlineEditingMixinClass } from './vaadin-grid-pro-inline-editing-mixin.js'; export { GridProEditorType } from './vaadin-grid-pro-edit-column.js'; diff --git a/packages/grid-pro/src/vaadin-grid-pro.js b/packages/grid-pro/src/vaadin-grid-pro.js index a435bef092..2acb7707dd 100644 --- a/packages/grid-pro/src/vaadin-grid-pro.js +++ b/packages/grid-pro/src/vaadin-grid-pro.js @@ -4,9 +4,9 @@ * This program is available under Commercial Vaadin Developer License 4.0 (CVDLv4). * See the website for the complete license. */ +import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; import { Grid } from '@vaadin/grid/src/vaadin-grid.js'; import { InlineEditingMixin } from './vaadin-grid-pro-inline-editing-mixin.js'; -import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; /** * diff --git a/packages/grid/src/vaadin-grid-column-group.d.ts b/packages/grid/src/vaadin-grid-column-group.d.ts index 734060bc6a..d79ba44228 100644 --- a/packages/grid/src/vaadin-grid-column-group.d.ts +++ b/packages/grid/src/vaadin-grid-column-group.d.ts @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { ColumnBaseMixinClass } from './vaadin-grid-column.js'; import { GridDefaultItem } from './vaadin-grid.js'; +import { ColumnBaseMixinClass } from './vaadin-grid-column.js'; /** * A `` is used to make groups of columns in `` and diff --git a/packages/grid/src/vaadin-grid-column-group.js b/packages/grid/src/vaadin-grid-column-group.js index 2bb3fca8ff..f5d4daf5a1 100644 --- a/packages/grid/src/vaadin-grid-column-group.js +++ b/packages/grid/src/vaadin-grid-column-group.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { microTask } from '@vaadin/component-base/src/async.js'; import { ColumnBaseMixin } from './vaadin-grid-column.js'; import { updateColumnOrders } from './vaadin-grid-helpers.js'; diff --git a/packages/grid/src/vaadin-grid-column.js b/packages/grid/src/vaadin-grid-column.js index 2d190990dd..0e76dd93f7 100644 --- a/packages/grid/src/vaadin-grid-column.js +++ b/packages/grid/src/vaadin-grid-column.js @@ -4,10 +4,10 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { animationFrame } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { processTemplates } from '@vaadin/component-base/src/templates.js'; -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; -import { animationFrame } from '@vaadin/component-base/src/async.js'; /** * @polymerMixin diff --git a/packages/grid/src/vaadin-grid-data-provider-mixin.js b/packages/grid/src/vaadin-grid-data-provider-mixin.js index 822a43d5a1..540b10813b 100644 --- a/packages/grid/src/vaadin-grid-data-provider-mixin.js +++ b/packages/grid/src/vaadin-grid-data-provider-mixin.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; /** * @private diff --git a/packages/grid/src/vaadin-grid-dynamic-columns-mixin.js b/packages/grid/src/vaadin-grid-dynamic-columns-mixin.js index dfcff41952..1787a63bd7 100644 --- a/packages/grid/src/vaadin-grid-dynamic-columns-mixin.js +++ b/packages/grid/src/vaadin-grid-dynamic-columns-mixin.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; +import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; /** * @polymerMixin diff --git a/packages/grid/src/vaadin-grid-filter-column.d.ts b/packages/grid/src/vaadin-grid-filter-column.d.ts index b21e5412af..e8a196d0de 100644 --- a/packages/grid/src/vaadin-grid-filter-column.d.ts +++ b/packages/grid/src/vaadin-grid-filter-column.d.ts @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import { GridDefaultItem } from './vaadin-grid.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid/src/vaadin-grid-filter-column.js b/packages/grid/src/vaadin-grid-filter-column.js index 47fb85e2c4..7a0ee60236 100644 --- a/packages/grid/src/vaadin-grid-filter-column.js +++ b/packages/grid/src/vaadin-grid-filter-column.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import './vaadin-grid-filter.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid/src/vaadin-grid-filter.js b/packages/grid/src/vaadin-grid-filter.js index 5b44590509..1125d5d056 100644 --- a/packages/grid/src/vaadin-grid-filter.js +++ b/packages/grid/src/vaadin-grid-filter.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; -import { timeOut } from '@vaadin/component-base/src/async.js'; import '@vaadin/text-field/src/vaadin-text-field.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { timeOut } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; /** * `` is a helper element for the `` that provides out-of-the-box UI controls, diff --git a/packages/grid/src/vaadin-grid-scroll-mixin.js b/packages/grid/src/vaadin-grid-scroll-mixin.js index 673974919c..97063ee29d 100644 --- a/packages/grid/src/vaadin-grid-scroll-mixin.js +++ b/packages/grid/src/vaadin-grid-scroll-mixin.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ +import { animationFrame, microTask, timeOut } from '@vaadin/component-base/src/async.js'; import { Debouncer } from '@vaadin/component-base/src/debounce.js'; -import { animationFrame, timeOut, microTask } from '@vaadin/component-base/src/async.js'; const timeouts = { SCROLLING: 500 diff --git a/packages/grid/src/vaadin-grid-selection-column.d.ts b/packages/grid/src/vaadin-grid-selection-column.d.ts index c5024e7af0..c3e5b99490 100644 --- a/packages/grid/src/vaadin-grid-selection-column.d.ts +++ b/packages/grid/src/vaadin-grid-selection-column.d.ts @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import { GridDefaultItem } from './vaadin-grid.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * Fired when the `selectAll` property changes. diff --git a/packages/grid/src/vaadin-grid-selection-column.js b/packages/grid/src/vaadin-grid-selection-column.js index eb8cdc5fe6..e80970ab3e 100644 --- a/packages/grid/src/vaadin-grid-selection-column.js +++ b/packages/grid/src/vaadin-grid-selection-column.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import '@vaadin/checkbox/src/vaadin-checkbox.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid/src/vaadin-grid-sort-column.d.ts b/packages/grid/src/vaadin-grid-sort-column.d.ts index 3521679692..6e09c7c2f4 100644 --- a/packages/grid/src/vaadin-grid-sort-column.d.ts +++ b/packages/grid/src/vaadin-grid-sort-column.d.ts @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import { GridDefaultItem } from './vaadin-grid.js'; +import { GridColumn } from './vaadin-grid-column.js'; import { GridSorterDirection } from './vaadin-grid-sorter.js'; /** diff --git a/packages/grid/src/vaadin-grid-sort-column.js b/packages/grid/src/vaadin-grid-sort-column.js index 3dc4bddeb5..b16a8e06d2 100644 --- a/packages/grid/src/vaadin-grid-sort-column.js +++ b/packages/grid/src/vaadin-grid-sort-column.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import './vaadin-grid-sorter.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid/src/vaadin-grid-sorter.js b/packages/grid/src/vaadin-grid-sorter.js index 0ef1a64669..a88e9cf79d 100644 --- a/packages/grid/src/vaadin-grid-sorter.js +++ b/packages/grid/src/vaadin-grid-sorter.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/grid/src/vaadin-grid-styles.js b/packages/grid/src/vaadin-grid-styles.js index 5213e51b3c..87b025a030 100644 --- a/packages/grid/src/vaadin-grid-styles.js +++ b/packages/grid/src/vaadin-grid-styles.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-grid', diff --git a/packages/grid/src/vaadin-grid-styling-mixin.d.ts b/packages/grid/src/vaadin-grid-styling-mixin.d.ts index 5845881eea..2981f53b2f 100644 --- a/packages/grid/src/vaadin-grid-styling-mixin.d.ts +++ b/packages/grid/src/vaadin-grid-styling-mixin.d.ts @@ -4,8 +4,8 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { Constructor } from '@open-wc/dedupe-mixin'; -import { GridColumn } from './vaadin-grid-column.js'; import { GridItemModel } from './vaadin-grid.js'; +import { GridColumn } from './vaadin-grid-column.js'; export type GridCellClassNameGenerator = (column: GridColumn, model: GridItemModel) => string; diff --git a/packages/grid/src/vaadin-grid-tree-column.d.ts b/packages/grid/src/vaadin-grid-tree-column.d.ts index bcdd31e106..aac1f6071e 100644 --- a/packages/grid/src/vaadin-grid-tree-column.d.ts +++ b/packages/grid/src/vaadin-grid-tree-column.d.ts @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import { GridDefaultItem } from './vaadin-grid.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid/src/vaadin-grid-tree-column.js b/packages/grid/src/vaadin-grid-tree-column.js index bb5d44ee6b..0336802c22 100644 --- a/packages/grid/src/vaadin-grid-tree-column.js +++ b/packages/grid/src/vaadin-grid-tree-column.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { GridColumn } from './vaadin-grid-column.js'; import './vaadin-grid-tree-toggle.js'; +import { GridColumn } from './vaadin-grid-column.js'; /** * `` is a helper element for the `` diff --git a/packages/grid/src/vaadin-grid-tree-toggle.js b/packages/grid/src/vaadin-grid-tree-toggle.js index 11b6480097..0531c16e46 100644 --- a/packages/grid/src/vaadin-grid-tree-toggle.js +++ b/packages/grid/src/vaadin-grid-tree-toggle.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { isFocusable } from './vaadin-grid-active-item-mixin.js'; diff --git a/packages/grid/src/vaadin-grid.d.ts b/packages/grid/src/vaadin-grid.d.ts index d8b6681378..50ee0f6ecb 100644 --- a/packages/grid/src/vaadin-grid.d.ts +++ b/packages/grid/src/vaadin-grid.d.ts @@ -7,7 +7,7 @@ import { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixinClass } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { ActiveItemMixinClass } from './vaadin-grid-active-item-mixin.js'; import { ArrayDataProviderMixinClass } from './vaadin-grid-array-data-provider-mixin.js'; -import { GridColumn, GridBodyRenderer, GridHeaderFooterRenderer } from './vaadin-grid-column.js'; +import { GridBodyRenderer, GridColumn, GridHeaderFooterRenderer } from './vaadin-grid-column.js'; import { ColumnReorderingMixinClass } from './vaadin-grid-column-reordering-mixin.js'; import { DataProviderMixinClass, @@ -25,11 +25,11 @@ import { GridDropMode } from './vaadin-grid-drag-and-drop-mixin.js'; import { EventContextMixinClass, GridEventContext } from './vaadin-grid-event-context-mixin.js'; -import { RowDetailsMixinClass, GridRowDetailsRenderer } from './vaadin-grid-row-details-mixin.js'; +import { GridRowDetailsRenderer, RowDetailsMixinClass } from './vaadin-grid-row-details-mixin.js'; import { ScrollMixinClass } from './vaadin-grid-scroll-mixin.js'; import { SelectionMixinClass } from './vaadin-grid-selection-mixin.js'; import { SortMixinClass } from './vaadin-grid-sort-mixin.js'; -import { StylingMixinClass, GridCellClassNameGenerator } from './vaadin-grid-styling-mixin.js'; +import { GridCellClassNameGenerator, StylingMixinClass } from './vaadin-grid-styling-mixin.js'; export { GridBodyRenderer, diff --git a/packages/grid/src/vaadin-grid.js b/packages/grid/src/vaadin-grid.js index 3d97eff48e..a53e6d95db 100644 --- a/packages/grid/src/vaadin-grid.js +++ b/packages/grid/src/vaadin-grid.js @@ -3,8 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-grid-column.js'; +import './vaadin-grid-styles.js'; import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { processTemplates } from '@vaadin/component-base/src/templates.js'; import { Virtualizer } from '@vaadin/component-base/src/virtualizer.js'; @@ -12,21 +14,19 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix import { A11yMixin } from './vaadin-grid-a11y-mixin.js'; import { ActiveItemMixin } from './vaadin-grid-active-item-mixin.js'; import { ArrayDataProviderMixin } from './vaadin-grid-array-data-provider-mixin.js'; +import { ColumnReorderingMixin } from './vaadin-grid-column-reordering-mixin.js'; import { ColumnResizingMixin } from './vaadin-grid-column-resizing-mixin.js'; import { DataProviderMixin } from './vaadin-grid-data-provider-mixin.js'; +import { DragAndDropMixin } from './vaadin-grid-drag-and-drop-mixin.js'; import { DynamicColumnsMixin } from './vaadin-grid-dynamic-columns-mixin.js'; import { EventContextMixin } from './vaadin-grid-event-context-mixin.js'; import { FilterMixin } from './vaadin-grid-filter-mixin.js'; +import { KeyboardNavigationMixin } from './vaadin-grid-keyboard-navigation-mixin.js'; import { RowDetailsMixin } from './vaadin-grid-row-details-mixin.js'; import { ScrollMixin } from './vaadin-grid-scroll-mixin.js'; import { SelectionMixin } from './vaadin-grid-selection-mixin.js'; import { SortMixin } from './vaadin-grid-sort-mixin.js'; import { StylingMixin } from './vaadin-grid-styling-mixin.js'; -import { DragAndDropMixin } from './vaadin-grid-drag-and-drop-mixin.js'; -import { KeyboardNavigationMixin } from './vaadin-grid-keyboard-navigation-mixin.js'; -import { ColumnReorderingMixin } from './vaadin-grid-column-reordering-mixin.js'; -import './vaadin-grid-column.js'; -import './vaadin-grid-styles.js'; const TOUCH_DEVICE = (() => { try { diff --git a/packages/horizontal-layout/src/vaadin-horizontal-layout.js b/packages/horizontal-layout/src/vaadin-horizontal-layout.js index 840237be0a..03769a164a 100644 --- a/packages/horizontal-layout/src/vaadin-horizontal-layout.js +++ b/packages/horizontal-layout/src/vaadin-horizontal-layout.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/icon/src/vaadin-icon.js b/packages/icon/src/vaadin-icon.js index fce8ebfedd..c0facaddee 100644 --- a/packages/icon/src/vaadin-icon.js +++ b/packages/icon/src/vaadin-icon.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { Iconset } from './vaadin-iconset.js'; import { ensureSvgLiteral, renderSvg } from './vaadin-icon-svg.js'; +import { Iconset } from './vaadin-iconset.js'; const DEFAULT_ICONSET = 'vaadin'; diff --git a/packages/input-container/src/vaadin-input-container.js b/packages/input-container/src/vaadin-input-container.js index 8d1c14bc73..f3d3474e2c 100644 --- a/packages/input-container/src/vaadin-input-container.js +++ b/packages/input-container/src/vaadin-input-container.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer'; +import { html, PolymerElement } from '@polymer/polymer'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; export class InputContainer extends ThemableMixin(DirMixin(PolymerElement)) { static get is() { diff --git a/packages/item/src/vaadin-item.js b/packages/item/src/vaadin-item.js index 9f05aadbf3..7af43c1c5e 100644 --- a/packages/item/src/vaadin-item.js +++ b/packages/item/src/vaadin-item.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { ItemMixin } from './vaadin-item-mixin.js'; diff --git a/packages/list-box/src/vaadin-list-box.d.ts b/packages/list-box/src/vaadin-list-box.d.ts index e80cf96401..01b6480caa 100644 --- a/packages/list-box/src/vaadin-list-box.d.ts +++ b/packages/list-box/src/vaadin-list-box.d.ts @@ -4,8 +4,8 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { MultiSelectListMixin } from '@vaadin/vaadin-list-mixin/vaadin-multi-select-list-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** * Fired when the `items` property changes. diff --git a/packages/list-box/src/vaadin-list-box.js b/packages/list-box/src/vaadin-list-box.js index 6c6ab19d6f..4d304910e2 100644 --- a/packages/list-box/src/vaadin-list-box.js +++ b/packages/list-box/src/vaadin-list-box.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { MultiSelectListMixin } from '@vaadin/vaadin-list-mixin/vaadin-multi-select-list-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** * `` is a Web Component for creating menus. diff --git a/packages/login/src/vaadin-login-form-wrapper.js b/packages/login/src/vaadin-login-form-wrapper.js index c2d5715780..b3f6d5d219 100644 --- a/packages/login/src/vaadin-login-form-wrapper.js +++ b/packages/login/src/vaadin-login-form-wrapper.js @@ -4,10 +4,10 @@ * Copyright (C) 2020 Vaadin Ltd * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import '@vaadin/button/src/vaadin-button.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import '@vaadin/button/src/vaadin-button.js'; import { LoginMixin } from './vaadin-login-mixin.js'; /** diff --git a/packages/login/src/vaadin-login-form.js b/packages/login/src/vaadin-login-form.js index 3c89987a7c..d8e04c546b 100644 --- a/packages/login/src/vaadin-login-form.js +++ b/packages/login/src/vaadin-login-form.js @@ -4,12 +4,12 @@ * Copyright (C) 2020 Vaadin Ltd * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import '@vaadin/text-field/src/vaadin-text-field.js'; import '@vaadin/password-field/src/vaadin-password-field.js'; import './vaadin-login-form-wrapper.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { LoginMixin } from './vaadin-login-mixin.js'; /** diff --git a/packages/login/src/vaadin-login-overlay.js b/packages/login/src/vaadin-login-overlay.js index 0703a6a1a0..a9221b99d0 100644 --- a/packages/login/src/vaadin-login-overlay.js +++ b/packages/login/src/vaadin-login-overlay.js @@ -4,12 +4,12 @@ * Copyright (C) 2020 Vaadin Ltd * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-login-form.js'; +import './vaadin-login-overlay-wrapper.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { LoginMixin } from './vaadin-login-mixin.js'; -import './vaadin-login-form.js'; -import './vaadin-login-overlay-wrapper.js'; /** * `` is a wrapper of the `` which opens a login form in an overlay and diff --git a/packages/menu-bar/src/vaadin-menu-bar-button.js b/packages/menu-bar/src/vaadin-menu-bar-button.js index 3847fc11e6..975c59848d 100644 --- a/packages/menu-bar/src/vaadin-menu-bar-button.js +++ b/packages/menu-bar/src/vaadin-menu-bar-button.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { Button } from '@vaadin/button/src/vaadin-button.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-menu-bar-button', diff --git a/packages/menu-bar/src/vaadin-menu-bar.js b/packages/menu-bar/src/vaadin-menu-bar.js index 43575c7588..cfca97cb73 100644 --- a/packages/menu-bar/src/vaadin-menu-bar.js +++ b/packages/menu-bar/src/vaadin-menu-bar.js @@ -3,13 +3,13 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-menu-bar-submenu.js'; +import './vaadin-menu-bar-button.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { ButtonsMixin } from './vaadin-menu-bar-buttons-mixin.js'; import { InteractionsMixin } from './vaadin-menu-bar-interactions-mixin.js'; -import './vaadin-menu-bar-submenu.js'; -import './vaadin-menu-bar-button.js'; /** * `` is a Web Component providing a set of horizontally stacked buttons offering diff --git a/packages/message-input/src/vaadin-message-input-button.js b/packages/message-input/src/vaadin-message-input-button.js index fce94811a3..b9aba43716 100644 --- a/packages/message-input/src/vaadin-message-input-button.js +++ b/packages/message-input/src/vaadin-message-input-button.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { Button } from '@vaadin/button/src/vaadin-button.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-message-input-button', diff --git a/packages/message-input/src/vaadin-message-input-text-area.js b/packages/message-input/src/vaadin-message-input-text-area.js index e424b9cca2..f7f383798e 100644 --- a/packages/message-input/src/vaadin-message-input-text-area.js +++ b/packages/message-input/src/vaadin-message-input-text-area.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { TextArea } from '@vaadin/text-area/src/vaadin-text-area.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-message-input-text-area', diff --git a/packages/message-input/src/vaadin-message-input.js b/packages/message-input/src/vaadin-message-input.js index 5121cd6a7f..6fcf53c000 100644 --- a/packages/message-input/src/vaadin-message-input.js +++ b/packages/message-input/src/vaadin-message-input.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import './vaadin-message-input-text-area.js'; import './vaadin-message-input-button.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** * `` is a Web Component for sending messages. diff --git a/packages/message-list/src/vaadin-message-avatar.js b/packages/message-list/src/vaadin-message-avatar.js index 9a281bf54e..4d9a977f64 100644 --- a/packages/message-list/src/vaadin-message-avatar.js +++ b/packages/message-list/src/vaadin-message-avatar.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { Avatar } from '@vaadin/avatar/src/vaadin-avatar.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-message-avatar', diff --git a/packages/message-list/src/vaadin-message-list.js b/packages/message-list/src/vaadin-message-list.js index 3aff06191d..d56818d54f 100644 --- a/packages/message-list/src/vaadin-message-list.js +++ b/packages/message-list/src/vaadin-message-list.js @@ -3,8 +3,8 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import '@polymer/polymer/lib/elements/dom-repeat.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { microTask } from '@vaadin/component-base/src/async.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/message-list/src/vaadin-message.js b/packages/message-list/src/vaadin-message.js index 85e73c87db..50bfeaa011 100644 --- a/packages/message-list/src/vaadin-message.js +++ b/packages/message-list/src/vaadin-message.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-message-avatar.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import './vaadin-message-avatar.js'; /** * `` is a Web Component for showing a single message with an author, message and time. diff --git a/packages/notification/src/vaadin-notification.js b/packages/notification/src/vaadin-notification.js index db054411c6..45ba31a410 100644 --- a/packages/notification/src/vaadin-notification.js +++ b/packages/notification/src/vaadin-notification.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { render } from 'lit'; import { isTemplateResult } from 'lit/directive-helpers.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; diff --git a/packages/number-field/src/vaadin-number-field.js b/packages/number-field/src/vaadin-number-field.js index 415307ab5d..f437d809f3 100644 --- a/packages/number-field/src/vaadin-number-field.js +++ b/packages/number-field/src/vaadin-number-field.js @@ -3,16 +3,16 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import { html, PolymerElement } from '@polymer/polymer'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { InputFieldMixin } from '@vaadin/field-base/src/input-field-mixin.js'; import { SlotStylesMixin } from '@vaadin/field-base/src/slot-styles-mixin.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; registerStyles('vaadin-number-field', inputFieldShared, { moduleId: 'vaadin-number-field-styles' }); diff --git a/packages/polymer-legacy-adapter/src/template-renderer.js b/packages/polymer-legacy-adapter/src/template-renderer.js index ab36b4d76a..5833cd140e 100644 --- a/packages/polymer-legacy-adapter/src/template-renderer.js +++ b/packages/polymer-legacy-adapter/src/template-renderer.js @@ -1,6 +1,6 @@ import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { Templatizer } from './template-renderer-templatizer.js'; import { GridTemplatizer } from './template-renderer-grid-templatizer.js'; +import { Templatizer } from './template-renderer-templatizer.js'; function createRenderer(component, template, TemplatizerClass = Templatizer) { const templatizer = TemplatizerClass.create(component, template); diff --git a/packages/progress-bar/src/vaadin-progress-bar.js b/packages/progress-bar/src/vaadin-progress-bar.js index e251cea6bf..cf5e30d4de 100644 --- a/packages/progress-bar/src/vaadin-progress-bar.js +++ b/packages/progress-bar/src/vaadin-progress-bar.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { ProgressMixin } from './vaadin-progress-mixin.js'; diff --git a/packages/radio-group/src/vaadin-radio-button.js b/packages/radio-group/src/vaadin-radio-button.js index 848dd970d7..fca589dd37 100644 --- a/packages/radio-group/src/vaadin-radio-button.js +++ b/packages/radio-group/src/vaadin-radio-button.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ActiveMixin } from '@vaadin/component-base/src/active-mixin.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; diff --git a/packages/radio-group/src/vaadin-radio-group.d.ts b/packages/radio-group/src/vaadin-radio-group.d.ts index 7adca65021..5e3b9abfdd 100644 --- a/packages/radio-group/src/vaadin-radio-group.d.ts +++ b/packages/radio-group/src/vaadin-radio-group.d.ts @@ -5,9 +5,9 @@ */ import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js'; -import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js'; +import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** diff --git a/packages/radio-group/src/vaadin-radio-group.js b/packages/radio-group/src/vaadin-radio-group.js index d55de00429..665b393648 100644 --- a/packages/radio-group/src/vaadin-radio-group.js +++ b/packages/radio-group/src/vaadin-radio-group.js @@ -3,13 +3,13 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js'; -import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js'; import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js'; +import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { RadioButton } from './vaadin-radio-button.js'; diff --git a/packages/rich-text-editor/src/vaadin-rich-text-editor-content-styles.js b/packages/rich-text-editor/src/vaadin-rich-text-editor-content-styles.js index bc893d212a..2c5ce0c186 100644 --- a/packages/rich-text-editor/src/vaadin-rich-text-editor-content-styles.js +++ b/packages/rich-text-editor/src/vaadin-rich-text-editor-content-styles.js @@ -3,7 +3,7 @@ * Copyright (c) 2020 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; export const contentStyles = css` [part='content'] { diff --git a/packages/rich-text-editor/src/vaadin-rich-text-editor-icons.js b/packages/rich-text-editor/src/vaadin-rich-text-editor-icons.js index 90da5272f8..0226a2ed88 100644 --- a/packages/rich-text-editor/src/vaadin-rich-text-editor-icons.js +++ b/packages/rich-text-editor/src/vaadin-rich-text-editor-icons.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; const $_documentContainer = document.createElement('template'); diff --git a/packages/rich-text-editor/src/vaadin-rich-text-editor-toolbar-styles.js b/packages/rich-text-editor/src/vaadin-rich-text-editor-toolbar-styles.js index 43f9933776..d51e049f77 100644 --- a/packages/rich-text-editor/src/vaadin-rich-text-editor-toolbar-styles.js +++ b/packages/rich-text-editor/src/vaadin-rich-text-editor-toolbar-styles.js @@ -3,7 +3,7 @@ * Copyright (c) 2020 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import { iconsStyles } from './vaadin-rich-text-editor-icons.js'; export const toolbarStyles = css` diff --git a/packages/rich-text-editor/src/vaadin-rich-text-editor.js b/packages/rich-text-editor/src/vaadin-rich-text-editor.js index 53306e71f7..655eaf4637 100644 --- a/packages/rich-text-editor/src/vaadin-rich-text-editor.js +++ b/packages/rich-text-editor/src/vaadin-rich-text-editor.js @@ -3,20 +3,20 @@ * Copyright (c) 2020 Vaadin Ltd * This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0. */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { resetMouseCanceller } from '@polymer/polymer/lib/utils/gestures.js'; -import { timeOut } from '@vaadin/component-base/src/async.js'; -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import '@vaadin/button/src/vaadin-button.js'; import '@vaadin/confirm-dialog/src/vaadin-confirm-dialog.js'; import '@vaadin/text-field/src/vaadin-text-field.js'; import '@vaadin/vaadin-license-checker/vaadin-license-checker.js'; import '../vendor/vaadin-quill.js'; -import { richTextEditorStyles } from './vaadin-rich-text-editor-styles.js'; import './vaadin-rich-text-editor-toolbar-styles.js'; +import { resetMouseCanceller } from '@polymer/polymer/lib/utils/gestures.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { timeOut } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; +import { richTextEditorStyles } from './vaadin-rich-text-editor-styles.js'; registerStyles('vaadin-rich-text-editor', richTextEditorStyles, { moduleId: 'vaadin-rich-text-editor-styles' }); diff --git a/packages/scroller/src/vaadin-scroller.js b/packages/scroller/src/vaadin-scroller.js index 14b56eb276..f9e2b49a1d 100644 --- a/packages/scroller/src/vaadin-scroller.js +++ b/packages/scroller/src/vaadin-scroller.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/select/src/vaadin-select-overlay.js b/packages/select/src/vaadin-select-overlay.js index 1238f89eb3..db86c56403 100644 --- a/packages/select/src/vaadin-select-overlay.js +++ b/packages/select/src/vaadin-select-overlay.js @@ -4,8 +4,8 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; import { PositionMixin } from '@vaadin/vaadin-overlay/src/vaadin-overlay-position-mixin.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-select-overlay', diff --git a/packages/select/src/vaadin-select-value-button.js b/packages/select/src/vaadin-select-value-button.js index 89aa643d74..8ff0c7c06a 100644 --- a/packages/select/src/vaadin-select-value-button.js +++ b/packages/select/src/vaadin-select-value-button.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { Button } from '@vaadin/button/src/vaadin-button.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-select-value-button', diff --git a/packages/select/src/vaadin-select.js b/packages/select/src/vaadin-select.js index 52b33598eb..79aecc535a 100644 --- a/packages/select/src/vaadin-select.js +++ b/packages/select/src/vaadin-select.js @@ -3,8 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; import '@polymer/iron-media-query/iron-media-query.js'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import './vaadin-select-overlay.js'; +import './vaadin-select-value-button.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js'; import { processTemplates } from '@vaadin/component-base/src/templates.js'; @@ -12,11 +15,8 @@ import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin. import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js'; import { fieldShared } from '@vaadin/field-base/src/styles/field-shared-styles.js'; import { inputFieldContainer } from '@vaadin/field-base/src/styles/input-field-container-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; -import './vaadin-select-overlay.js'; -import './vaadin-select-value-button.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; registerStyles('vaadin-select', [fieldShared, inputFieldContainer], { moduleId: 'vaadin-select-styles' }); diff --git a/packages/split-layout/src/vaadin-split-layout.js b/packages/split-layout/src/vaadin-split-layout.js index ce4781757f..54f85b02fb 100644 --- a/packages/split-layout/src/vaadin-split-layout.js +++ b/packages/split-layout/src/vaadin-split-layout.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; import { GestureEventListeners } from '@polymer/polymer/lib/mixins/gesture-event-listeners.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/tabs/src/vaadin-tab.js b/packages/tabs/src/vaadin-tab.js index a98fc6a117..afd3453545 100644 --- a/packages/tabs/src/vaadin-tab.js +++ b/packages/tabs/src/vaadin-tab.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ItemMixin } from '@vaadin/item/src/vaadin-item-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/tabs/src/vaadin-tabs.js b/packages/tabs/src/vaadin-tabs.js index caa5a31770..e3da220663 100644 --- a/packages/tabs/src/vaadin-tabs.js +++ b/packages/tabs/src/vaadin-tabs.js @@ -3,14 +3,14 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; -import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import './vaadin-tab.js'; import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js'; +import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js'; +import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ListMixin } from '@vaadin/vaadin-list-mixin/vaadin-list-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import './vaadin-tab.js'; /** * `` is a Web Component for easy switching between different views. diff --git a/packages/text-area/src/vaadin-text-area.js b/packages/text-area/src/vaadin-text-area.js index d8f6eeea36..5f64d56a8c 100644 --- a/packages/text-area/src/vaadin-text-area.js +++ b/packages/text-area/src/vaadin-text-area.js @@ -3,15 +3,15 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import { html, PolymerElement } from '@polymer/polymer'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; import { InputFieldMixin } from '@vaadin/field-base/src/input-field-mixin.js'; -import { TextAreaController } from '@vaadin/field-base/src/text-area-controller.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; +import { TextAreaController } from '@vaadin/field-base/src/text-area-controller.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; registerStyles('vaadin-text-area', inputFieldShared, { moduleId: 'vaadin-text-area-styles' }); diff --git a/packages/text-field/src/vaadin-text-field.js b/packages/text-field/src/vaadin-text-field.js index 7affa073bd..6732fd61be 100644 --- a/packages/text-field/src/vaadin-text-field.js +++ b/packages/text-field/src/vaadin-text-field.js @@ -3,16 +3,16 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import { html, PolymerElement } from '@polymer/polymer'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { InputFieldMixin } from '@vaadin/field-base/src/input-field-mixin.js'; import { PatternMixin } from '@vaadin/field-base/src/pattern-mixin.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; registerStyles('vaadin-text-field', inputFieldShared, { moduleId: 'vaadin-text-field-styles' }); diff --git a/packages/time-picker/src/vaadin-time-picker-combo-box.js b/packages/time-picker/src/vaadin-time-picker-combo-box.js index e5833c5111..13b340cd6d 100644 --- a/packages/time-picker/src/vaadin-time-picker-combo-box.js +++ b/packages/time-picker/src/vaadin-time-picker-combo-box.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import './vaadin-time-picker-dropdown.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ComboBoxMixin } from '@vaadin/combo-box/src/vaadin-combo-box-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import './vaadin-time-picker-dropdown.js'; /** * An element used internally by ``. Not intended to be used separately. diff --git a/packages/time-picker/src/vaadin-time-picker-dropdown.js b/packages/time-picker/src/vaadin-time-picker-dropdown.js index 43a32ef3d1..e0bf0e25bb 100644 --- a/packages/time-picker/src/vaadin-time-picker-dropdown.js +++ b/packages/time-picker/src/vaadin-time-picker-dropdown.js @@ -3,11 +3,11 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { html } from '@polymer/polymer/lib/utils/html-tag.js'; -import { ComboBoxDropdown } from '@vaadin/combo-box/src/vaadin-combo-box-dropdown.js'; import './vaadin-time-picker-item.js'; import './vaadin-time-picker-overlay.js'; import './vaadin-time-picker-scroller.js'; +import { html } from '@polymer/polymer/lib/utils/html-tag.js'; +import { ComboBoxDropdown } from '@vaadin/combo-box/src/vaadin-combo-box-dropdown.js'; /** * An element used internally by ``. Not intended to be used separately. diff --git a/packages/time-picker/src/vaadin-time-picker-overlay.js b/packages/time-picker/src/vaadin-time-picker-overlay.js index a8375d39b9..e8207cbc67 100644 --- a/packages/time-picker/src/vaadin-time-picker-overlay.js +++ b/packages/time-picker/src/vaadin-time-picker-overlay.js @@ -4,7 +4,7 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { ComboBoxOverlay } from '@vaadin/combo-box/src/vaadin-combo-box-overlay.js'; -import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js'; +import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; registerStyles( 'vaadin-time-picker-overlay', diff --git a/packages/time-picker/src/vaadin-time-picker.js b/packages/time-picker/src/vaadin-time-picker.js index f01d1a8b99..b19b970f4c 100644 --- a/packages/time-picker/src/vaadin-time-picker.js +++ b/packages/time-picker/src/vaadin-time-picker.js @@ -3,17 +3,17 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import '@vaadin/input-container/src/vaadin-input-container.js'; +import './vaadin-time-picker-combo-box.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { AriaLabelController } from '@vaadin/field-base/src/aria-label-controller.js'; -import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js'; +import { InputController } from '@vaadin/field-base/src/input-controller.js'; import { PatternMixin } from '@vaadin/field-base/src/pattern-mixin.js'; import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; -import '@vaadin/input-container/src/vaadin-input-container.js'; -import './vaadin-time-picker-combo-box.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; registerStyles('vaadin-time-picker', inputFieldShared, { moduleId: 'vaadin-time-picker-styles' }); diff --git a/packages/upload/src/vaadin-upload-file.js b/packages/upload/src/vaadin-upload-file.js index df2abd1787..b3ecc9fbba 100644 --- a/packages/upload/src/vaadin-upload-file.js +++ b/packages/upload/src/vaadin-upload-file.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import '@vaadin/progress-bar/src/vaadin-progress-bar.js'; import './vaadin-upload-icons.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** * `` element represents a file in the file list of ``. diff --git a/packages/upload/src/vaadin-upload.js b/packages/upload/src/vaadin-upload.js index f561e37e85..e0946b8008 100644 --- a/packages/upload/src/vaadin-upload.js +++ b/packages/upload/src/vaadin-upload.js @@ -3,14 +3,14 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { resetMouseCanceller } from '@polymer/polymer/lib/utils/gestures.js'; import '@polymer/polymer/lib/elements/dom-repeat.js'; -import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; -import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import '@vaadin/button/src/vaadin-button.js'; import './vaadin-upload-icons.js'; import './vaadin-upload-file.js'; +import { resetMouseCanceller } from '@polymer/polymer/lib/utils/gestures.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; +import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; +import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; /** * `` is a Web Component for uploading multiple files with drag and drop support. diff --git a/packages/vaadin-list-mixin/vaadin-list-mixin.js b/packages/vaadin-list-mixin/vaadin-list-mixin.js index 26b96dfc4d..07043a0140 100644 --- a/packages/vaadin-list-mixin/vaadin-list-mixin.js +++ b/packages/vaadin-list-mixin/vaadin-list-mixin.js @@ -4,9 +4,9 @@ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; -import { DirHelper } from '@vaadin/component-base/src/dir-helper.js'; -import { Debouncer } from '@vaadin/component-base/src/debounce.js'; import { timeOut } from '@vaadin/component-base/src/async.js'; +import { Debouncer } from '@vaadin/component-base/src/debounce.js'; +import { DirHelper } from '@vaadin/component-base/src/dir-helper.js'; /** * A mixin for `nav` elements, facilitating navigation and selection of childNodes. diff --git a/packages/vaadin-overlay/src/vaadin-overlay.js b/packages/vaadin-overlay/src/vaadin-overlay.js index a3d1b3a513..aa5e4b70e1 100644 --- a/packages/vaadin-overlay/src/vaadin-overlay.js +++ b/packages/vaadin-overlay/src/vaadin-overlay.js @@ -3,10 +3,10 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; -import { templatize } from '@polymer/polymer/lib/utils/templatize.js'; -import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js'; +import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js'; +import { templatize } from '@polymer/polymer/lib/utils/templatize.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; import { FocusablesHelper } from './vaadin-focusables-helper.js'; diff --git a/packages/vaadin-themable-mixin/vaadin-themable-mixin.js b/packages/vaadin-themable-mixin/vaadin-themable-mixin.js index fe028c3b68..4807edec2c 100644 --- a/packages/vaadin-themable-mixin/vaadin-themable-mixin.js +++ b/packages/vaadin-themable-mixin/vaadin-themable-mixin.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { CSSResult, css, unsafeCSS } from 'lit'; +import { css, CSSResult, unsafeCSS } from 'lit'; import { ThemePropertyMixin } from './vaadin-theme-property-mixin.js'; export { css, unsafeCSS }; diff --git a/packages/vertical-layout/src/vaadin-vertical-layout.js b/packages/vertical-layout/src/vaadin-vertical-layout.js index 842791f7af..fec9071403 100644 --- a/packages/vertical-layout/src/vaadin-vertical-layout.js +++ b/packages/vertical-layout/src/vaadin-vertical-layout.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; diff --git a/packages/virtual-list/src/vaadin-virtual-list.js b/packages/virtual-list/src/vaadin-virtual-list.js index 4ace0938af..0edcc8a951 100644 --- a/packages/virtual-list/src/vaadin-virtual-list.js +++ b/packages/virtual-list/src/vaadin-virtual-list.js @@ -3,7 +3,7 @@ * Copyright (c) 2021 Vaadin Ltd. * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ */ -import { PolymerElement, html } from '@polymer/polymer/polymer-element.js'; +import { html, PolymerElement } from '@polymer/polymer/polymer-element.js'; import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js'; import { processTemplates } from '@vaadin/component-base/src/templates.js'; import { Virtualizer } from '@vaadin/component-base/src/virtualizer.js'; diff --git a/yarn.lock b/yarn.lock index 7cbdd36c01..856f5ac3bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4694,6 +4694,11 @@ eslint-plugin-prettier@^4.0.0: dependencies: prettier-linter-helpers "^1.0.0" +eslint-plugin-simple-import-sort@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz#a1dad262f46d2184a90095a60c66fef74727f0f8" + integrity sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw== + eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"