diff --git a/src/main/resources/web/index.html b/src/main/resources/web/index.html index 45e2dd0..c15c6a4 100644 --- a/src/main/resources/web/index.html +++ b/src/main/resources/web/index.html @@ -169,6 +169,6 @@ script-src 'self' https://*.cloudflare.com/ https://alcdn.msauth.net/ https://*. - + diff --git a/src/main/resources/web/js/account_manager.js b/src/main/resources/web/js/account_manager.mjs similarity index 98% rename from src/main/resources/web/js/account_manager.js rename to src/main/resources/web/js/account_manager.mjs index 1b8ed39..5587598 100644 --- a/src/main/resources/web/js/account_manager.js +++ b/src/main/resources/web/js/account_manager.mjs @@ -1,6 +1,6 @@ -import {getCorsProxy} from "./cors_proxy.js"; -import {checkFetchSuccess, filterNot, isSuccess} from "./util.js"; -import {addToast, refreshAccountList} from "./page.js"; +import {getCorsProxy} from "./cors_proxy.mjs"; +import {checkFetchSuccess, filterNot, isSuccess} from "./util.mjs"; +import {addToast, refreshAccountList} from "./page.mjs"; let activeAccounts = []; @@ -301,4 +301,4 @@ function getTokenPopup(username, request) { console.warn(error); } }); -} \ No newline at end of file +} diff --git a/src/main/resources/web/js/cors_proxy.js b/src/main/resources/web/js/cors_proxy.mjs similarity index 86% rename from src/main/resources/web/js/cors_proxy.js rename to src/main/resources/web/js/cors_proxy.mjs index f32552e..a2bb2ee 100644 --- a/src/main/resources/web/js/cors_proxy.js +++ b/src/main/resources/web/js/cors_proxy.mjs @@ -1,4 +1,4 @@ -import {refreshCorsStatus} from "./page.js"; +import {refreshCorsStatus} from "./page.mjs"; function defaultCors() { return "https://crp123-cors.herokuapp.com/"; diff --git a/src/main/resources/web/js/notification.js b/src/main/resources/web/js/notification.mjs similarity index 100% rename from src/main/resources/web/js/notification.js rename to src/main/resources/web/js/notification.mjs diff --git a/src/main/resources/web/js/page.js b/src/main/resources/web/js/page.mjs similarity index 96% rename from src/main/resources/web/js/page.js rename to src/main/resources/web/js/page.mjs index be5cc98..d7be006 100644 --- a/src/main/resources/web/js/page.js +++ b/src/main/resources/web/js/page.mjs @@ -1,6 +1,6 @@ // Minecraft.id -import {icanhazepoch, icanhazip} from "./util.js"; -import {getCorsProxy, setCorsProxy} from "./cors_proxy.js"; +import {icanhazepoch, icanhazip} from "./util.mjs"; +import {getCorsProxy, setCorsProxy} from "./cors_proxy.mjs"; import { findAccountByMs, getActiveAccounts, @@ -8,8 +8,8 @@ import { loginMc, loginMs, MicrosoftAccount, MojangAccount -} from "./account_manager.js"; -import {connect, getWsUrl, removeToken, sendSocket, setWsUrl, unlisten} from "./websocket.js"; +} from "./account_manager.mjs"; +import {connect, getWsUrl, removeToken, sendSocket, setWsUrl, unlisten} from "./websocket.mjs"; let mcIdUsername = null; let mcauth_code = null; @@ -78,7 +78,7 @@ function swCacheFiles() { action: "cache", urls: performance.getEntriesByType("resource") .map(it => it.name) - .filter(it => it.endsWith(".js") || it.endsWith(".css") || it.endsWith(".png")) + .filter(it => it.endsWith(".mjs") || it.endsWith(".js") || it.endsWith(".css") || it.endsWith(".png")) })); // https://stackoverflow.com/questions/46830493/is-there-any-way-to-cache-all-files-of-defined-folder-path-in-service-worker } diff --git a/src/main/resources/web/js/util.js b/src/main/resources/web/js/util.mjs similarity index 93% rename from src/main/resources/web/js/util.js rename to src/main/resources/web/js/util.mjs index b58930c..47a1bf9 100644 --- a/src/main/resources/web/js/util.js +++ b/src/main/resources/web/js/util.mjs @@ -1,4 +1,4 @@ -import {getCorsProxy} from "./cors_proxy.js"; +import {getCorsProxy} from "./cors_proxy.mjs"; export function isSuccess(status) { return status >= 200 && status < 300; @@ -27,4 +27,4 @@ export function icanhazepoch() { export function filterNot(array, item) { return array.filter(it => it !== item); -} \ No newline at end of file +} diff --git a/src/main/resources/web/js/websocket.js b/src/main/resources/web/js/websocket.mjs similarity index 95% rename from src/main/resources/web/js/websocket.js rename to src/main/resources/web/js/websocket.mjs index fca033d..965c9f2 100644 --- a/src/main/resources/web/js/websocket.js +++ b/src/main/resources/web/js/websocket.mjs @@ -1,7 +1,7 @@ -import {authNotification} from "./notification.js"; -import {checkFetchSuccess} from "./util.js"; -import {findAccountByMcName} from "./account_manager.js"; -import {addListeningList, addToast, renderActions, resetHtml, setListenVisible, setWsStatus} from "./page.js"; +import {authNotification} from "./notification.mjs"; +import {checkFetchSuccess} from "./util.mjs"; +import {findAccountByMcName} from "./account_manager.mjs"; +import {addListeningList, addToast, renderActions, resetHtml, setListenVisible, setWsStatus} from "./page.mjs"; let wsUrl = getWsUrl(); let socket = null; @@ -135,4 +135,4 @@ export function sendSocket(msg) { return } socket.send(msg); -} \ No newline at end of file +}