Minify ha-style/Roboto and load asynchronously (#18226)

home-assistant · Oct 16, 2023 · 3b2f6d7 · 3b2f6d7
1 parent a08185a
commit 3b2f6d7
Show file tree

Hide file tree

Showing 16 changed files with 586 additions and 583 deletions.
diff --git a/cast/src/launcher/entrypoint.ts b/cast/src/launcher/entrypoint.ts
@@ -1,4 +1,4 @@
 import "../../../src/resources/safari-14-attachshadow-patch";
-import "../../../src/resources/ha-style";
-import "../../../src/resources/roboto";
 import "./layout/hc-connect";
+
+import("../../../src/resources/ha-style");
diff --git a/cast/src/receiver/layout/hc-main.ts b/cast/src/receiver/layout/hc-main.ts
@@ -100,7 +100,9 @@ export class HcMain extends HassElement {
 
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    import("../second-load");
+    import("./hc-lovelace");
+    import("../../../../src/resources/ha-style");
+
     window.addEventListener("location-changed", () => {
       const panelPath = `/${this._urlPath || "lovelace"}/`;
       if (location.pathname.startsWith(panelPath)) {

diff --git a/cast/src/receiver/second-load.ts b/cast/src/receiver/second-load.ts
diff --git a/demo/src/entrypoint.ts b/demo/src/entrypoint.ts
@@ -1,4 +1,4 @@
-import "../../src/resources/ha-style";
-import "../../src/resources/roboto";
 import "../../src/resources/safari-14-attachshadow-patch";
 import "./ha-demo";
+
+import("../../src/resources/ha-style");
diff --git a/gallery/src/entrypoint.js b/gallery/src/entrypoint.js
@@ -1,5 +1,5 @@
-import "../../src/resources/ha-style";
-import "../../src/resources/roboto";
 import "./ha-gallery";
 
+import("../../src/resources/ha-style");
+
 document.body.appendChild(document.createElement("ha-gallery"));
diff --git a/hassio/src/entrypoint.ts b/hassio/src/entrypoint.ts
@@ -1,15 +1,15 @@
 // Compat needs to be first import
 import "../../src/resources/compatibility";
 import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
-import "../../src/resources/roboto";
-import "../../src/resources/ha-style";
 import "../../src/resources/safari-14-attachshadow-patch";
 import "./hassio-main";
 
+import("../../src/resources/ha-style");
+
 setCancelSyntheticClickEvents(false);
 
 const styleEl = document.createElement("style");
-styleEl.innerHTML = `
+styleEl.textContent = `
 body {
   font-family: Roboto, sans-serif;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/entrypoints/app.ts b/src/entrypoints/app.ts
@@ -4,8 +4,8 @@ import {
 } from "@polymer/polymer/lib/utils/settings";
 import "@webcomponents/scoped-custom-element-registry/scoped-custom-element-registry.min";
 import "../layouts/home-assistant";
-import "../resources/ha-style";
-import "../resources/roboto";
+
+import("../resources/ha-style");
 
 setPassiveTouchGestures(true);
 setCancelSyntheticClickEvents(false);
diff --git a/src/entrypoints/authorize.ts b/src/entrypoints/authorize.ts
@@ -2,9 +2,9 @@
 import "../resources/compatibility";
 import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../auth/ha-authorize";
-import "../resources/ha-style";
-import "../resources/roboto";
 import "../resources/safari-14-attachshadow-patch";
 import "../resources/array.flat.polyfill";
 
+import("../resources/ha-style");
+
 setCancelSyntheticClickEvents(false);
diff --git a/src/entrypoints/onboarding.ts b/src/entrypoints/onboarding.ts
@@ -2,11 +2,11 @@
 import "../resources/compatibility";
 import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../onboarding/ha-onboarding";
-import "../resources/ha-style";
-import "../resources/roboto";
 import "../resources/safari-14-attachshadow-patch";
 import "../resources/array.flat.polyfill";
 
+import("../resources/ha-style");
+
 setCancelSyntheticClickEvents(false);
 
 declare global {

diff --git a/src/onboarding/particles.ts b/src/onboarding/particles.ts
@@ -1,6 +1,6 @@
 import { tsParticles } from "tsparticles-engine";
 import { loadLinksPreset } from "tsparticles-preset-links";
-import { DEFAULT_PRIMARY_COLOR } from "../resources/ha-style";
+import { DEFAULT_PRIMARY_COLOR } from "../resources/styles-data";
 
 loadLinksPreset(tsParticles).then(() => {
   tsParticles.load("particles", {

diff --git a/src/panels/config/hardware/ha-config-hardware.ts b/src/panels/config/hardware/ha-config-hardware.ts
@@ -35,7 +35,7 @@ import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-
 import { showRestartDialog } from "../../../dialogs/restart/show-dialog-restart";
 import "../../../layouts/hass-subpage";
 import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
-import { DEFAULT_PRIMARY_COLOR } from "../../../resources/ha-style";
+import { DEFAULT_PRIMARY_COLOR } from "../../../resources/styles-data";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import { hardwareBrandsUrl } from "../../../util/brands-url";

diff --git a/src/panels/profile/ha-pick-theme-row.ts b/src/panels/profile/ha-pick-theme-row.ts
@@ -19,7 +19,7 @@ import "../../components/ha-textfield";
 import {
   DEFAULT_ACCENT_COLOR,
   DEFAULT_PRIMARY_COLOR,
-} from "../../resources/ha-style";
+} from "../../resources/styles-data";
 import { HomeAssistant } from "../../types";
 import { documentationUrl } from "../../util/documentation-url";