From 6385001627094aab9513a12f99284d2117d40322 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 17 Jun 2021 11:20:36 -0700
Subject: [PATCH] Merge legacy into the main build to avoid caching issues

---
 raw_package/index.template.html                   | 8 ++------
 src/index.ts                                      | 1 +
 raw_package/static/js/esphome.js => src/legacy.js | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)
 rename raw_package/static/js/esphome.js => src/legacy.js (99%)

diff --git a/raw_package/index.template.html b/raw_package/index.template.html
index 6f5b51aa..538c2ebc 100644
--- a/raw_package/index.template.html
+++ b/raw_package/index.template.html
@@ -32,10 +32,6 @@
     <script src="{{ get_static_file_url('js/vendor/jquery-validate/jquery.validate.min.js') }}"></script>
     <script src="{{ get_static_file_url('js/vendor/materialize/materialize.min.js') }}"></script>
     <script src="{{ get_static_file_url('js/vendor/materialize-stepper/materialize-stepper.min.js') }}"></script>
-    <script
-      src="{{ get_static_file_url('js/esphome/index.js') }}"
-      type="module"
-    ></script>
 
     {% if streamer_mode %}
     <style>
@@ -474,8 +470,8 @@ <h4>
       charset="utf-8"
     ></script>
     <script
-      src="{{ get_static_file_url('js/esphome.js') }}"
-      type="text/javascript"
+      src="{{ get_static_file_url('js/esphome/index.js') }}"
+      type="module"
     ></script>
 
     {% if begin and len(entries) == 1 %}
diff --git a/src/index.ts b/src/index.ts
index 12579676..1197314e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,4 @@
+import "./legacy";
 import { attachOnlineStatus } from "./online_status";
 import { attachInstallUpdate } from "./install-update";
 import { attachWizard } from "./wizard";
diff --git a/raw_package/static/js/esphome.js b/src/legacy.js
similarity index 99%
rename from raw_package/static/js/esphome.js
rename to src/legacy.js
index 6dc5f3e3..50ffe57b 100644
--- a/raw_package/static/js/esphome.js
+++ b/src/legacy.js
@@ -1,5 +1,3 @@
-"use strict";
-
 // Document Ready
 $(document).ready(function () {
   M.AutoInit(document.body);