Skip to content

Commit 6884a1b

Browse files
authored
Merge branch 'dev' into devtools-template-expanded
2 parents 0faa5c2 + 8f002f2 commit 6884a1b

110 files changed

Lines changed: 4489 additions & 1369 deletions

File tree

Some content is hidden

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

cast/src/receiver/layout/hc-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class HcDemo extends HassElement {
4242
this._updateHass(hassUpdate),
4343
};
4444

45-
const hass = (this.hass = provideHass(this, initial));
45+
const hass = provideHass(this, initial, true);
4646

4747
mockHistory(hass);
4848

demo/src/ha-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class HaDemo extends HomeAssistantAppEl {
3939
this._updateHass(hassUpdate),
4040
};
4141

42-
const hass = (this.hass = provideHass(this, initial));
42+
const hass = provideHass(this, initial, true);
4343
const localizePromise =
4444
// @ts-ignore
4545
this._loadFragmentTranslations(hass.language, "page-demo").then(

demo/src/stubs/lovelace.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import type { LocalizeFunc } from "../../../src/common/translations/localize";
2+
import type { LovelaceInfo } from "../../../src/data/lovelace/resource";
23
import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
34
import {
45
selectedDemoConfig,
@@ -27,6 +28,9 @@ export const mockLovelace = (
2728
);
2829
});
2930

31+
hass.mockWS("lovelace/info", () =>
32+
Promise.resolve({ resource_mode: "storage" } as LovelaceInfo)
33+
);
3034
hass.mockWS("lovelace/config/save", () => Promise.resolve());
3135
hass.mockWS("lovelace/resources", () => Promise.resolve([]));
3236
hass.mockWS("lovelace/dashboards/list", () => Promise.resolve([]));

demo/src/stubs/sensor.ts

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,56 @@
11
import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
22

33
export const mockSensor = (hass: MockHomeAssistant) => {
4-
hass.mockWS("sensor/numeric_device_classes", () => [
5-
{
6-
numeric_device_classes: [
7-
"volume_storage",
8-
"gas",
9-
"data_size",
10-
"irradiance",
11-
"wind_speed",
12-
"volatile_organic_compounds",
13-
"volatile_organic_compounds_parts",
14-
"voltage",
15-
"frequency",
16-
"precipitation_intensity",
17-
"volume",
18-
"precipitation",
19-
"battery",
20-
"nitrogen_dioxide",
21-
"speed",
22-
"signal_strength",
23-
"pm1",
24-
"nitrous_oxide",
25-
"atmospheric_pressure",
26-
"data_rate",
27-
"temperature",
28-
"power_factor",
29-
"aqi",
30-
"current",
31-
"volume_flow_rate",
32-
"humidity",
33-
"duration",
34-
"ozone",
35-
"distance",
36-
"pressure",
37-
"pm25",
38-
"weight",
39-
"energy",
40-
"carbon_monoxide",
41-
"apparent_power",
42-
"illuminance",
43-
"energy_storage",
44-
"moisture",
45-
"power",
46-
"water",
47-
"carbon_dioxide",
48-
"ph",
49-
"reactive_power",
50-
"monetary",
51-
"nitrogen_monoxide",
52-
"pm10",
53-
"sound_pressure",
54-
"sulphur_dioxide",
55-
],
56-
},
57-
]);
4+
hass.mockWS("sensor/numeric_device_classes", () => ({
5+
numeric_device_classes: [
6+
"volume_storage",
7+
"gas",
8+
"data_size",
9+
"irradiance",
10+
"wind_speed",
11+
"volatile_organic_compounds",
12+
"volatile_organic_compounds_parts",
13+
"voltage",
14+
"frequency",
15+
"precipitation_intensity",
16+
"volume",
17+
"precipitation",
18+
"battery",
19+
"nitrogen_dioxide",
20+
"speed",
21+
"signal_strength",
22+
"pm1",
23+
"nitrous_oxide",
24+
"atmospheric_pressure",
25+
"data_rate",
26+
"temperature",
27+
"power_factor",
28+
"aqi",
29+
"current",
30+
"volume_flow_rate",
31+
"humidity",
32+
"duration",
33+
"ozone",
34+
"distance",
35+
"pressure",
36+
"pm25",
37+
"weight",
38+
"energy",
39+
"carbon_monoxide",
40+
"apparent_power",
41+
"illuminance",
42+
"energy_storage",
43+
"moisture",
44+
"power",
45+
"water",
46+
"carbon_dioxide",
47+
"ph",
48+
"reactive_power",
49+
"monetary",
50+
"nitrogen_monoxide",
51+
"pm10",
52+
"sound_pressure",
53+
"sulphur_dioxide",
54+
],
55+
}));
5856
};

gallery/src/pages/misc/entity-state.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const SENSOR_DEVICE_CLASSES = [
5252
"sulphur_dioxide",
5353
"temperature",
5454
"timestamp",
55+
"uptime",
5556
"volatile_organic_compounds",
5657
"volatile_organic_compounds_parts",
5758
"voltage",

landing-page/src/ha-landing-page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { customElement, property, state } from "lit/decorators";
44
import { extractSearchParam } from "../../src/common/url/search-params";
55
import "../../src/components/ha-alert";
66
import "../../src/components/ha-button";
7-
import "../../src/components/ha-fade-in";
7+
import "../../src/components/animation/ha-fade-in";
88
import "../../src/components/ha-spinner";
99
import "../../src/components/ha-svg-icon";
1010
import "../../src/components/progress/ha-progress-bar";

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"@codemirror/lang-jinja": "6.0.1",
3434
"@codemirror/lang-yaml": "6.1.3",
3535
"@codemirror/language": "6.12.3",
36+
"@codemirror/lint": "6.9.5",
3637
"@codemirror/search": "6.7.0",
3738
"@codemirror/state": "6.6.0",
3839
"@codemirror/view": "6.41.1",
@@ -53,7 +54,7 @@
5354
"@fullcalendar/list": "6.1.20",
5455
"@fullcalendar/luxon3": "6.1.20",
5556
"@fullcalendar/timegrid": "6.1.20",
56-
"@home-assistant/webawesome": "3.3.1-ha.1",
57+
"@home-assistant/webawesome": "3.3.1-ha.2",
5758
"@lezer/highlight": "1.2.3",
5859
"@lit-labs/motion": "1.1.0",
5960
"@lit-labs/observers": "2.1.0",
@@ -184,7 +185,7 @@
184185
"gulp-rename": "2.1.0",
185186
"html-minifier-terser": "7.2.0",
186187
"husky": "9.1.7",
187-
"jsdom": "29.0.2",
188+
"jsdom": "29.1.0",
188189
"jszip": "3.10.1",
189190
"lint-staged": "16.4.0",
190191
"lit-analyzer": "2.0.3",
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading
Lines changed: 17 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)