Fix ES5 build and fix polyfill of Intl.Locale (#15322)

build-scripts/bundle.js

@@ -67,7 +67,7 @@ module.exports.babelOptions = ({ latestBuild }) => ({
       "@babel/preset-env",
       {
         useBuiltIns: "entry",
-        corejs: "3.15",
+        corejs: { version: "3.27", proposals: true },
         bugfixes: true,
       },
     ],

demo/src/ha-demo.ts

@@ -1,4 +1,5 @@
 // Compat needs to be first import
+import "../../src/resources/compatibility";
 import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 import { navigate } from "../../src/common/navigate";
 import {
@@ -6,7 +7,6 @@ import {
   provideHass,
 } from "../../src/fake_data/provide_hass";
 import { HomeAssistantAppEl } from "../../src/layouts/home-assistant";
-import "../../src/resources/compatibility";
 import { HomeAssistant } from "../../src/types";
 import { selectedDemoConfig } from "./configs/demo-configs";
 import { mockAuth } from "./stubs/auth";

package.json

@@ -24,7 +24,7 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@braintree/sanitize-url": "^6.0.0",
+    "@braintree/sanitize-url": "^6.0.2",
     "@codemirror/autocomplete": "^6.4.0",
     "@codemirror/commands": "^6.2.0",
     "@codemirror/language": "^6.4.0",
@@ -32,10 +32,10 @@
     "@codemirror/search": "^6.2.3",
     "@codemirror/state": "^6.2.0",
     "@codemirror/view": "^6.7.1",
-    "@formatjs/intl-datetimeformat": "^4.2.5",
+    "@formatjs/intl-datetimeformat": "^6.4.3",
     "@formatjs/intl-getcanonicallocales": "^2.0.5",
     "@formatjs/intl-locale": "^3.0.11",
-    "@formatjs/intl-numberformat": "^7.2.5",
+    "@formatjs/intl-numberformat": "^8.3.3",
     "@formatjs/intl-pluralrules": "^5.1.8",
     "@formatjs/intl-relativetimeformat": "^11.1.8",
     "@fullcalendar/common": "^5.11.4",
@@ -99,7 +99,7 @@
     "app-datepicker": "^5.1.0",
     "chart.js": "^3.3.2",
     "comlink": "^4.3.1",
-    "core-js": "^3.15.2",
+    "core-js": "^3.27.2",
     "cropperjs": "^1.5.13",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
@@ -245,8 +245,7 @@
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
-    "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
+    "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch"
-    "@webcomponents/webcomponentsjs": "^2.2.10"
   },
   "main": "src/home-assistant.js",
   "prettier": {

src/common/datetime/first_weekday.ts

@@ -1,6 +1,12 @@
 import { getWeekStartByLocale } from "weekstart";
 import { FrontendLocaleData, FirstWeekday } from "../../data/translation";
 
+import { polyfillsLoaded } from "../translations/localize";
+
+if (__BUILD__ === "latest" && polyfillsLoaded) {
+  await polyfillsLoaded;
+}
+
 export const weekdays = [
   "sunday",
   "monday",

src/common/translations/localize.ts

@@ -65,19 +65,21 @@ export interface FormatsType {
 
 const loadedPolyfillLocale = new Set();
 
+const locale = getLocalLanguage();
+
 const polyfills: Promise<any>[] = [];
 if (__BUILD__ === "latest") {
   if (shouldPolyfillLocale()) {
-    polyfills.push(import("@formatjs/intl-locale/polyfill"));
+    await import("@formatjs/intl-locale/polyfill");
   }
-  if (shouldPolyfillPluralRules()) {
+  if (shouldPolyfillPluralRules(locale)) {
     polyfills.push(import("@formatjs/intl-pluralrules/polyfill"));
     polyfills.push(import("@formatjs/intl-pluralrules/locale-data/en"));
   }
-  if (shouldPolyfillRelativeTime()) {
+  if (shouldPolyfillRelativeTime(locale)) {
     polyfills.push(import("@formatjs/intl-relativetimeformat/polyfill"));
   }
-  if (shouldPolyfillDateTime()) {
+  if (shouldPolyfillDateTime(locale)) {
     polyfills.push(import("@formatjs/intl-datetimeformat/polyfill"));
     polyfills.push(import("@formatjs/intl-datetimeformat/add-all-tz"));
   }
@@ -88,7 +90,7 @@ export const polyfillsLoaded =
     ? undefined
     : Promise.all(polyfills).then(() =>
         // Load the default language
-        loadPolyfillLocales(getLocalLanguage())
+        loadPolyfillLocales(locale)
       );
 
 /**
@@ -214,7 +216,7 @@ export const loadPolyfillLocales = async (language: string) => {
       // @ts-ignore
       Intl.DateTimeFormat.__addLocaleData(await result.json());
     }
-  } catch (_e) {
+  } catch (e) {
     // Ignore
   }
 };

src/components/ha-form/ha-form.ts

@@ -1,22 +1,33 @@
-import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  PropertyValues,
+  TemplateResult,
+} from "lit";
 import { customElement, property } from "lit/decorators";
 import { dynamicElement } from "../../common/dom/dynamic-element-directive";
 import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 import "../ha-alert";
 import "../ha-selector/ha-selector";
-import "./ha-form-boolean";
-import "./ha-form-constant";
-import "./ha-form-float";
-import "./ha-form-grid";
-import "./ha-form-expandable";
-import "./ha-form-integer";
-import "./ha-form-multi_select";
-import "./ha-form-positive_time_period_dict";
-import "./ha-form-select";
-import "./ha-form-string";
 import { HaFormDataContainer, HaFormElement, HaFormSchema } from "./types";
 
+const LOAD_ELEMENTS = {
+  boolean: () => import("./ha-form-boolean"),
+  constant: () => import("./ha-form-constant"),
+  float: () => import("./ha-form-float"),
+  grid: () => import("./ha-form-grid"),
+  expandable: () => import("./ha-form-expandable"),
+  integer: () => import("./ha-form-integer"),
+  multi_select: () => import("./ha-form-multi_select"),
+  positive_time_period_dict: () =>
+    import("./ha-form-positive_time_period_dict"),
+  select: () => import("./ha-form-select"),
+  string: () => import("./ha-form-string"),
+};
+
 const getValue = (obj, item) =>
   obj ? (!item.name ? obj : obj[item.name]) : null;
 
@@ -58,6 +69,17 @@ export class HaForm extends LitElement implements HaFormElement {
     }
   }
 
+  protected willUpdate(changedProps: PropertyValues) {
+    if (changedProps.has("schema") && this.schema) {
+      this.schema.forEach((item) => {
+        if ("selector" in item) {
+          return;
+        }
+        LOAD_ELEMENTS[item.type]?.();
+      });
+    }
+  }
+
   protected render(): TemplateResult {
     return html`
       <div class="root" part="root">

src/html/authorize.html.template

@@ -43,6 +43,9 @@
     <%= renderTemplate('_preload_roboto') %>
 
     <script crossorigin="use-credentials">
+      if (!window.globalThis) {
+        window.globalThis = window;
+      }
       // Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
       if (!isS11_12) {
         import("<%= latestPageJS %>");
@@ -50,9 +53,6 @@
         window.providersPromise = fetch("/auth/providers", {
           credentials: "same-origin",
         });
-        if (!window.globalThis) {
-          window.globalThis = window;
-        }
       }
     </script>
 

src/html/index.html.template

@@ -90,15 +90,15 @@
     <%= renderTemplate('_preload_roboto') %>
 
     <script <% if (!useWDS) { %>crossorigin="use-credentials"<% } %>>
+      if (!window.globalThis) {
+        window.globalThis = window;
+      }
       // Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
       if (!isS11_12) {
         import("<%= latestCoreJS %>");
         import("<%= latestAppJS %>");
         window.customPanelJS = "<%= latestCustomPanelJS %>";
         window.latestJS = true;
-        if (!window.globalThis) {
-          window.globalThis = window;
-        }
       }
     </script>
     <script>

src/html/onboarding.html.template

@@ -75,6 +75,9 @@
     <%= renderTemplate('_preload_roboto') %>
 
     <script crossorigin="use-credentials">
+      if (!window.globalThis) {
+        window.globalThis = window;
+      }
       // Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
       if (!isS11_12) {
         import("<%= latestPageJS %>");
@@ -82,9 +85,6 @@
         window.stepsPromise = fetch("/api/onboarding", {
           credentials: "same-origin",
         });
-        if (!window.globalThis) {
-          window.globalThis = window;
-        }
       }
     </script>
 

src/panels/lovelace/header-footer/hui-graph-header-footer.ts

@@ -131,7 +131,7 @@ export class HuiGraphHeaderFooter
 
   public connectedCallback() {
     super.connectedCallback();
-    if (this.hasUpdated) {
+    if (this.hasUpdated && this._config) {
       this._subscribeHistory();
     }
   }
@@ -142,27 +142,31 @@ export class HuiGraphHeaderFooter
   }
 
   private _subscribeHistory() {
-    if (!isComponentLoaded(this.hass!, "history") || this._subscribed) {
+    if (
+      !isComponentLoaded(this.hass!, "history") ||
+      this._subscribed ||
+      !this._config
+    ) {
       return;
     }
     this._subscribed = subscribeHistoryStatesTimeWindow(
       this.hass!,
       (combinedHistory) => {
-        if (!this._subscribed) {
+        if (!this._subscribed || !this._config) {
           // Message came in before we had a chance to unload
           return;
         }
         this._coordinates =
           coordinatesMinimalResponseCompressedState(
-            combinedHistory[this._config!.entity],
+            combinedHistory[this._config.entity],
-            this._config!.hours_to_show!,
+            this._config.hours_to_show!,
             500,
-            this._config!.detail!,
+            this._config.detail!,
-            this._config!.limits
+            this._config.limits
           ) || [];
       },
-      this._config!.hours_to_show!,
+      this._config.hours_to_show!,
-      [this._config!.entity]
+      [this._config.entity]
     ).catch((err) => {
       this._subscribed = undefined;
       this._error = err;

src/resources/compatibility.ts

@@ -20,6 +20,12 @@ import "@formatjs/intl-datetimeformat/add-all-tz";
 import "proxy-polyfill";
 import "unfetch/polyfill";
 
+import ResizeObserver from "resize-observer-polyfill";
+
+if (!window.ResizeObserver) {
+  window.ResizeObserver = ResizeObserver;
+}
+
 // Source: https://github.com/jserz/js_piece/blob/master/DOM/ParentNode/append()/append().md
 (function (arr) {
   arr.forEach((item) => {

yarn.lock

@@ -1360,7 +1360,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@braintree/sanitize-url@npm:^6.0.0":
+"@braintree/sanitize-url@npm:^6.0.2":
   version: 6.0.2
   resolution: "@braintree/sanitize-url@npm:6.0.2"
   checksum: 6a9dfd4081cc96516eeb281d1a83d3b5f1ad3d2837adf968fcc2ba18889ee833554f9c641b4083c36d3360a932e4504ddf25b0b51e9933c3742622df82cf7c9a
@@ -1472,16 +1472,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ecma402-abstract@npm:1.10.0":
-  version: 1.10.0
-  resolution: "@formatjs/ecma402-abstract@npm:1.10.0"
-  dependencies:
-    "@formatjs/intl-localematcher": 0.2.21
-    tslib: ^2.1.0
-  checksum: 3ea000ba9e9e9ca21018a782d0cd26c0ef84ce7a242b3538b17f4450ff5eeac539a0d1b41bad629499bd8c7857119da5363690958e68bb4724bb01341f68559d
-  languageName: node
-  linkType: hard
-
 "@formatjs/ecma402-abstract@npm:1.14.3":
   version: 1.14.3
   resolution: "@formatjs/ecma402-abstract@npm:1.14.3"
@@ -1522,14 +1512,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-datetimeformat@npm:^4.2.5":
+"@formatjs/intl-datetimeformat@npm:^6.4.3":
-  version: 4.2.5
+  version: 6.4.3
-  resolution: "@formatjs/intl-datetimeformat@npm:4.2.5"
+  resolution: "@formatjs/intl-datetimeformat@npm:6.4.3"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.10.0
+    "@formatjs/ecma402-abstract": 1.14.3
-    "@formatjs/intl-localematcher": 0.2.21
+    "@formatjs/intl-localematcher": 0.2.32
-    tslib: ^2.1.0
+    tslib: ^2.4.0
-  checksum: 6d796ba2dd98b49884f542ba902a0fc8b36464371c970673cfd2c9ce312df9eb0c9a41ceaf1cab23e36981e4686428ecc15feecc7f100eebc8be20e68ca36de5
+  checksum: 5c77fd9e823a9596665abf45607cfcc3aba786836aeb0a79aeb67026b7991ef4963f0b10998994fc2b487bb1c777145d5ef2938d3e8dd44d4048fe36e779f038
   languageName: node
   linkType: hard
 
@@ -1553,15 +1543,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.2.21":
-  version: 0.2.21
-  resolution: "@formatjs/intl-localematcher@npm:0.2.21"
-  dependencies:
-    tslib: ^2.1.0
-  checksum: d766eb8ce8b2628d781fdb34fd0833a0a1b28f20e70a72dfabbca27cf02bd1b994a72c357b2b3d4888bc20c33b6b7cc7e10e92847ec228a40745a2e84d8d2e24
-  languageName: node
-  linkType: hard
-
 "@formatjs/intl-localematcher@npm:0.2.32":
   version: 0.2.32
   resolution: "@formatjs/intl-localematcher@npm:0.2.32"
@@ -1571,13 +1552,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-numberformat@npm:^7.2.5":
+"@formatjs/intl-numberformat@npm:^8.3.3":
-  version: 7.2.5
+  version: 8.3.3
-  resolution: "@formatjs/intl-numberformat@npm:7.2.5"
+  resolution: "@formatjs/intl-numberformat@npm:8.3.3"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.10.0
+    "@formatjs/ecma402-abstract": 1.14.3
-    tslib: ^2.1.0
+    "@formatjs/intl-localematcher": 0.2.32
-  checksum: 1eda71418fbffbf7fc07eebbe04eca93cf84879b7d445cfc3fa130b5bf6a65b241d784fd7741b46fbb65d699aa5949fa8e613c51cb7833d7f67d8c4210ad67cc
+    tslib: ^2.4.0
+  checksum: 56fc8e25c445944f43295ee28a8f2dd059770e28e4a368b977787591157f3da357528ee8bcab5e00a54c9f850a879b1fedb92cc1934b93400a30699a3834c119
   languageName: node
   linkType: hard
 
@@ -7008,10 +6990,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js@npm:^3.15.2":
+"core-js@npm:^3.27.2":
-  version: 3.15.2
+  version: 3.27.2
-  resolution: "core-js@npm:3.15.2"
+  resolution: "core-js@npm:3.27.2"
-  checksum: f8f61569c4c3bdf50679226f5a1045551192a2f4bc3fa46a873b6fa834cff6d1634ee138a6e4bae3eea99f1b1db2d588fa693de74640447476292b41f595a4c3
+  checksum: 718debd426f55a6b97cf9b757c936be258afd6d4f7052f89d0f96c982d7013e9000b0b006df42831a0cf32adad298e34d6a19052dce9ae1c7ab87162c0c665e0
   languageName: node
   linkType: hard
 
@@ -9385,7 +9367,7 @@ fsevents@^1.2.7:
     "@babel/plugin-syntax-top-level-await": ^7.14.5
     "@babel/preset-env": ^7.20.2
     "@babel/preset-typescript": ^7.18.6
-    "@braintree/sanitize-url": ^6.0.0
+    "@braintree/sanitize-url": ^6.0.2
     "@codemirror/autocomplete": ^6.4.0
     "@codemirror/commands": ^6.2.0
     "@codemirror/language": ^6.4.0
@@ -9393,10 +9375,10 @@ fsevents@^1.2.7:
     "@codemirror/search": ^6.2.3
     "@codemirror/state": ^6.2.0
     "@codemirror/view": ^6.7.1
-    "@formatjs/intl-datetimeformat": ^4.2.5
+    "@formatjs/intl-datetimeformat": ^6.4.3
     "@formatjs/intl-getcanonicallocales": ^2.0.5
     "@formatjs/intl-locale": ^3.0.11
-    "@formatjs/intl-numberformat": ^7.2.5
+    "@formatjs/intl-numberformat": ^8.3.3
     "@formatjs/intl-pluralrules": ^5.1.8
     "@formatjs/intl-relativetimeformat": ^11.1.8
     "@fullcalendar/common": ^5.11.4
@@ -9488,7 +9470,7 @@ fsevents@^1.2.7:
     chai: ^4.3.4
     chart.js: ^3.3.2
     comlink: ^4.3.1
-    core-js: ^3.15.2
+    core-js: ^3.27.2
     cropperjs: ^1.5.13
     date-fns: ^2.29.3
     date-fns-tz: ^1.3.7