Merge pull request home-assistant#5481 from home-assistant/dev

20200407.0

Author: bramkragten

build-scripts/gulp/entry-html.js

@@ -222,7 +222,7 @@ gulp.task("gen-index-gallery-dev", (done) => {
   // In dev mode we don't mangle names, so we hardcode urls. That way we can
   // run webpack as last in watch mode, which blocks output.
   const content = renderGalleryTemplate("index", {
-    latestGalleryJS: "./entrypoint.js",
+    latestGalleryJS: "./frontend_latest/entrypoint.js",
   });
 
   fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), content);

build-scripts/gulp/webpack.js

@@ -150,9 +150,8 @@ gulp.task(
 
 gulp.task("webpack-dev-server-gallery", () => {
   runDevServer({
-    compiler: webpack(
-      createGalleryConfig({ latestBuild: true, isProdBuild: false })
-    ),
+    // We don't use the es5 build, but the dev server will fuck up the publicPath if we don't
+    compiler: webpack(bothBuilds(createGalleryConfig, { isProdBuild: false })),
     contentBase: paths.gallery_root,
     port: 8100,
   });

build-scripts/webpack.js

@@ -245,9 +245,6 @@ const createHassioConfig = ({ isProdBuild, latestBuild }) => {
 };
 
 const createGalleryConfig = ({ isProdBuild, latestBuild }) => {
-  if (!latestBuild) {
-    throw new Error("Gallery only supports latest build!");
-  }
   const config = createWebpackConfig({
     entry: {
       entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),

gallery/src/components/demo-card.js

@@ -57,6 +57,13 @@ class DemoCard extends PolymerElement {
     };
   }
 
+  ready() {
+    super.ready();
+    this.addEventListener("ll-rebuild", () => {
+      this._configChanged(this.config);
+    });
+  }
+
   _configChanged(config) {
     const card = this.$.card;
     while (card.lastChild) {

gallery/src/demos/demo-hui-media-control-card.ts

@@ -4,7 +4,6 @@ import { PolymerElement } from "@polymer/polymer/polymer-element";
 import { provideHass } from "../../../src/fake_data/provide_hass";
 import "../components/demo-cards";
 import { createMediaPlayerEntities } from "../data/media_players";
-import "../../../src/panels/lovelace/cards/hui-media-control-card";
 
 const CONFIGS = [
   {

gallery/webpack.config.js

@@ -1,72 +1,5 @@
-const path = require("path");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { createGalleryConfig } = require("../build-scripts/webpack.js");
-const { babelLoaderConfig } = require("../build-scripts/babel.js");
-
-const isProd = process.env.NODE_ENV === "production";
-const chunkFilename = isProd ? "chunk.[chunkhash].js" : "[name].chunk.js";
-const buildPath = path.resolve(__dirname, "dist");
-const publicPath = isProd ? "./" : "http://localhost:8080/";
-const latestBuild = true;
 
 module.exports = createGalleryConfig({
   latestBuild: true,
 });
-
-const bla = () => {
-  const oldExports = {
-    mode: isProd ? "production" : "development",
-    // Disabled in prod while we make Home Assistant able to serve the right files.
-    // Was source-map
-    devtool: isProd ? "none" : "inline-source-map",
-    entry: "./src/entrypoint.js",
-    module: {
-      rules: [
-        babelLoaderConfig({ latestBuild }),
-        {
-          test: /\.css$/,
-          use: "raw-loader",
-        },
-        {
-          test: /\.(html)$/,
-          use: {
-            loader: "html-loader",
-            options: {
-              exportAsEs6Default: true,
-            },
-          },
-        },
-      ],
-    },
-    optimization: webpackBase.optimization(latestBuild),
-    plugins: [
-      new CopyWebpackPlugin([
-        "public",
-        { from: "../public", to: "static" },
-        { from: "../build-translations/output", to: "static/translations" },
-        {
-          from: "../node_modules/leaflet/dist/leaflet.css",
-          to: "static/images/leaflet/",
-        },
-        {
-          from: "../node_modules/roboto-fontface/fonts/roboto/*.woff2",
-          to: "static/fonts/roboto/",
-        },
-        {
-          from: "../node_modules/leaflet/dist/images",
-          to: "static/images/leaflet/",
-        },
-      ]),
-    ].filter(Boolean),
-    resolve: webpackBase.resolve,
-    output: {
-      filename: "[name].js",
-      chunkFilename: chunkFilename,
-      path: buildPath,
-      publicPath,
-    },
-    devServer: {
-      contentBase: "./public",
-    },
-  };
-};

package.json

@@ -178,7 +178,7 @@
     "web-component-tester": "^6.9.2",
     "webpack": "^4.40.2",
     "webpack-cli": "^3.3.9",
-    "webpack-dev-server": "^3.8.1",
+    "webpack-dev-server": "^3.10.3",
     "webpack-manifest-plugin": "^2.0.4",
     "workbox-webpack-plugin": "^4.1.1",
     "workerize-loader": "^1.1.0"

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="home-assistant-frontend",
-    version="20200406.0",
+    version="20200407.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",

src/panels/config/devices/ha-config-device-page.ts

@@ -1,50 +1,47 @@
+import "@polymer/paper-tooltip/paper-tooltip";
 import {
-  property,
-  LitElement,
-  html,
-  customElement,
   css,
   CSSResult,
+  customElement,
+  html,
+  LitElement,
+  property,
 } from "lit-element";
-
+import { ifDefined } from "lit-html/directives/if-defined";
 import memoizeOne from "memoize-one";
-
-import "@polymer/paper-tooltip/paper-tooltip";
-
-import "../../../layouts/hass-tabs-subpage";
-import "../../../layouts/hass-error-screen";
-import "../ha-config-section";
-
-import "./device-detail/ha-device-info-card";
-import "./device-detail/ha-device-card-mqtt";
-import "./device-detail/ha-device-entities-card";
-import { HomeAssistant, Route } from "../../../types";
+import { isComponentLoaded } from "../../../common/config/is_component_loaded";
+import { computeStateName } from "../../../common/entity/compute_state_name";
+import { createValidEntityId } from "../../../common/entity/valid_entity_id";
+import { compare } from "../../../common/string/compare";
+import "../../../components/ha-icon-next";
+import "../../../components/entity/ha-state-icon";
+import { AreaRegistryEntry } from "../../../data/area_registry";
 import { ConfigEntry } from "../../../data/config_entries";
 import {
-  EntityRegistryEntry,
-  updateEntityRegistryEntry,
-  findBatteryEntity,
-} from "../../../data/entity_registry";
-import {
-  DeviceRegistryEntry,
   computeDeviceName,
+  DeviceRegistryEntry,
   updateDeviceRegistryEntry,
 } from "../../../data/device_registry";
-import { AreaRegistryEntry } from "../../../data/area_registry";
+import {
+  EntityRegistryEntry,
+  findBatteryEntity,
+  updateEntityRegistryEntry,
+} from "../../../data/entity_registry";
+import { SceneEntities, showSceneEditor } from "../../../data/scene";
+import { findRelated, RelatedResult } from "../../../data/search";
 import {
   loadDeviceRegistryDetailDialog,
   showDeviceRegistryDetailDialog,
 } from "../../../dialogs/device-registry-detail/show-dialog-device-registry-detail";
-import "../../../components/ha-icon-next";
-import { compare } from "../../../common/string/compare";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import { createValidEntityId } from "../../../common/entity/valid_entity_id";
+import "../../../layouts/hass-error-screen";
+import "../../../layouts/hass-tabs-subpage";
+import { HomeAssistant, Route } from "../../../types";
+import "../ha-config-section";
 import { configSections } from "../ha-panel-config";
-import { RelatedResult, findRelated } from "../../../data/search";
-import { SceneEntities, showSceneEditor } from "../../../data/scene";
+import "./device-detail/ha-device-card-mqtt";
+import "./device-detail/ha-device-entities-card";
+import "./device-detail/ha-device-info-card";
 import { showDeviceAutomationDialog } from "./device-detail/show-dialog-device-automation";
-import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import { ifDefined } from "lit-html/directives/if-defined";
 
 export interface EntityRegistryStateEntry extends EntityRegistryEntry {
   stateName?: string;

src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts

@@ -15,6 +15,7 @@ import {
   RowClickedEvent,
 } from "../../../../components/data-table/ha-data-table";
 import "../../../../components/ha-icon";
+import "../../../../components/ha-fab";
 import "../../../../layouts/hass-loading-screen";
 import "../../../../layouts/hass-tabs-subpage-data-table";
 import { HomeAssistant, Route } from "../../../../types";

src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts

@@ -20,6 +20,7 @@ import {
   RowClickedEvent,
 } from "../../../../components/data-table/ha-data-table";
 import "../../../../components/ha-icon";
+import "../../../../components/ha-fab";
 import "../../../../layouts/hass-loading-screen";
 import "../../../../layouts/hass-tabs-subpage-data-table";
 import { HomeAssistant, Route } from "../../../../types";

src/panels/logbook/ha-logbook.ts

@@ -39,12 +39,14 @@ class HaLogbook extends LitElement {
   protected render(): TemplateResult {
     if (!this.entries?.length) {
       return html`
-        ${this.hass.localize("ui.panel.logbook.entries_not_found")}
+        <div class="container">
+          ${this.hass.localize("ui.panel.logbook.entries_not_found")}
+        </div>
       `;
     }
 
     return html`
-      <div>
+      <div class="container">
         ${scroll({
           items: this.entries,
           renderItem: (item: LogbookEntry, index?: number) =>
@@ -154,13 +156,16 @@ class HaLogbook extends LitElement {
         color: var(--primary-color);
       }
 
+      .container {
+        padding: 0 16px;
+      }
+
       .uni-virtualizer-host {
         display: block;
         position: relative;
         contain: strict;
         height: 100%;
         overflow: auto;
-        padding: 0 16px;
       }
 
       .uni-virtualizer-host > * {