Merge pull request #307 from themoeway/modernize

Modernize codebase

2 files changed, 6 insertions, 1 deletions

diff --git a/ext/js/script/dynamic-loader-sentinel.js b/ext/js/script/dynamic-loader-sentinel.js
index 9e049d7a..7f08c503 100644
--- a/ext/js/script/dynamic-loader-sentinel.js
+++ b/ext/js/script/dynamic-loader-sentinel.js
@@ -16,4 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import {yomichan} from '../yomichan.js';
+
 yomichan.trigger('dynamicLoaderSentinel', {script: document.currentScript});
diff --git a/ext/js/script/dynamic-loader.js b/ext/js/script/dynamic-loader.js
index 7f3e77a4..2eced077 100644
--- a/ext/js/script/dynamic-loader.js
+++ b/ext/js/script/dynamic-loader.js
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-const dynamicLoader = (() => {
+import {yomichan} from '../yomichan.js';
+
+export const dynamicLoader = (() => {
     const injectedStylesheets = new Map();
     const injectedStylesheetsWithParent = new WeakMap();
 
@@ -146,6 +148,7 @@ const dynamicLoader = (() => {
         yomichan.on(sentinelEventName, sentinelEventCallback);
 
         try {
+            script.type = 'module';
             script.async = false;
             script.src = '/js/script/dynamic-loader-sentinel.js';
             parent.appendChild(script);