From 32edbd7b337e01b3a86d7489bdadc5b443d37f60 Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Tue, 24 Oct 2023 08:17:25 -0400 Subject: [PATCH] Remove js-yaml resource proxy (#18369) --- hassio/src/dialogs/hardware/dialog-hassio-hardware.ts | 2 +- src/components/ha-attribute-value.ts | 11 +++-------- .../config/hardware/dialog-hardware-available.ts | 2 +- src/resources/js-yaml-dump.ts | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 src/resources/js-yaml-dump.ts diff --git a/hassio/src/dialogs/hardware/dialog-hassio-hardware.ts b/hassio/src/dialogs/hardware/dialog-hassio-hardware.ts index 81790eef27..b4904b83cc 100644 --- a/hassio/src/dialogs/hardware/dialog-hassio-hardware.ts +++ b/hassio/src/dialogs/hardware/dialog-hassio-hardware.ts @@ -1,4 +1,5 @@ import { mdiClose } from "@mdi/js"; +import { dump } from "js-yaml"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; @@ -9,7 +10,6 @@ import "../../../../src/components/ha-expansion-panel"; import "../../../../src/components/ha-icon-button"; import "../../../../src/components/search-input"; import { HassioHardwareInfo } from "../../../../src/data/hassio/hardware"; -import { dump } from "../../../../src/resources/js-yaml-dump"; import { haStyle, haStyleDialog } from "../../../../src/resources/styles"; import { HomeAssistant } from "../../../../src/types"; import { HassioHardwareDialogParams } from "./show-dialog-hassio-hardware"; diff --git a/src/components/ha-attribute-value.ts b/src/components/ha-attribute-value.ts index be4d8248bc..8ad861538a 100644 --- a/src/components/ha-attribute-value.ts +++ b/src/components/ha-attribute-value.ts @@ -2,10 +2,8 @@ import { HassEntity } from "home-assistant-js-websocket"; import { css, html, LitElement, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import { until } from "lit/directives/until"; -import { HomeAssistant } from "../types"; import { formatNumber } from "../common/number/format_number"; - -let jsYamlPromise: Promise; +import { HomeAssistant } from "../types"; @customElement("ha-attribute-value") class HaAttributeValue extends LitElement { @@ -44,7 +42,7 @@ class HaAttributeValue extends LitElement { ${attributeValue} `; - } catch (_) { + } catch { // Nothing to do here } } @@ -55,10 +53,7 @@ class HaAttributeValue extends LitElement { attributeValue.some((val) => val instanceof Object)) || (!Array.isArray(attributeValue) && attributeValue instanceof Object) ) { - if (!jsYamlPromise) { - jsYamlPromise = import("../resources/js-yaml-dump"); - } - const yaml = jsYamlPromise.then((jsYaml) => jsYaml.dump(attributeValue)); + const yaml = import("js-yaml").then(({ dump }) => dump(attributeValue)); return html`
${until(yaml, "")}
`; } diff --git a/src/panels/config/hardware/dialog-hardware-available.ts b/src/panels/config/hardware/dialog-hardware-available.ts index 817ee0db12..b11d34410b 100644 --- a/src/panels/config/hardware/dialog-hardware-available.ts +++ b/src/panels/config/hardware/dialog-hardware-available.ts @@ -1,4 +1,5 @@ import { mdiClose } from "@mdi/js"; +import { dump } from "js-yaml"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; @@ -15,7 +16,6 @@ import { } from "../../../data/hassio/hardware"; import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box"; import type { HassDialog } from "../../../dialogs/make-dialog-manager"; -import { dump } from "../../../resources/js-yaml-dump"; import { haStyle, haStyleDialog } from "../../../resources/styles"; import type { HomeAssistant } from "../../../types"; diff --git a/src/resources/js-yaml-dump.ts b/src/resources/js-yaml-dump.ts deleted file mode 100644 index dec67712ae..0000000000 --- a/src/resources/js-yaml-dump.ts +++ /dev/null @@ -1 +0,0 @@ -export { dump } from "js-yaml";