Skip to content

Commit bfc3fa0

Browse files
authored
refactor: sort import statements in src files (#2915)
1 parent ab6f1cd commit bfc3fa0

130 files changed

Lines changed: 317 additions & 264 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,34 @@
1010
},
1111
"plugins": [
1212
"prettier",
13-
"@typescript-eslint"
13+
"@typescript-eslint",
14+
"simple-import-sort"
1415
],
1516
"extends": [
1617
"eslint:recommended",
1718
"plugin:prettier/recommended",
1819
"plugin:@typescript-eslint/recommended"
1920
],
2021
"rules": {
22+
"simple-import-sort/imports": [
23+
"error",
24+
{
25+
"groups": [
26+
[
27+
// Side-effects group
28+
"^\\u0000",
29+
// External group
30+
"^",
31+
// Vaadin group
32+
"^@vaadin",
33+
// Parent group
34+
"^\\.\\.",
35+
// Sibling group
36+
"^\\."
37+
]
38+
]
39+
}
40+
],
2141
"no-unused-vars": "off",
2242
"@typescript-eslint/no-unused-vars": ["error", {
2343
"argsIgnorePattern": "^_"
@@ -34,6 +54,32 @@
3454
"rules": {
3555
"@typescript-eslint/no-var-requires": "off"
3656
}
57+
},
58+
{
59+
"files": ["packages/**/test/**"],
60+
"rules": {
61+
"simple-import-sort/imports": [
62+
"error",
63+
{
64+
"groups": [
65+
[
66+
// Testing tools group
67+
"^(@esm-bundle|@web|@vaadin/testing-helpers|sinon)",
68+
// Side-effects group
69+
"^\\u0000",
70+
// External group
71+
"^",
72+
// Vaadin group
73+
"^@vaadin",
74+
// Parent group
75+
"^\\.\\.",
76+
// Sibling group
77+
"^\\."
78+
]
79+
]
80+
}
81+
]
82+
}
3783
}
3884
]
3985
}

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"eslint": "^8.1.0",
4646
"eslint-config-prettier": "^8.3.0",
4747
"eslint-plugin-prettier": "^4.0.0",
48+
"eslint-plugin-simple-import-sort": "7.0.0",
4849
"glob": "^7.2.0",
4950
"husky": "^7.0.4",
5051
"lerna": "^4.0.0",

‎packages/accordion/src/vaadin-accordion.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* Copyright (c) 2021 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6-
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
76
import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
7+
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
88
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
99
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1010
import { AccordionPanel } from './vaadin-accordion-panel.js';

‎packages/app-layout/src/vaadin-app-layout.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
* Copyright (c) 2021 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6-
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
7-
import { beforeNextRender, afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
8-
import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
9-
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
6+
import './safe-area-inset.js';
7+
import './detect-ios-navbar.js';
108
import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
9+
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
10+
import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
11+
import { afterNextRender, beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js';
12+
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
1113
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1214
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
13-
import './safe-area-inset.js';
14-
import './detect-ios-navbar.js';
1515

1616
/**
1717
* `<vaadin-app-layout>` is a Web Component providing a quick and easy way to get a common application layout structure done.

‎packages/avatar-group/src/vaadin-avatar-group-overlay.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
66
import { OverlayElement } from '@vaadin/vaadin-overlay/src/vaadin-overlay.js';
7-
import { registerStyles, css } from '@vaadin/vaadin-themable-mixin/register-styles.js';
7+
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js';
88

99
registerStyles(
1010
'vaadin-avatar-group-overlay',

‎packages/avatar-group/src/vaadin-avatar-group.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright (c) 2021 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6+
import { AvatarI18n } from '@vaadin/avatar/src/vaadin-avatar.js';
67
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
78
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
8-
import { AvatarI18n } from '@vaadin/avatar/src/vaadin-avatar.js';
99

1010
export { AvatarI18n };
1111

‎packages/avatar-group/src/vaadin-avatar-group.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
* Copyright (c) 2021 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6-
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
7-
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
8-
import { calculateSplices } from '@polymer/polymer/lib/utils/array-splice.js';
9-
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
6+
import '@vaadin/avatar/src/vaadin-avatar.js';
7+
import '@vaadin/item/src/vaadin-item.js';
8+
import './vaadin-avatar-group-list-box.js';
9+
import './vaadin-avatar-group-overlay.js';
1010
import { IronA11yAnnouncer } from '@polymer/iron-a11y-announcer/iron-a11y-announcer.js';
1111
import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
12+
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
13+
import { calculateSplices } from '@polymer/polymer/lib/utils/array-splice.js';
14+
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
15+
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
1216
import { timeOut } from '@vaadin/component-base/src/async.js';
1317
import { Debouncer } from '@vaadin/component-base/src/debounce.js';
1418
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1519
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
16-
import '@vaadin/avatar/src/vaadin-avatar.js';
17-
import '@vaadin/item/src/vaadin-item.js';
18-
import './vaadin-avatar-group-list-box.js';
19-
import './vaadin-avatar-group-overlay.js';
2020

2121
const MINIMUM_DISPLAYED_AVATARS = 2;
2222

‎packages/avatar/src/vaadin-avatar.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* Copyright (c) 2021 Vaadin Ltd.
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
6-
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
6+
import './vaadin-avatar-icons.js';
7+
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
78
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
89
import { FocusMixin } from '@vaadin/component-base/src/focus-mixin.js';
910
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
10-
import './vaadin-avatar-icons.js';
1111

1212
/**
1313
* `<vaadin-avatar>` is a Web Component providing avatar displaying functionality.

‎packages/board/src/vaadin-board-row.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Copyright (c) 2017 - 2021 Vaadin Ltd
44
* This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
55
*/
6-
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
7-
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
8-
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
9-
import { DomRepeat } from '@polymer/polymer/lib/elements/dom-repeat.js';
10-
import { DomIf } from '@polymer/polymer/lib/elements/dom-if.js';
116
import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
7+
import { DomIf } from '@polymer/polymer/lib/elements/dom-if.js';
8+
import { DomRepeat } from '@polymer/polymer/lib/elements/dom-repeat.js';
9+
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
10+
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
11+
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
1212
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1313

1414
const CLASSES = {

‎packages/board/src/vaadin-board.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Copyright (c) 2017 - 2021 Vaadin Ltd
44
* This program is available under Commercial Vaadin Developer License 4.0, available at https://vaadin.com/license/cvdl-4.0.
55
*/
6-
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
7-
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
8-
import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
9-
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
106
import '@vaadin/vaadin-license-checker/vaadin-license-checker.js';
117
import './vaadin-board-row.js';
8+
import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
9+
import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
10+
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
11+
import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
1212

1313
/**
1414
* `<vaadin-board>` is a web component to create flexible responsive layouts

0 commit comments

Comments
 (0)