Skip to content

Commit ab128b4

Browse files
authored
refactor: fix issues found by using eslint-config-vaadin (#172)
1 parent 76f7e57 commit ab128b4

30 files changed

+241
-215
lines changed

fixtures/lit/src/expansion-panel.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { LitElement, html, css, PropertyValues, TemplateResult } from 'lit';
1+
import {
2+
css,
3+
html,
4+
LitElement,
5+
type CSSResult,
6+
type PropertyValues,
7+
type TemplateResult
8+
} from 'lit';
29
import { customElement } from 'lit/decorators/custom-element.js';
310
import { property } from 'lit/decorators/property.js';
411
import { query } from 'lit/decorators/query.js';
@@ -44,7 +51,7 @@ export class ExpansionPanel extends OpenedMixin(LitElement) {
4451

4552
private _boundBodyKeyup = this._onBodyKeyup.bind(this);
4653

47-
static get styles() {
54+
static get styles(): CSSResult {
4855
return css`
4956
:host {
5057
display: block;

fixtures/lit/src/fancy-accordion.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { LitElement, html, css, PropertyValues, TemplateResult } from 'lit';
1+
import {
2+
css,
3+
html,
4+
LitElement,
5+
type CSSResult,
6+
type PropertyValues,
7+
type TemplateResult
8+
} from 'lit';
29
import { customElement } from 'lit/decorators/custom-element.js';
310
import { property } from 'lit/decorators/property.js';
411
import { ExpansionPanel } from './expansion-panel.js';
@@ -34,7 +41,7 @@ export class FancyAccordion extends LitElement {
3441

3542
private _boundOnOpened = this._onOpened.bind(this) as EventListener;
3643

37-
static get styles() {
44+
static get styles(): CSSResult {
3845
return css`
3946
:host {
4047
display: block;

fixtures/lit/src/intl-currency.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { LitElement, html, css, TemplateResult } from 'lit';
1+
import {
2+
css,
3+
html,
4+
LitElement,
5+
type CSSResult,
6+
type TemplateResult
7+
} from 'lit';
28
import { customElement } from 'lit/decorators/custom-element.js';
39
import { property } from 'lit/decorators/property.js';
410

@@ -38,7 +44,7 @@ export class IntlCurrency extends LitElement {
3844
*/
3945
@property() locale: string | null | undefined = 'en-GB';
4046

41-
static get styles() {
47+
static get styles(): CSSResult {
4248
return css`
4349
:host {
4450
all: inherit;

fixtures/lit/src/opened-mixin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LitElement } from 'lit';
1+
import type { LitElement } from 'lit';
22
import { property } from 'lit/decorators/property.js';
33

44
/* eslint-disable @typescript-eslint/no-explicit-any */

fixtures/lit/src/progress-bar.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { LitElement, html, css, PropertyValues, TemplateResult } from 'lit';
1+
import {
2+
css,
3+
html,
4+
LitElement,
5+
type CSSResult,
6+
type PropertyValues,
7+
type TemplateResult
8+
} from 'lit';
29
import { customElement } from 'lit/decorators/custom-element.js';
310
import { property } from 'lit/decorators/property.js';
411

@@ -52,7 +59,7 @@ export class ProgressBar extends LitElement {
5259
*/
5360
@property({ type: Boolean, reflect: true }) indeterminate = false;
5461

55-
static get styles() {
62+
static get styles(): CSSResult {
5663
return css`
5764
:host {
5865
display: block;

packages/api-common/src/manifest-mixin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { LitElement, html } from 'lit';
1+
import { html, type LitElement } from 'lit';
22
import { property } from 'lit/decorators/property.js';
3-
import { fetchManifest, hasCustomElements, Package } from './manifest.js';
3+
import { fetchManifest, hasCustomElements, type Package } from './manifest.js';
44

55
/* eslint-disable @typescript-eslint/no-explicit-any */
66
export type Constructor<T = unknown> = new (...args: any[]) => T;

packages/api-common/src/manifest.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type {
1515
Slot
1616
} from 'custom-elements-manifest/schema';
1717

18-
export {
18+
export type {
1919
Attribute,
2020
ClassField,
2121
ClassMember,
@@ -119,16 +119,12 @@ export const getElementData = (
119119
};
120120
};
121121

122-
export const getPublicFields = (members: ClassMember[] = []): ClassField[] => {
123-
return members.filter(
122+
export const getPublicFields = (members: ClassMember[] = []): ClassField[] =>
123+
members.filter(
124124
(x: ClassMember): x is ClassField => x.kind === 'field' && isPublic(x)
125125
);
126-
};
127126

128-
export const getPublicMethods = (
129-
members: ClassMember[] = []
130-
): ClassMethod[] => {
131-
return members.filter(
127+
export const getPublicMethods = (members: ClassMember[] = []): ClassMethod[] =>
128+
members.filter(
132129
(x: ClassMember): x is ClassMethod => x.kind === 'method' && isPublic(x)
133130
);
134-
};

packages/api-common/src/templates.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const templates: Array<HTMLTemplateElement[]> = [];
1+
const templates: HTMLTemplateElement[][] = [];
22

3-
export const setTemplates = (id: number, tpl: HTMLTemplateElement[]) => {
3+
export const setTemplates = (id: number, tpl: HTMLTemplateElement[]): void => {
44
templates[id] = tpl;
55
};
66

packages/api-common/src/utils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ export const unquote = (value?: string): string | undefined =>
33
? value.slice(1, value.length - 1)
44
: value;
55

6-
export function html(strings: TemplateStringsArray, ...values: string[]) {
6+
export function html(
7+
strings: TemplateStringsArray,
8+
...values: string[]
9+
): HTMLTemplateElement {
710
const template = document.createElement('template');
811
template.innerHTML = values.reduce(
912
(acc, v, idx) => acc + v + strings[idx + 1],

packages/api-demo/src/api-demo.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import type { CSSResultArray } from 'lit';
12
import sharedStyles from '@api-viewer/common/lib/shared-styles.js';
23
import { setTemplates } from '@api-viewer/common/lib/templates.js';
34
import { ApiDemoBase } from './base.js';
45
import demoStyles from './styles.js';
56

67
export class ApiDemo extends ApiDemoBase {
7-
static get styles() {
8+
static get styles(): CSSResultArray {
89
return [sharedStyles, demoStyles];
910
}
1011

@@ -14,7 +15,7 @@ export class ApiDemo extends ApiDemoBase {
1415

1516
public setTemplates(templates?: HTMLTemplateElement[]): void {
1617
setTemplates(
17-
this._id as number,
18+
this._id!,
1819
templates || Array.from(this.querySelectorAll('template'))
1920
);
2021
}

0 commit comments

Comments
 (0)