From c62ff85e738c79be04922a18494c9e9e9d51cff4 Mon Sep 17 00:00:00 2001 From: Tomasz Date: Tue, 15 Sep 2020 21:15:05 +0200 Subject: [PATCH] Fix package.json for windows (errors when runing yarn run lint and yarn run format) (#6762) --- gallery/src/ha-gallery.js | 5 +++-- package.json | 10 +++++----- src/common/style/icon_color_css.ts | 3 +-- src/components/entity/state-badge.ts | 13 +++++++++---- src/panels/lovelace/cards/hui-alarm-panel-card.ts | 4 ++-- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/gallery/src/ha-gallery.js b/gallery/src/ha-gallery.js index dfb07486d8..a464deb51f 100644 --- a/gallery/src/ha-gallery.js +++ b/gallery/src/ha-gallery.js @@ -1,16 +1,17 @@ import "@polymer/app-layout/app-header-layout/app-header-layout"; import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-toolbar/app-toolbar"; -import "../../src/components/ha-icon-button"; -import "../../src/components/ha-icon"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; import { html } from "@polymer/polymer/lib/utils/html-tag"; /* eslint-plugin-disable lit */ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../src/components/ha-card"; +import "../../src/components/ha-icon"; +import "../../src/components/ha-icon-button"; import "../../src/managers/notification-manager"; import "../../src/styles/polymer-ha-style"; +// eslint-disable-next-line import/extensions import { DEMOS } from "../build/import-demos"; const fixPath = (path) => path.substr(2, path.length - 5); diff --git a/package.json b/package.json index 1db467294c..dd550682fe 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,12 @@ "version": "1.0.0", "scripts": { "build": "script/build_frontend", - "lint:eslint": "eslint '**/src/**/*.{js,ts,html}' --ignore-path .gitignore", - "format:eslint": "eslint '**/src/**/*.{js,ts,html}' --fix --ignore-path .gitignore", - "lint:prettier": "prettier '**/src/**/*.{js,ts,json,css,md}' --check", - "format:prettier": "prettier '**/src/**/*.{js,ts,json,css,md}' --write", + "lint:eslint": "eslint \"**/src/**/*.{js,ts,html}\" --ignore-path .gitignore", + "format:eslint": "eslint \"**/src/**/*.{js,ts,html}\" --fix --ignore-path .gitignore", + "lint:prettier": "prettier \"**/src/**/*.{js,ts,json,css,md}\" --check", + "format:prettier": "prettier \"**/src/**/*.{js,ts,json,css,md}\" --write", "lint:types": "tsc", - "lint:lit": "lit-analyzer '**/src/**/*.ts' --format markdown --outFile result.md", + "lint:lit": "lit-analyzer \"**/src/**/*.ts\" --format markdown --outFile result.md", "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:types", "format": "npm run format:eslint && npm run format:prettier", "mocha": "node_modules/.bin/ts-mocha -p test-mocha/tsconfig.test.json --opts test-mocha/mocha.opts", diff --git a/src/common/style/icon_color_css.ts b/src/common/style/icon_color_css.ts index 8f55eba461..58732e7b17 100644 --- a/src/common/style/icon_color_css.ts +++ b/src/common/style/icon_color_css.ts @@ -24,8 +24,7 @@ export const iconColorCSS = css` ha-icon[data-domain="group"][data-state="home"], ha-icon[data-domain="group"][data-state="open"], ha-icon[data-domain="group"][data-state="locked"], - ha-icon[data-domain="group"][data-state="problem"] - { + ha-icon[data-domain="group"][data-state="problem"] { color: var(--paper-item-icon-active-color, #fdd835); } diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts index be8b055f14..c39fe4bf83 100644 --- a/src/components/entity/state-badge.ts +++ b/src/components/entity/state-badge.ts @@ -1,16 +1,16 @@ import type { HassEntity } from "home-assistant-js-websocket"; -import { styleMap } from "lit-html/directives/style-map"; import { css, CSSResult, html, + internalProperty, LitElement, property, - internalProperty, PropertyValues, TemplateResult, } from "lit-element"; import { ifDefined } from "lit-html/directives/if-defined"; +import { styleMap } from "lit-html/directives/style-map"; import { computeActiveState } from "../../common/entity/compute_active_state"; import { computeStateDomain } from "../../common/entity/compute_state_domain"; import { stateIcon } from "../../common/entity/state_icon"; @@ -73,10 +73,15 @@ export class StateBadge extends LitElement { if (stateObj) { // hide icon if we have entity picture if ( - ((stateObj.attributes.entity_picture_local || stateObj.attributes.entity_picture) && !this.overrideIcon) || + ((stateObj.attributes.entity_picture_local || + stateObj.attributes.entity_picture) && + !this.overrideIcon) || this.overrideImage ) { - let imageUrl = this.overrideImage || stateObj.attributes.entity_picture_local || stateObj.attributes.entity_picture; + let imageUrl = + this.overrideImage || + stateObj.attributes.entity_picture_local || + stateObj.attributes.entity_picture; if (this.hass) { imageUrl = this.hass.hassUrl(imageUrl); } diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts index 72f120415e..639c5c705d 100644 --- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts +++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts @@ -5,9 +5,9 @@ import { CSSResult, customElement, html, + internalProperty, LitElement, property, - internalProperty, PropertyValues, query, TemplateResult, @@ -191,7 +191,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard { : html` `}