diff --git a/package.json b/package.json index ea2f34a99417..7f4d2194ef9a 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,10 @@ "@fullcalendar/luxon3": "6.1.9", "@fullcalendar/timegrid": "6.1.9", "@lezer/highlight": "1.1.6", - "@lit-labs/context": "0.4.1", "@lit-labs/motion": "1.0.6", "@lit-labs/observers": "2.0.1", "@lit-labs/virtualizer": "2.0.9", + "@lit/context": "1.0.1", "@lrnwebcomponents/simple-tooltip": "7.0.18", "@material/chips": "=14.0.0-canary.53b3cad2f.0", "@material/data-table": "=14.0.0-canary.53b3cad2f.0", @@ -260,6 +260,7 @@ "lit@^2.7.4 || ^3.0.0": "^2.7.4", "lit@^2 || ^3": "^2", "lit@^2.0.0 || ^3.0.0": "^2.0.0", + "@lit/reactive-element@^1.6.2 || ^2.0.0": "^1.6.2", "sortablejs@1.15.0": "patch:sortablejs@npm%3A1.15.0#./.yarn/patches/sortablejs-npm-1.15.0-f3a393abcc.patch", "leaflet-draw@1.0.4": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch" }, diff --git a/src/components/device/ha-device-automation-picker.ts b/src/components/device/ha-device-automation-picker.ts index 87257aba4fdd..ef1155abf22e 100644 --- a/src/components/device/ha-device-automation-picker.ts +++ b/src/components/device/ha-device-automation-picker.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import "@material/mwc-list/mwc-list-item"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { property, state } from "lit/decorators"; diff --git a/src/data/context.ts b/src/data/context.ts index 7fbff9fd06a6..e952f381bb46 100644 --- a/src/data/context.ts +++ b/src/data/context.ts @@ -1,4 +1,4 @@ -import { createContext } from "@lit-labs/context"; +import { createContext } from "@lit/context"; import { HassConfig } from "home-assistant-js-websocket"; import { HomeAssistant } from "../types"; import { EntityRegistryEntry } from "./entity_registry"; diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts index 2c114cd946a3..11d53ac805aa 100644 --- a/src/panels/config/automation/action/ha-automation-action-row.ts +++ b/src/panels/config/automation/action/ha-automation-action-row.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { ActionDetail } from "@material/mwc-list/mwc-list-foundation"; import "@material/mwc-list/mwc-list-item"; import { diff --git a/src/panels/config/automation/action/types/ha-automation-action-choose.ts b/src/panels/config/automation/action/types/ha-automation-action-choose.ts index 90fa1a22f6ff..6bb67e44d058 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-choose.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-choose.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import type { SortableEvent } from "sortablejs"; import { mdiDotsVertical, diff --git a/src/panels/config/automation/action/types/ha-automation-action-device_id.ts b/src/panels/config/automation/action/types/ha-automation-action-device_id.ts index f0e782d42323..27b09df6b638 100644 --- a/src/panels/config/automation/action/types/ha-automation-action-device_id.ts +++ b/src/panels/config/automation/action/types/ha-automation-action-device_id.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { css, html, LitElement } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts index 7e8bb4e270a3..2c032413aa4f 100644 --- a/src/panels/config/automation/condition/ha-automation-condition-row.ts +++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { ActionDetail } from "@material/mwc-list/mwc-list-foundation"; import "@material/mwc-list/mwc-list-item"; import { diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts index 71568fe02c10..237413f0ba37 100644 --- a/src/panels/config/automation/condition/types/ha-automation-condition-device.ts +++ b/src/panels/config/automation/condition/types/ha-automation-condition-device.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { css, html, LitElement } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; diff --git a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts index 9df81236ec5f..fa6fc3d5b149 100644 --- a/src/panels/config/automation/trigger/ha-automation-trigger-row.ts +++ b/src/panels/config/automation/trigger/ha-automation-trigger-row.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { ActionDetail } from "@material/mwc-list/mwc-list-foundation"; import "@material/mwc-list/mwc-list-item"; import { diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts index 8b3a63575220..d6b7ac7db5f0 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { css, html, LitElement } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; diff --git a/src/panels/config/devices/ha-config-device-page.ts b/src/panels/config/devices/ha-config-device-page.ts index ffaf82fcf9ac..9ec266cde651 100644 --- a/src/panels/config/devices/ha-config-device-page.ts +++ b/src/panels/config/devices/ha-config-device-page.ts @@ -20,7 +20,7 @@ import { import { customElement, property, state } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import memoizeOne from "memoize-one"; -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { SENSOR_ENTITIES } from "../../../common/const"; import { computeDomain } from "../../../common/entity/compute_domain"; diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts index 2db32736be36..38dc81b81ce3 100644 --- a/src/panels/config/ha-panel-config.ts +++ b/src/panels/config/ha-panel-config.ts @@ -1,4 +1,4 @@ -import { ContextProvider } from "@lit-labs/context"; +import { ContextProvider } from "@lit/context"; import { mdiAccount, mdiBackupRestore, diff --git a/src/panels/config/script/ha-config-script.ts b/src/panels/config/script/ha-config-script.ts index 45ff779f9123..4ac843f84ce8 100644 --- a/src/panels/config/script/ha-config-script.ts +++ b/src/panels/config/script/ha-config-script.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { HassEntities } from "home-assistant-js-websocket"; import { PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators"; diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts index abfc59eacfb2..9d5b33d5a676 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; import { mdiCloseBoxMultiple, diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants.ts index 2ea1fc334c6a..e13b2c978795 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import { mdiDevices, mdiMicrophone } from "@mdi/js"; import { PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators"; diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts index 9cb0b359b1bc..7085ad5cd38e 100644 --- a/src/panels/lovelace/cards/hui-button-card.ts +++ b/src/panels/lovelace/cards/hui-button-card.ts @@ -1,4 +1,4 @@ -import { consume } from "@lit-labs/context"; +import { consume } from "@lit/context"; import "@material/mwc-ripple"; import type { Ripple } from "@material/mwc-ripple"; import { RippleHandlers } from "@material/mwc-ripple/ripple-handlers"; diff --git a/src/state/context-mixin.ts b/src/state/context-mixin.ts index d3bbc3ead621..19b7821a4493 100644 --- a/src/state/context-mixin.ts +++ b/src/state/context-mixin.ts @@ -1,4 +1,4 @@ -import { ContextProvider } from "@lit-labs/context"; +import { ContextProvider } from "@lit/context"; import { areasContext, configContext, diff --git a/yarn.lock b/yarn.lock index fe0de0c90a1f..313ca73a825e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2087,16 +2087,6 @@ __metadata: languageName: node linkType: hard -"@lit-labs/context@npm:0.4.1": - version: 0.4.1 - resolution: "@lit-labs/context@npm:0.4.1" - dependencies: - "@lit/reactive-element": ^1.5.0 - lit: ^2.7.0 - checksum: 0f5bf4bd0beb4ff97c0df990997f0d56872682d8597e39f43cb5171aa3b7a53c7a0fc2e16f710282d7abe93c5d6ff6dd52b096d1682df277439cec47291b8023 - languageName: node - linkType: hard - "@lit-labs/motion@npm:1.0.6": version: 1.0.6 resolution: "@lit-labs/motion@npm:1.0.6" @@ -2115,7 +2105,7 @@ __metadata: languageName: node linkType: hard -"@lit-labs/ssr-dom-shim@npm:^1.0.0, @lit-labs/ssr-dom-shim@npm:^1.1.0, @lit-labs/ssr-dom-shim@npm:^1.1.2-pre.0": +"@lit-labs/ssr-dom-shim@npm:^1.0.0, @lit-labs/ssr-dom-shim@npm:^1.1.0, @lit-labs/ssr-dom-shim@npm:^1.1.2": version: 1.1.2 resolution: "@lit-labs/ssr-dom-shim@npm:1.1.2" checksum: 73fd787893851d4ec4aaa5c775405ed2aae4ca0891b2dd3c973b32c2f4bf70ada5481dd0224e52b786d037aa8a00052186ad1623c44551affd66f6409cca8da6 @@ -2132,7 +2122,16 @@ __metadata: languageName: node linkType: hard -"@lit/reactive-element@npm:^1.3.0, @lit/reactive-element@npm:^1.5.0, @lit/reactive-element@npm:^1.6.0": +"@lit/context@npm:1.0.1": + version: 1.0.1 + resolution: "@lit/context@npm:1.0.1" + dependencies: + "@lit/reactive-element": ^1.6.2 || ^2.0.0 + checksum: 9f6115ecdb979de9a0a0837fbe5df9e87411b2ace608da449afdcf9abdd9e154247bfedb97297d655143f98613730ca15d5840b854f23486609c0207c91ab8cf + languageName: node + linkType: hard + +"@lit/reactive-element@npm:^1.3.0, @lit/reactive-element@npm:^1.6.0, @lit/reactive-element@npm:^1.6.2": version: 1.6.3 resolution: "@lit/reactive-element@npm:1.6.3" dependencies: @@ -2142,11 +2141,11 @@ __metadata: linkType: hard "@lit/reactive-element@npm:^2.0.0": - version: 2.0.0 - resolution: "@lit/reactive-element@npm:2.0.0" + version: 2.0.1 + resolution: "@lit/reactive-element@npm:2.0.1" dependencies: - "@lit-labs/ssr-dom-shim": ^1.1.2-pre.0 - checksum: afa12f1cf72e8735cb7eaa51d428610785ee796882ca52108310e75ac54bbf5690da718c8bf85d042060f98c139ff0d5efd54f677a9d3fc4d794ad2e0f7a12c5 + "@lit-labs/ssr-dom-shim": ^1.1.2 + checksum: e9cacc3743c28b7b417739ffb292288076df115d08d9e9a895e2879c7087938d50c6b8141986743535e06156efd1ca505c8cf6ef8702db99966d190df9f8e869 languageName: node linkType: hard @@ -9662,10 +9661,10 @@ __metadata: "@fullcalendar/timegrid": 6.1.9 "@koa/cors": 4.0.0 "@lezer/highlight": 1.1.6 - "@lit-labs/context": 0.4.1 "@lit-labs/motion": 1.0.6 "@lit-labs/observers": 2.0.1 "@lit-labs/virtualizer": 2.0.9 + "@lit/context": 1.0.1 "@lokalise/node-api": 12.0.0 "@lrnwebcomponents/simple-tooltip": 7.0.18 "@material/chips": =14.0.0-canary.53b3cad2f.0 @@ -11474,7 +11473,7 @@ __metadata: languageName: node linkType: hard -"lit@npm:2.8.0, lit@npm:^2, lit@npm:^2.0.0, lit@npm:^2.0.0-rc.2, lit@npm:^2.2.1, lit@npm:^2.7.0, lit@npm:^2.7.4, lit@npm:^2.8.0": +"lit@npm:2.8.0, lit@npm:^2, lit@npm:^2.0.0, lit@npm:^2.0.0-rc.2, lit@npm:^2.2.1, lit@npm:^2.7.4, lit@npm:^2.8.0": version: 2.8.0 resolution: "lit@npm:2.8.0" dependencies: