From bf55be7f7f9ea6608cab76f88c55e39c2022e49a Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 24 Apr 2020 13:29:38 +0200 Subject: [PATCH] Fix lit/no-invalid-html (#5617) --- .prettierignore | 26 ------------------- package.json | 10 +++---- src/components/ha-related-items.ts | 3 +-- .../integrations/ha-config-integrations.ts | 5 ++-- 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/.prettierignore b/.prettierignore index 324cce418c..a2c8040d64 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,36 +2,10 @@ build build-translations/* translations/* node_modules/* -npm-debug.log -.DS_Store hass_frontend/* -.reify-cache demo/hademo-icons.html - -# Python stuff -*.py[cod] -*.egg -*.egg-info - -# venv stuff -pyvenv.cfg pip-selfcheck.json -venv -.venv -lib -bin -dist # vscode .vscode/* !.vscode/extensions.json - -# Cast dev settings -src/cast/dev_const.ts - -# Secrets -.lokalise_token -yarn-error.log - -#asdf -.tool-versions diff --git a/package.json b/package.json index f1a4726a5b..f2b154657c 100644 --- a/package.json +++ b/package.json @@ -8,12 +8,12 @@ "version": "1.0.0", "scripts": { "build": "script/build_frontend", - "lint:eslint": "eslint '{**/src,src}/**/*.{js,ts,html}' --ignore-path .gitignore", - "format:eslint": "eslint '{**/src,src}/**/*.{js,ts,html}' --fix --ignore-path .gitignore", - "lint:prettier": "prettier '{**/src,src}/**/*.{js,ts,json,css,md}' --check", - "format:prettier": "prettier '{**/src,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,src}/**/*.ts'", + "lint:lit": "lit-analyzer '**/src/**/*.ts'", "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/components/ha-related-items.ts b/src/components/ha-related-items.ts index 3a4e59a3ea..3e4df6d4e5 100644 --- a/src/components/ha-related-items.ts +++ b/src/components/ha-related-items.ts @@ -1,4 +1,3 @@ -/* eslint-disable lit/no-invalid-html */ import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, @@ -96,7 +95,7 @@ export class HaRelatedItems extends SubscribeMixin(LitElement) { )}: ${this.hass.localize(`component.${entry.domain}.title`)}: diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts index 090c672f8e..d487f66efa 100644 --- a/src/panels/config/integrations/ha-config-integrations.ts +++ b/src/panels/config/integrations/ha-config-integrations.ts @@ -1,4 +1,3 @@ -/* eslint-disable lit/no-invalid-html */ import "@polymer/app-route/app-route"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { @@ -288,7 +287,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) { ${devices.length ? html` ${this.hass.localize( "ui.panel.config.integrations.config_entry.devices", "count", @@ -303,7 +302,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) { ${entities.length ? html` ${this.hass.localize( "ui.panel.config.integrations.config_entry.entities", "count",