From 1c3293ac855aa2193149d46c3ba32854d1172d01 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 17 May 2018 21:29:37 -0400
Subject: [PATCH] Update frontend to 20180518.0 (#14510)

* Update frontend to 20180517.0

* Update requirements

* Bump frontend to 20180518.0
---
 homeassistant/components/frontend/__init__.py | 47 ++++++-------------
 requirements_all.txt                          |  2 +-
 requirements_test_all.txt                     |  2 +-
 3 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 3ea8594b2a0..13c8d826377 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -25,7 +25,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20180516.1']
+REQUIREMENTS = ['home-assistant-frontend==20180518.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log']
@@ -301,47 +301,28 @@ def async_setup(hass, config):
     hass.data[DATA_JS_VERSION] = js_version = conf.get(CONF_JS_VERSION)
 
     if is_dev:
-        for subpath in ["src", "build-translations", "build-temp", "build",
-                        "hass_frontend", "bower_components", "panels",
-                        "hassio"]:
-            hass.http.register_static_path(
-                "/home-assistant-polymer/{}".format(subpath),
-                os.path.join(repo_path, subpath),
-                False)
-
-        hass.http.register_static_path(
-            "/static/translations",
-            os.path.join(repo_path, "build-translations/output"), False)
-        sw_path_es5 = os.path.join(repo_path, "build-es5/service_worker.js")
-        sw_path_latest = os.path.join(repo_path, "build/service_worker.js")
-        static_path = os.path.join(repo_path, 'hass_frontend')
-        frontend_es5_path = os.path.join(repo_path, 'build-es5')
-        frontend_latest_path = os.path.join(repo_path, 'build')
+        hass_frontend_path = os.path.join(repo_path, 'hass_frontend')
+        hass_frontend_es5_path = os.path.join(repo_path, 'hass_frontend_es5')
     else:
         import hass_frontend
         import hass_frontend_es5
-        sw_path_es5 = os.path.join(hass_frontend_es5.where(),
-                                   "service_worker.js")
-        sw_path_latest = os.path.join(hass_frontend.where(),
-                                      "service_worker.js")
-        # /static points to dir with files that are JS-type agnostic.
-        # ES5 files are served from /frontend_es5.
-        # ES6 files are served from /frontend_latest.
-        static_path = hass_frontend.where()
-        frontend_es5_path = hass_frontend_es5.where()
-        frontend_latest_path = static_path
+        hass_frontend_path = hass_frontend.where()
+        hass_frontend_es5_path = hass_frontend_es5.where()
 
     hass.http.register_static_path(
-        "/service_worker_es5.js", sw_path_es5, False)
+        "/service_worker_es5.js",
+        os.path.join(hass_frontend_es5_path, "service_worker.js"), False)
     hass.http.register_static_path(
-        "/service_worker.js", sw_path_latest, False)
+        "/service_worker.js",
+        os.path.join(hass_frontend_path, "service_worker.js"), False)
     hass.http.register_static_path(
-        "/robots.txt", os.path.join(static_path, "robots.txt"), not is_dev)
-    hass.http.register_static_path("/static", static_path, not is_dev)
+        "/robots.txt",
+        os.path.join(hass_frontend_path, "robots.txt"), False)
+    hass.http.register_static_path("/static", hass_frontend_path, not is_dev)
     hass.http.register_static_path(
-        "/frontend_latest", frontend_latest_path, not is_dev)
+        "/frontend_latest", hass_frontend_path, not is_dev)
     hass.http.register_static_path(
-        "/frontend_es5", frontend_es5_path, not is_dev)
+        "/frontend_es5", hass_frontend_es5_path, not is_dev)
 
     local = hass.config.path('www')
     if os.path.isdir(local):
diff --git a/requirements_all.txt b/requirements_all.txt
index 54cd304b7e9..aaffe3068c2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -389,7 +389,7 @@ hipnotify==1.0.8
 holidays==0.9.5
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180516.1
+home-assistant-frontend==20180518.0
 
 # homeassistant.components.homekit_controller
 # homekit==0.6
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index c49c7de7bd1..f12fdd7ce77 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -81,7 +81,7 @@ hbmqtt==0.9.2
 holidays==0.9.5
 
 # homeassistant.components.frontend
-home-assistant-frontend==20180516.1
+home-assistant-frontend==20180518.0
 
 # homeassistant.components.influxdb
 # homeassistant.components.sensor.influxdb