Skip to content

Fix compilation with TypeScript 3.8, which updated custom element types. #902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 7, 2020
Merged

Fix compilation with TypeScript 3.8, which updated custom element types. #902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
515351d
Fix compilation with TypeScript 3.8, which updated custom element types.
rictic Feb 21, 2020
5c9e943
Update package lock as well.
rictic Feb 21, 2020
5f84d7d
Make the code actually work lol.
rictic Feb 21, 2020
24dd9aa
Lint clean.
rictic Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"tachometer": "^0.4.16",
"tslint": "^5.20.1",
"typedoc": "^0.14.2",
"typescript": "^3.4.1",
"typescript": "^3.8.2",
"uglify-es": "^3.3.9",
"wct-mocha": "^1.0.0",
"web-component-tester": "^6.9.2"
Expand Down
30 changes: 16 additions & 14 deletions src/test/lit-element_styling_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ suite('Static get styles', () => {

test('can extend and augment `styles`', async () => {
const base = generateElementName();
customElements.define(base, class extends LitElement {
class BaseClass extends LitElement {
static get styles() {
return css`div {
border: 2px solid blue;
Expand All @@ -660,18 +660,18 @@ suite('Static get styles', () => {
return htmlWithStyles`
<div>Testing1</div>`;
}
});

}
customElements.define(base, BaseClass);
const sub = generateElementName();
customElements.define(sub, class extends customElements.get(base) {
customElements.define(sub, class extends BaseClass {
static get styles() {
return [
super.styles,
css`span {
display: block;
border: 3px solid blue;
}`
];
] as any;
}

render() {
Expand All @@ -682,15 +682,15 @@ suite('Static get styles', () => {
});

const subsub = generateElementName();
customElements.define(subsub, class extends customElements.get(sub) {
customElements.define(subsub, class extends BaseClass {
static get styles() {
return [
super.styles,
css`p {
display: block;
border: 4px solid blue;
}`
];
] as any;
}

render() {
Expand Down Expand Up @@ -719,7 +719,7 @@ suite('Static get styles', () => {

test('can extend and override `styles`', async () => {
const base = generateElementName();
customElements.define(base, class extends LitElement {
class BaseClass extends LitElement {
static get styles() {
return css`div {
border: 2px solid blue;
Expand All @@ -730,10 +730,11 @@ suite('Static get styles', () => {
return htmlWithStyles`
<div>Testing1</div>`;
}
});
}
customElements.define(base, BaseClass);

const sub = generateElementName();
customElements.define(sub, class extends customElements.get(base) {
customElements.define(sub, class extends BaseClass {
static get styles() {
return css`div {
border: 3px solid blue;
Expand All @@ -742,7 +743,7 @@ suite('Static get styles', () => {
});

const subsub = generateElementName();
customElements.define(subsub, class extends customElements.get(sub) {
customElements.define(subsub, class extends BaseClass {
static get styles() {
return css`div {
border: 4px solid blue;
Expand All @@ -768,12 +769,13 @@ suite('Static get styles', () => {

test('elements should inherit `styles` by default', async () => {
const base = generateElementName();
customElements.define(base, class extends LitElement {
class BaseClass extends LitElement {
static styles = css`div {border: 4px solid black;}`;
});
}
customElements.define(base, BaseClass);

const sub = generateElementName();
customElements.define(sub, class extends customElements.get(base) {
customElements.define(sub, class extends BaseClass {
render() {
return htmlWithStyles`<div></div>`;
}
Expand Down