Skip to content

Commit 4abda97

Browse files
authored
Merge branch 'home-assistant:dev' into fix_persistent_sidebar_tooltips
2 parents 197e3ca + 9001cd3 commit 4abda97

File tree

128 files changed

+10397
-2871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+10397
-2871
lines changed

.yarn/releases/yarn-4.11.0.cjs renamed to .yarn/releases/yarn-4.12.0.cjs

Lines changed: 191 additions & 191 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ enableGlobalCache: false
66

77
nodeLinker: node-modules
88

9-
yarnPath: .yarn/releases/yarn-4.11.0.cjs
9+
yarnPath: .yarn/releases/yarn-4.12.0.cjs

demo/src/stubs/energy.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ export const mockEnergy = (hass: MockHomeAssistant) => {
8484
stat_consumption: "sensor.energy_boiler",
8585
},
8686
],
87+
device_consumption_water: [],
8788
})
8889
);
8990
hass.mockWS(

gallery/src/pages/automation/editor-trigger.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { HaEventTrigger } from "../../../../src/panels/config/automation/trigger
1818
import { HaGeolocationTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-geo_location";
1919
import { HaHassTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-homeassistant";
2020
import { HaTriggerList } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-list";
21-
import { HaMQTTTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-mqtt";
2221
import { HaNumericStateTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state";
2322
import { HaPersistentNotificationTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-persistent_notification";
2423
import { HaStateTrigger } from "../../../../src/panels/config/automation/trigger/types/ha-automation-trigger-state";
@@ -38,11 +37,6 @@ const SCHEMAS: { name: string; triggers: Trigger[] }[] = [
3837
triggers: [{ ...HaStateTrigger.defaultConfig }],
3938
},
4039

41-
{
42-
name: "MQTT",
43-
triggers: [{ ...HaMQTTTrigger.defaultConfig }],
44-
},
45-
4640
{
4741
name: "GeoLocation",
4842
triggers: [{ ...HaGeolocationTrigger.defaultConfig }],

package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"dependencies": {
2929
"@babel/runtime": "7.28.4",
3030
"@braintree/sanitize-url": "7.1.1",
31-
"@codemirror/autocomplete": "6.19.1",
31+
"@codemirror/autocomplete": "6.20.0",
3232
"@codemirror/commands": "6.10.0",
3333
"@codemirror/language": "6.11.3",
3434
"@codemirror/legacy-modes": "6.5.2",
3535
"@codemirror/search": "6.5.11",
3636
"@codemirror/state": "6.5.2",
37-
"@codemirror/view": "6.38.6",
37+
"@codemirror/view": "6.38.8",
3838
"@date-fns/tz": "1.4.1",
3939
"@egjs/hammerjs": "2.0.17",
4040
"@formatjs/intl-datetimeformat": "6.18.2",
@@ -52,7 +52,7 @@
5252
"@fullcalendar/list": "6.1.19",
5353
"@fullcalendar/luxon3": "6.1.19",
5454
"@fullcalendar/timegrid": "6.1.19",
55-
"@home-assistant/webawesome": "3.0.0",
55+
"@home-assistant/webawesome": "3.0.0-ha.0",
5656
"@lezer/highlight": "1.2.3",
5757
"@lit-labs/motion": "1.0.9",
5858
"@lit-labs/observers": "2.0.6",
@@ -96,10 +96,10 @@
9696
"@webcomponents/scoped-custom-element-registry": "0.0.10",
9797
"@webcomponents/webcomponentsjs": "2.8.0",
9898
"app-datepicker": "5.1.1",
99-
"barcode-detector": "3.0.6",
100-
"color-name": "2.0.2",
99+
"barcode-detector": "3.0.8",
100+
"color-name": "2.1.0",
101101
"comlink": "4.4.2",
102-
"core-js": "3.46.0",
102+
"core-js": "3.47.0",
103103
"cropperjs": "1.6.2",
104104
"culori": "4.0.2",
105105
"date-fns": "4.1.0",
@@ -111,7 +111,7 @@
111111
"fuse.js": "7.1.0",
112112
"google-timezones-json": "1.2.0",
113113
"gulp-zopfli-green": "6.0.2",
114-
"hls.js": "1.6.14",
114+
"hls.js": "1.6.15",
115115
"home-assistant-js-websocket": "9.6.0",
116116
"idb-keyval": "6.2.2",
117117
"intl-messageformat": "10.7.18",
@@ -122,7 +122,7 @@
122122
"lit": "3.3.1",
123123
"lit-html": "3.3.1",
124124
"luxon": "3.7.2",
125-
"marked": "17.0.0",
125+
"marked": "17.0.1",
126126
"memoize-one": "6.0.0",
127127
"node-vibrant": "4.0.3",
128128
"object-hash": "3.0.0",
@@ -139,12 +139,12 @@
139139
"vue": "2.7.16",
140140
"vue2-daterange-picker": "0.6.8",
141141
"weekstart": "2.0.0",
142-
"workbox-cacheable-response": "7.3.0",
143-
"workbox-core": "7.3.0",
144-
"workbox-expiration": "7.3.0",
145-
"workbox-precaching": "7.3.0",
146-
"workbox-routing": "7.3.0",
147-
"workbox-strategies": "7.3.0",
142+
"workbox-cacheable-response": "7.4.0",
143+
"workbox-core": "7.4.0",
144+
"workbox-expiration": "7.4.0",
145+
"workbox-precaching": "7.4.0",
146+
"workbox-routing": "7.4.0",
147+
"workbox-strategies": "7.4.0",
148148
"xss": "1.0.15"
149149
},
150150
"devDependencies": {
@@ -153,12 +153,12 @@
153153
"@babel/plugin-transform-runtime": "7.28.5",
154154
"@babel/preset-env": "7.28.5",
155155
"@bundle-stats/plugin-webpack-filter": "4.21.6",
156-
"@lokalise/node-api": "15.3.1",
156+
"@lokalise/node-api": "15.4.0",
157157
"@octokit/auth-oauth-device": "8.0.3",
158158
"@octokit/plugin-retry": "8.0.3",
159159
"@octokit/rest": "22.0.1",
160-
"@rsdoctor/rspack-plugin": "1.3.8",
161-
"@rspack/core": "1.6.1",
160+
"@rsdoctor/rspack-plugin": "1.3.11",
161+
"@rspack/core": "1.6.4",
162162
"@rspack/dev-server": "1.1.4",
163163
"@types/babel__plugin-transform-runtime": "7.9.5",
164164
"@types/chromecast-caf-receiver": "6.0.22",
@@ -178,7 +178,7 @@
178178
"@types/tar": "6.1.13",
179179
"@types/ua-parser-js": "0.7.39",
180180
"@types/webspeechapi": "0.0.29",
181-
"@vitest/coverage-v8": "4.0.8",
181+
"@vitest/coverage-v8": "4.0.13",
182182
"babel-loader": "10.0.0",
183183
"babel-plugin-template-html-minifier": "4.1.0",
184184
"browserslist-useragent-regexp": "4.1.3",
@@ -194,32 +194,32 @@
194194
"eslint-plugin-wc": "3.0.2",
195195
"fancy-log": "2.0.0",
196196
"fs-extra": "11.3.2",
197-
"glob": "12.0.0",
197+
"glob": "13.0.0",
198198
"gulp": "5.0.1",
199199
"gulp-brotli": "3.0.0",
200200
"gulp-json-transform": "0.5.0",
201201
"gulp-rename": "2.1.0",
202202
"html-minifier-terser": "7.2.0",
203203
"husky": "9.1.7",
204-
"jsdom": "27.1.0",
204+
"jsdom": "27.2.0",
205205
"jszip": "3.10.1",
206-
"lint-staged": "16.2.6",
206+
"lint-staged": "16.2.7",
207207
"lit-analyzer": "2.0.3",
208208
"lodash.merge": "4.6.2",
209209
"lodash.template": "4.5.0",
210210
"map-stream": "0.0.7",
211211
"pinst": "3.0.0",
212212
"prettier": "3.6.2",
213-
"rspack-manifest-plugin": "5.1.0",
213+
"rspack-manifest-plugin": "5.2.0",
214214
"serve": "14.2.5",
215215
"sinon": "21.0.0",
216216
"tar": "7.5.2",
217217
"terser-webpack-plugin": "5.3.14",
218218
"ts-lit-plugin": "2.0.2",
219219
"typescript": "5.9.3",
220-
"typescript-eslint": "8.46.3",
220+
"typescript-eslint": "8.47.0",
221221
"vite-tsconfig-paths": "5.1.4",
222-
"vitest": "4.0.8",
222+
"vitest": "4.0.13",
223223
"webpack-stats-plugin": "1.1.3",
224224
"webpackbar": "7.0.0",
225225
"workbox-build": "patch:workbox-build@npm%3A7.1.1#~/.yarn/patches/workbox-build-npm-7.1.1-a854f3faae.patch"
@@ -236,7 +236,7 @@
236236
"@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
237237
"glob@^10.2.2": "^10.5.0"
238238
},
239-
"packageManager": "yarn@4.11.0",
239+
"packageManager": "yarn@4.12.0",
240240
"volta": {
241241
"node": "22.21.1"
242242
}

public/static/images/dashboard-options/dark/icon-dashboard-areas.svg

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)