From d6332d2bc723f9aa60f2c886564bef49a6b91b84 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 14 Feb 2021 20:25:41 -0500
Subject: Test html script ordering (#1396)

* Simplify getAllFiles

* Add test to validate script order

* Update script include order

* Update content script order

* Update sw.js and corresponding lint

* Update manifest
---
 ext/action-popup.html          |  8 +++---
 ext/background.html            | 31 +++++++++++----------
 ext/info.html                  |  9 ++++---
 ext/manifest.json              | 26 +++++++++---------
 ext/permissions.html           |  7 ++---
 ext/pitch-accents-preview.html |  5 ++--
 ext/popup-preview.html         | 23 ++++++++--------
 ext/popup.html                 | 39 +++++++++++++--------------
 ext/search.html                | 41 ++++++++++++++--------------
 ext/settings-old.html          | 47 ++++++++++++++++----------------
 ext/settings.html              | 61 ++++++++++++++++++++----------------------
 ext/sw.js                      | 26 +++++++++---------
 ext/template-renderer.html     | 18 ++++++++-----
 ext/welcome.html               | 22 +++++++--------
 14 files changed, 181 insertions(+), 182 deletions(-)

(limited to 'ext')

diff --git a/ext/action-popup.html b/ext/action-popup.html
index 79a3df88..91587684 100644
--- a/ext/action-popup.html
+++ b/ext/action-popup.html
@@ -82,15 +82,15 @@
 </div>
 
 <script src="/js/core.js"></script>
-<script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
+
 <script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/yomichan.js"></script>
 
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/input/hotkey-help-controller.js"></script>
 <script src="/js/input/hotkey-util.js"></script>
 
-<script src="/js/data/permissions-util.js"></script>
-
 <script src="/js/pages/action-popup-main.js"></script>
 
 </body>
diff --git a/ext/background.html b/ext/background.html
index 6818db23..a801aae7 100644
--- a/ext/background.html
+++ b/ext/background.html
@@ -18,34 +18,33 @@
         <script src="/lib/wanakana.min.js"></script>
 
         <script src="/js/core.js"></script>
-        <script src="/js/yomichan.js"></script>
-        <script src="/js/background/environment.js"></script>
-        <script src="/js/language/japanese-util.js"></script>
 
-        <script src="/js/general/cache-map.js"></script>
-        <script src="/js/language/dictionary-data-util.js"></script>
-        <script src="/js/general/object-property-accessor.js"></script>
+        <script src="/js/yomichan.js"></script>
 
+        <script src="/js/background/backend.js"></script>
+        <script src="/js/background/environment.js"></script>
+        <script src="/js/background/profile-conditions-util.js"></script>
+        <script src="/js/background/request-builder.js"></script>
         <script src="/js/comm/anki.js"></script>
-        <script src="/js/media/audio-downloader.js"></script>
         <script src="/js/comm/clipboard-monitor.js"></script>
         <script src="/js/comm/clipboard-reader.js"></script>
+        <script src="/js/comm/mecab.js"></script>
         <script src="/js/data/database.js"></script>
-        <script src="/js/language/deinflector.js"></script>
-        <script src="/js/language/dictionary-database.js"></script>
         <script src="/js/data/json-schema.js"></script>
-        <script src="/js/comm/mecab.js"></script>
-        <script src="/js/media/media-util.js"></script>
         <script src="/js/data/options-util.js"></script>
         <script src="/js/data/permissions-util.js"></script>
-        <script src="/js/background/profile-conditions-util.js"></script>
-        <script src="/js/background/request-builder.js"></script>
         <script src="/js/dom/native-simple-dom-parser.js"></script>
-        <script src="/js/templates/template-patcher.js"></script>
+        <script src="/js/general/cache-map.js"></script>
+        <script src="/js/general/object-property-accessor.js"></script>
         <script src="/js/general/text-source-map.js"></script>
+        <script src="/js/language/deinflector.js"></script>
+        <script src="/js/language/dictionary-data-util.js"></script>
+        <script src="/js/language/dictionary-database.js"></script>
+        <script src="/js/language/japanese-util.js"></script>
         <script src="/js/language/translator.js"></script>
-
-        <script src="/js/background/backend.js"></script>
+        <script src="/js/media/audio-downloader.js"></script>
+        <script src="/js/media/media-util.js"></script>
+        <script src="/js/templates/template-patcher.js"></script>
 
         <script src="/js/background/background-main.js"></script>
 
diff --git a/ext/info.html b/ext/info.html
index aa00b103..3000070a 100644
--- a/ext/info.html
+++ b/ext/info.html
@@ -59,15 +59,16 @@
 
 <!-- Scripts -->
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
 
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/data/permissions-util.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
 <script src="/js/settings/backup-controller.js"></script>
+<script src="/js/settings/settings-controller.js"></script>
 
 <script src="/js/pages/info-main.js"></script>
 
diff --git a/ext/manifest.json b/ext/manifest.json
index 85aecc9c..55fd54e8 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -40,23 +40,23 @@
             "js": [
                 "js/core.js",
                 "js/yomichan.js",
-                "js/comm/cross-frame-api.js",
-                "js/comm/api.js",
-                "js/script/dynamic-loader.js",
-                "js/comm/frame-client.js",
-                "js/language/text-scanner.js",
-                "js/dom/document-util.js",
-                "js/input/hotkey-handler.js",
-                "js/dom/dom-text-scanner.js",
+                "js/app/frontend.js",
                 "js/app/popup.js",
-                "js/dom/text-source-range.js",
-                "js/dom/text-source-element.js",
                 "js/app/popup-factory.js",
-                "js/comm/frame-ancestry-handler.js",
-                "js/comm/frame-offset-forwarder.js",
                 "js/app/popup-proxy.js",
                 "js/app/popup-window.js",
-                "js/app/frontend.js",
+                "js/comm/api.js",
+                "js/comm/cross-frame-api.js",
+                "js/comm/frame-ancestry-handler.js",
+                "js/comm/frame-client.js",
+                "js/comm/frame-offset-forwarder.js",
+                "js/dom/dom-text-scanner.js",
+                "js/dom/document-util.js",
+                "js/dom/text-source-element.js",
+                "js/dom/text-source-range.js",
+                "js/input/hotkey-handler.js",
+                "js/language/text-scanner.js",
+                "js/script/dynamic-loader.js",
                 "js/app/content-script-main.js"
             ],
             "match_about_blank": true,
diff --git a/ext/permissions.html b/ext/permissions.html
index 23d3412a..fc4d2f8d 100644
--- a/ext/permissions.html
+++ b/ext/permissions.html
@@ -162,13 +162,14 @@
 
 <!-- Scripts -->
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
 
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/data/permissions-util.js"></script>
 <script src="/js/settings/permissions-toggle-controller.js"></script>
 <script src="/js/settings/settings-controller.js"></script>
 
diff --git a/ext/pitch-accents-preview.html b/ext/pitch-accents-preview.html
index 38ee2363..a3c6f875 100644
--- a/ext/pitch-accents-preview.html
+++ b/ext/pitch-accents-preview.html
@@ -50,10 +50,11 @@
 </div></div>
 
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
 
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
 <script src="/js/display/display-generator.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
 
diff --git a/ext/popup-preview.html b/ext/popup-preview.html
index a331017d..3ca46232 100644
--- a/ext/popup-preview.html
+++ b/ext/popup-preview.html
@@ -37,23 +37,24 @@
 <script src="/lib/wanakana.min.js"></script>
 
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
-<script src="/js/script/dynamic-loader.js"></script>
-<script src="/js/comm/frame-client.js"></script>
-<script src="/js/language/text-scanner.js"></script>
 
-<script src="/js/dom/document-util.js"></script>
-<script src="/js/input/hotkey-handler.js"></script>
-<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/app/frontend.js"></script>
 <script src="/js/app/popup.js"></script>
-<script src="/js/dom/text-source-range.js"></script>
-<script src="/js/dom/text-source-element.js"></script>
 <script src="/js/app/popup-factory.js"></script>
-<script src="/js/app/frontend.js"></script>
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
 <script src="/js/comm/frame-ancestry-handler.js"></script>
+<script src="/js/comm/frame-client.js"></script>
 <script src="/js/comm/frame-offset-forwarder.js"></script>
+<script src="/js/dom/document-util.js"></script>
+<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/dom/text-source-element.js"></script>
+<script src="/js/dom/text-source-range.js"></script>
+<script src="/js/input/hotkey-handler.js"></script>
+<script src="/js/language/text-scanner.js"></script>
+<script src="/js/script/dynamic-loader.js"></script>
 <script src="/js/settings/popup-preview-frame.js"></script>
 
 <script src="/js/settings/popup-preview-frame-main.js"></script>
diff --git a/ext/popup.html b/ext/popup.html
index 1d950930..88648809 100644
--- a/ext/popup.html
+++ b/ext/popup.html
@@ -90,42 +90,41 @@
 
 <!-- Scripts -->
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
-<script src="/js/language/japanese-util.js"></script>
 
-<script src="/js/dom/document-util.js"></script>
-<script src="/js/dom/dom-text-scanner.js"></script>
-<script src="/js/dom/text-source-range.js"></script>
-<script src="/js/dom/text-source-element.js"></script>
-<script src="/js/media/audio-system.js"></script>
-<script src="/js/language/dictionary-data-util.js"></script>
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/comm/frame-endpoint.js"></script>
+<script src="/js/data/anki-note-builder.js"></script>
 <script src="/js/display/display.js"></script>
 <script src="/js/display/display-audio.js"></script>
 <script src="/js/display/display-generator.js"></script>
 <script src="/js/display/display-history.js"></script>
 <script src="/js/display/display-notification.js"></script>
 <script src="/js/display/display-profile-selection.js"></script>
+<script src="/js/display/query-parser.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
-<script src="/js/script/dynamic-loader.js"></script>
-<script src="/js/comm/frame-endpoint.js"></script>
-<script src="/js/input/hotkey-handler.js"></script>
-<script src="/js/input/hotkey-help-controller.js"></script>
-<script src="/js/input/hotkey-util.js"></script>
-<script src="/js/media/media-loader.js"></script>
+<script src="/js/dom/document-util.js"></script>
+<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/dom/html-template-collection.js"></script>
 <script src="/js/dom/panel-element.js"></script>
 <script src="/js/dom/popup-menu.js"></script>
 <script src="/js/dom/scroll-element.js"></script>
+<script src="/js/dom/text-source-element.js"></script>
+<script src="/js/dom/text-source-range.js"></script>
+<script src="/js/input/hotkey-handler.js"></script>
+<script src="/js/input/hotkey-help-controller.js"></script>
+<script src="/js/input/hotkey-util.js"></script>
+<script src="/js/language/dictionary-data-util.js"></script>
+<script src="/js/language/japanese-util.js"></script>
 <script src="/js/language/text-scanner.js"></script>
-<script src="/js/dom/html-template-collection.js"></script>
+<script src="/js/media/audio-system.js"></script>
+<script src="/js/media/media-loader.js"></script>
 <script src="/js/media/text-to-speech-audio.js"></script>
-
-<script src="/js/data/anki-note-builder.js"></script>
+<script src="/js/script/dynamic-loader.js"></script>
 <script src="/js/templates/template-renderer-proxy.js"></script>
 
-<script src="/js/display/query-parser.js"></script>
-
 <script src="/js/display/popup-main.js"></script>
 
 </body>
diff --git a/ext/search.html b/ext/search.html
index d403effb..d1c28fc8 100644
--- a/ext/search.html
+++ b/ext/search.html
@@ -76,41 +76,40 @@
 <script src="/lib/wanakana.min.js"></script>
 
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
-<script src="/js/language/japanese-util.js"></script>
 
-<script src="/js/dom/document-focus-controller.js"></script>
-<script src="/js/dom/document-util.js"></script>
-<script src="/js/dom/dom-text-scanner.js"></script>
-<script src="/js/dom/text-source-range.js"></script>
-<script src="/js/dom/text-source-element.js"></script>
-<script src="/js/media/audio-system.js"></script>
-<script src="/js/language/dictionary-data-util.js"></script>
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/clipboard-monitor.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/data/anki-note-builder.js"></script>
 <script src="/js/display/display.js"></script>
 <script src="/js/display/display-audio.js"></script>
 <script src="/js/display/display-generator.js"></script>
 <script src="/js/display/display-history.js"></script>
 <script src="/js/display/display-notification.js"></script>
-<script src="/js/script/dynamic-loader.js"></script>
+<script src="/js/display/query-parser.js"></script>
+<script src="/js/display/search-display-controller.js"></script>
+<script src="/js/dom/document-focus-controller.js"></script>
+<script src="/js/dom/document-util.js"></script>
+<script src="/js/dom/dom-text-scanner.js"></script>
+<script src="/js/dom/html-template-collection.js"></script>
+<script src="/js/dom/popup-menu.js"></script>
+<script src="/js/dom/scroll-element.js"></script>
+<script src="/js/dom/text-source-element.js"></script>
+<script src="/js/dom/text-source-range.js"></script>
 <script src="/js/input/hotkey-handler.js"></script>
 <script src="/js/input/hotkey-help-controller.js"></script>
 <script src="/js/input/hotkey-util.js"></script>
-<script src="/js/media/media-loader.js"></script>
-<script src="/js/dom/popup-menu.js"></script>
-<script src="/js/dom/scroll-element.js"></script>
+<script src="/js/language/dictionary-data-util.js"></script>
+<script src="/js/language/japanese-util.js"></script>
 <script src="/js/language/text-scanner.js"></script>
-<script src="/js/dom/html-template-collection.js"></script>
+<script src="/js/media/audio-system.js"></script>
+<script src="/js/media/media-loader.js"></script>
 <script src="/js/media/text-to-speech-audio.js"></script>
-
-<script src="/js/data/anki-note-builder.js"></script>
+<script src="/js/script/dynamic-loader.js"></script>
 <script src="/js/templates/template-renderer-proxy.js"></script>
 
-<script src="/js/display/query-parser.js"></script>
-<script src="/js/comm/clipboard-monitor.js"></script>
-<script src="/js/display/search-display-controller.js"></script>
-
 <script src="/js/display/search-main.js"></script>
 
 </body>
diff --git a/ext/settings-old.html b/ext/settings-old.html
index 697b95dc..4c35218f 100644
--- a/ext/settings-old.html
+++ b/ext/settings-old.html
@@ -1274,60 +1274,59 @@
         </div>
 
         <script src="/lib/jquery.min.js"></script>
+
         <script src="/lib/bootstrap/js/bootstrap.min.js"></script>
         <script src="/lib/jszip.min.js"></script>
         <script src="/lib/wanakana.min.js"></script>
 
         <script src="/js/core.js"></script>
+
         <script src="/js/yomichan.js"></script>
-        <script src="/js/comm/cross-frame-api.js"></script>
+
         <script src="/js/background/environment.js"></script>
+        <script src="/js/comm/anki.js"></script>
         <script src="/js/comm/api.js"></script>
-        <script src="/js/language/japanese-util.js"></script>
-
-        <script src="/js/media/audio-system.js"></script>
-        <script src="/js/general/cache-map.js"></script>
-        <script src="/js/language/dictionary-data-util.js"></script>
+        <script src="/js/comm/cross-frame-api.js"></script>
+        <script src="/js/data/anki-note-builder.js"></script>
+        <script src="/js/data/database.js"></script>
+        <script src="/js/data/json-schema.js"></script>
+        <script src="/js/data/options-util.js"></script>
+        <script src="/js/data/permissions-util.js"></script>
         <script src="/js/dom/document-util.js"></script>
         <script src="/js/dom/dom-data-binder.js"></script>
         <script src="/js/dom/html-template-collection.js"></script>
-        <script src="/js/input/hotkey-util.js"></script>
-        <script src="/js/general/object-property-accessor.js"></script>
         <script src="/js/dom/selector-observer.js"></script>
+        <script src="/js/general/cache-map.js"></script>
+        <script src="/js/general/object-property-accessor.js"></script>
         <script src="/js/general/task-accumulator.js"></script>
-        <script src="/js/media/text-to-speech-audio.js"></script>
-
-        <script src="/js/comm/anki.js"></script>
-        <script src="/js/data/anki-note-builder.js"></script>
-        <script src="/js/data/options-util.js"></script>
-        <script src="/js/data/database.js"></script>
+        <script src="/js/input/hotkey-util.js"></script>
+        <script src="/js/language/dictionary-data-util.js"></script>
         <script src="/js/language/dictionary-database.js"></script>
         <script src="/js/language/dictionary-importer.js"></script>
-        <script src="/js/data/json-schema.js"></script>
+        <script src="/js/language/japanese-util.js"></script>
+        <script src="/js/media/audio-system.js"></script>
         <script src="/js/media/media-util.js"></script>
-        <script src="/js/data/permissions-util.js"></script>
-        <script src="/js/templates/template-patcher.js"></script>
-        <script src="/js/templates/template-renderer-proxy.js"></script>
-
-        <script src="/js/settings/keyboard-mouse-input-field.js"></script>
-        <script src="/js/settings/modal-jquery.js"></script>
-        <script src="/js/settings/profile-conditions-ui.js"></script>
-
+        <script src="/js/media/text-to-speech-audio.js"></script>
         <script src="/js/settings/anki-controller.js"></script>
         <script src="/js/settings/anki-templates-controller.js"></script>
         <script src="/js/settings/audio-controller.js"></script>
         <script src="/js/settings/backup-controller.js"></script>
-        <script src="/js/settings/permissions-toggle-controller.js"></script>
         <script src="/js/settings/dictionary-controller.js"></script>
         <script src="/js/settings/dictionary-import-controller.js"></script>
         <script src="/js/settings/generic-setting-controller.js"></script>
+        <script src="/js/settings/keyboard-mouse-input-field.js"></script>
         <script src="/js/settings/modal-controller.js"></script>
+        <script src="/js/settings/modal-jquery.js"></script>
+        <script src="/js/settings/permissions-toggle-controller.js"></script>
         <script src="/js/settings/popup-preview-controller.js"></script>
+        <script src="/js/settings/profile-conditions-ui.js"></script>
         <script src="/js/settings/profile-controller.js"></script>
         <script src="/js/settings/scan-inputs-controller.js"></script>
         <script src="/js/settings/scan-inputs-simple-controller.js"></script>
         <script src="/js/settings/settings-controller.js"></script>
         <script src="/js/settings/storage-controller.js"></script>
+        <script src="/js/templates/template-patcher.js"></script>
+        <script src="/js/templates/template-renderer-proxy.js"></script>
 
         <script src="/js/settings/main.js"></script>
     </body>
diff --git a/ext/settings.html b/ext/settings.html
index b37507ed..1b7fa02d 100644
--- a/ext/settings.html
+++ b/ext/settings.html
@@ -3190,69 +3190,66 @@
 <script src="/lib/wanakana.min.js"></script>
 
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
+
 <script src="/js/background/environment.js"></script>
+<script src="/js/comm/anki.js"></script>
 <script src="/js/comm/api.js"></script>
-<script src="/js/language/japanese-util.js"></script>
-
-<script src="/js/media/audio-system.js"></script>
-<script src="/js/general/cache-map.js"></script>
-<script src="/js/language/dictionary-data-util.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/data/anki-note-builder.js"></script>
+<script src="/js/data/database.js"></script>
+<script src="/js/data/json-schema.js"></script>
+<script src="/js/data/options-util.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/document-util.js"></script>
 <script src="/js/dom/dom-data-binder.js"></script>
-<script src="/js/input/hotkey-util.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/general/object-property-accessor.js"></script>
 <script src="/js/dom/panel-element.js"></script>
 <script src="/js/dom/popup-menu.js"></script>
 <script src="/js/dom/selector-observer.js"></script>
+<script src="/js/general/cache-map.js"></script>
+<script src="/js/general/object-property-accessor.js"></script>
 <script src="/js/general/task-accumulator.js"></script>
-<script src="/js/media/text-to-speech-audio.js"></script>
-
-<script src="/js/comm/anki.js"></script>
-<script src="/js/data/anki-note-builder.js"></script>
-<script src="/js/data/options-util.js"></script>
-<script src="/js/data/database.js"></script>
+<script src="/js/input/hotkey-util.js"></script>
+<script src="/js/language/dictionary-data-util.js"></script>
 <script src="/js/language/dictionary-database.js"></script>
 <script src="/js/language/dictionary-importer.js"></script>
-<script src="/js/data/json-schema.js"></script>
+<script src="/js/language/japanese-util.js"></script>
+<script src="/js/media/audio-system.js"></script>
 <script src="/js/media/media-util.js"></script>
-<script src="/js/data/permissions-util.js"></script>
-<script src="/js/templates/template-patcher.js"></script>
-<script src="/js/templates/template-renderer-proxy.js"></script>
-
-<script src="/js/settings/keyboard-mouse-input-field.js"></script>
-<script src="/js/settings/profile-conditions-ui.js"></script>
-
+<script src="/js/media/text-to-speech-audio.js"></script>
 <script src="/js/settings/anki-controller.js"></script>
 <script src="/js/settings/anki-templates-controller.js"></script>
 <script src="/js/settings/audio-controller.js"></script>
 <script src="/js/settings/backup-controller.js"></script>
-<script src="/js/settings/permissions-toggle-controller.js"></script>
 <script src="/js/settings/dictionary-controller.js"></script>
 <script src="/js/settings/dictionary-import-controller.js"></script>
+<script src="/js/settings/extension-keyboard-shortcuts-controller.js"></script>
 <script src="/js/settings/generic-setting-controller.js"></script>
+<script src="/js/settings/keyboard-mouse-input-field.js"></script>
+<script src="/js/settings/keyboard-shortcuts-controller.js"></script>
+<script src="/js/settings/mecab-controller.js"></script>
 <script src="/js/settings/modal.js"></script>
 <script src="/js/settings/modal-controller.js"></script>
+<script src="/js/settings/nested-popups-controller.js"></script>
+<script src="/js/settings/permissions-toggle-controller.js"></script>
 <script src="/js/settings/popup-preview-controller.js"></script>
+<script src="/js/settings/popup-window-controller.js"></script>
+<script src="/js/settings/profile-conditions-ui.js"></script>
 <script src="/js/settings/profile-controller.js"></script>
 <script src="/js/settings/scan-inputs-controller.js"></script>
 <script src="/js/settings/scan-inputs-simple-controller.js"></script>
-<script src="/js/settings/settings-controller.js"></script>
-<script src="/js/settings/status-footer.js"></script>
-<script src="/js/settings/storage-controller.js"></script>
-
-<script src="/js/settings/extension-keyboard-shortcuts-controller.js"></script>
-<script src="/js/settings/keyboard-shortcuts-controller.js"></script>
-<script src="/js/settings/mecab-controller.js"></script>
-<script src="/js/settings/nested-popups-controller.js"></script>
-<script src="/js/settings/popup-window-controller.js"></script>
 <script src="/js/settings/secondary-search-dictionary-controller.js"></script>
 <script src="/js/settings/sentence-termination-characters-controller.js"></script>
+<script src="/js/settings/settings-controller.js"></script>
 <script src="/js/settings/settings-display-controller.js"></script>
+<script src="/js/settings/status-footer.js"></script>
+<script src="/js/settings/storage-controller.js"></script>
 <script src="/js/settings/translation-text-replacements-controller.js"></script>
+<script src="/js/templates/template-patcher.js"></script>
+<script src="/js/templates/template-renderer-proxy.js"></script>
 
 <script src="/js/settings/settings-main.js"></script>
 
diff --git a/ext/sw.js b/ext/sw.js
index 6e9952d6..802f3ba3 100644
--- a/ext/sw.js
+++ b/ext/sw.js
@@ -20,29 +20,29 @@ self.importScripts(
     '/lib/wanakana.min.js',
     '/js/core.js',
     '/js/yomichan.js',
+    '/js/background/backend.js',
     '/js/background/environment.js',
-    '/js/language/japanese-util.js',
-    '/js/general/cache-map.js',
-    '/js/language/dictionary-data-util.js',
-    '/js/general/object-property-accessor.js',
+    '/js/background/profile-conditions-util.js',
+    '/js/background/request-builder.js',
     '/js/comm/anki.js',
-    '/js/media/audio-downloader.js',
     '/js/comm/clipboard-monitor.js',
     '/js/comm/clipboard-reader.js',
+    '/js/comm/mecab.js',
     '/js/data/database.js',
-    '/js/language/deinflector.js',
-    '/js/language/dictionary-database.js',
     '/js/data/json-schema.js',
-    '/js/comm/mecab.js',
-    '/js/media/media-util.js',
     '/js/data/options-util.js',
     '/js/data/permissions-util.js',
-    '/js/background/profile-conditions-util.js',
-    '/js/background/request-builder.js',
     '/js/dom/simple-dom-parser.js',
-    '/js/templates/template-patcher.js',
+    '/js/general/cache-map.js',
+    '/js/general/object-property-accessor.js',
     '/js/general/text-source-map.js',
+    '/js/language/deinflector.js',
+    '/js/language/dictionary-data-util.js',
+    '/js/language/dictionary-database.js',
+    '/js/language/japanese-util.js',
     '/js/language/translator.js',
-    '/js/background/backend.js',
+    '/js/media/audio-downloader.js',
+    '/js/media/media-util.js',
+    '/js/templates/template-patcher.js',
     '/js/background/background-main.js'
 );
diff --git a/ext/template-renderer.html b/ext/template-renderer.html
index 7245ed62..eb3695e1 100644
--- a/ext/template-renderer.html
+++ b/ext/template-renderer.html
@@ -13,12 +13,16 @@
     <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
 </head>
 <body>
-    <script src="/lib/handlebars.min.js"></script>
-    <script src="/js/language/dictionary-data-util.js"></script>
-    <script src="/js/language/japanese-util.js"></script>
-    <script src="/js/data/anki-note-data.js"></script>
-    <script src="/js/templates/template-renderer.js"></script>
-    <script src="/js/templates/template-renderer-frame-api.js"></script>
-    <script src="/js/templates/template-renderer-frame-main.js"></script>
+
+<!-- Scripts -->
+<script src="/lib/handlebars.min.js"></script>
+
+<script src="/js/data/anki-note-data.js"></script>
+<script src="/js/language/dictionary-data-util.js"></script>
+<script src="/js/language/japanese-util.js"></script>
+<script src="/js/templates/template-renderer.js"></script>
+<script src="/js/templates/template-renderer-frame-api.js"></script>
+<script src="/js/templates/template-renderer-frame-main.js"></script>
+
 </body>
 </html>
diff --git a/ext/welcome.html b/ext/welcome.html
index 0ea2020f..88eb5683 100644
--- a/ext/welcome.html
+++ b/ext/welcome.html
@@ -315,29 +315,28 @@
 <script src="/lib/jszip.min.js"></script>
 
 <script src="/js/core.js"></script>
+
 <script src="/js/yomichan.js"></script>
-<script src="/js/comm/cross-frame-api.js"></script>
-<script src="/js/comm/api.js"></script>
 
-<script src="/js/general/cache-map.js"></script>
+<script src="/js/comm/api.js"></script>
+<script src="/js/comm/cross-frame-api.js"></script>
+<script src="/js/data/database.js"></script>
+<script src="/js/data/json-schema.js"></script>
+<script src="/js/data/permissions-util.js"></script>
 <script src="/js/dom/document-focus-controller.js"></script>
 <script src="/js/dom/document-util.js"></script>
 <script src="/js/dom/dom-data-binder.js"></script>
-<script src="/js/input/hotkey-util.js"></script>
 <script src="/js/dom/html-template-collection.js"></script>
-<script src="/js/general/object-property-accessor.js"></script>
 <script src="/js/dom/panel-element.js"></script>
 <script src="/js/dom/popup-menu.js"></script>
 <script src="/js/dom/selector-observer.js"></script>
+<script src="/js/general/cache-map.js"></script>
+<script src="/js/general/object-property-accessor.js"></script>
 <script src="/js/general/task-accumulator.js"></script>
-
-<script src="/js/data/database.js"></script>
+<script src="/js/input/hotkey-util.js"></script>
 <script src="/js/language/dictionary-database.js"></script>
 <script src="/js/language/dictionary-importer.js"></script>
-<script src="/js/data/json-schema.js"></script>
 <script src="/js/media/media-util.js"></script>
-<script src="/js/data/permissions-util.js"></script>
-
 <script src="/js/settings/dictionary-controller.js"></script>
 <script src="/js/settings/dictionary-import-controller.js"></script>
 <script src="/js/settings/generic-setting-controller.js"></script>
@@ -345,9 +344,8 @@
 <script src="/js/settings/modal-controller.js"></script>
 <script src="/js/settings/scan-inputs-simple-controller.js"></script>
 <script src="/js/settings/settings-controller.js"></script>
-<script src="/js/settings/status-footer.js"></script>
-
 <script src="/js/settings/settings-display-controller.js"></script>
+<script src="/js/settings/status-footer.js"></script>
 
 <script src="/js/pages/welcome-main.js"></script>
 
-- 
cgit v1.2.3