Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2025-01-09 19:48:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "workaround by using .mjs"

Browse Source 
This reverts commit d07b64e8d9.
This commit is contained in:
creeper123123321 2021-08-07 18:45:21 -03:00
parent e0b5622151
commit dffcfd6891
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/web/index.html
View File

@ -172,6 +172,6 @@ script-src 'self' https://*.cloudflare.com/ https://alcdn.msauth.net/ https://*.
<script src="https://alcdn.msauth.net/browser/2.15.0/js/msal-browser.min.js" integrity="sha384-/weuqUPkC0P9JxnstihEV1GHdWrheU9Qo3MbdTuxxKJM8l/cSTE5zGP5VBIM4TZN" <script src="https://alcdn.msauth.net/browser/2.15.0/js/msal-browser.min.js" integrity="sha384-/weuqUPkC0P9JxnstihEV1GHdWrheU9Qo3MbdTuxxKJM8l/cSTE5zGP5VBIM4TZN"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script type="module" src="js/page.mjs"></script> <script type="module" src="js/page.js"></script>
</body> </body>
</html> </html>

8
src/main/resources/web/js/account_manager.mjs → src/main/resources/web/js/account_manager.js
View File

@ -1,6 +1,6 @@
import {getCorsProxy} from "./cors_proxy.mjs"; import {getCorsProxy} from "./cors_proxy.js";
import {checkFetchSuccess, filterNot, isSuccess} from "./util.mjs"; import {checkFetchSuccess, filterNot, isSuccess} from "./util.js";
import {addToast, refreshAccountList} from "./page.mjs"; import {addToast, refreshAccountList} from "./page.js";
let activeAccounts = []; let activeAccounts = [];
@ -301,4 +301,4 @@ function getTokenPopup(username, request) {
console.warn(error); console.warn(error);
} }
}); });
} }

2
src/main/resources/web/js/cors_proxy.mjs → src/main/resources/web/js/cors_proxy.js
View File

@ -1,4 +1,4 @@
import {refreshCorsStatus} from "./page.mjs"; import {refreshCorsStatus} from "./page.js";
function defaultCors() { function defaultCors() {
return "https://crp123-cors.herokuapp.com/"; return "https://crp123-cors.herokuapp.com/";

0
src/main/resources/web/js/notification.mjs → src/main/resources/web/js/notification.js
View File

10
src/main/resources/web/js/page.mjs → src/main/resources/web/js/page.js
View File

@ -1,6 +1,6 @@
// Minecraft.id // Minecraft.id
import {icanhazepoch, icanhazip} from "./util.mjs"; import {icanhazepoch, icanhazip} from "./util.js";
import {getCorsProxy, setCorsProxy} from "./cors_proxy.mjs"; import {getCorsProxy, setCorsProxy} from "./cors_proxy.js";
import { import {
findAccountByMs, findAccountByMs,
getActiveAccounts, getActiveAccounts,
@ -8,8 +8,8 @@ import {
loginMc, loginMc,
loginMs, MicrosoftAccount, loginMs, MicrosoftAccount,
MojangAccount MojangAccount
} from "./account_manager.mjs"; } from "./account_manager.js";
import {connect, getWsUrl, removeToken, sendSocket, setWsUrl, unlisten} from "./websocket.mjs"; import {connect, getWsUrl, removeToken, sendSocket, setWsUrl, unlisten} from "./websocket.js";
let mcIdUsername = null; let mcIdUsername = null;
let mcauth_code = null; let mcauth_code = null;
@ -78,7 +78,7 @@ function swCacheFiles() {
action: "cache", action: "cache",
urls: performance.getEntriesByType("resource") urls: performance.getEntriesByType("resource")
.map(it => it.name) .map(it => it.name)
.filter(it => it.endsWith(".mjs") || it.endsWith(".js") || it.endsWith(".css") || it.endsWith(".png")) .filter(it => 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 })); // https://stackoverflow.com/questions/46830493/is-there-any-way-to-cache-all-files-of-defined-folder-path-in-service-worker
} }

4
src/main/resources/web/js/util.mjs → src/main/resources/web/js/util.js
View File

@ -1,4 +1,4 @@
import {getCorsProxy} from "./cors_proxy.mjs"; import {getCorsProxy} from "./cors_proxy.js";
export function isSuccess(status) { export function isSuccess(status) {
return status >= 200 && status < 300; return status >= 200 && status < 300;
@ -27,4 +27,4 @@ export function icanhazepoch() {
export function filterNot(array, item) { export function filterNot(array, item) {
return array.filter(it => it !== item); return array.filter(it => it !== item);
} }

10
src/main/resources/web/js/websocket.mjs → src/main/resources/web/js/websocket.js
View File

@ -1,7 +1,7 @@
import {authNotification} from "./notification.mjs"; import {authNotification} from "./notification.js";
import {checkFetchSuccess} from "./util.mjs"; import {checkFetchSuccess} from "./util.js";
import {findAccountByMcName} from "./account_manager.mjs"; import {findAccountByMcName} from "./account_manager.js";
import {addListeningList, addToast, renderActions, resetHtml, setListenVisible, setWsStatus} from "./page.mjs"; import {addListeningList, addToast, renderActions, resetHtml, setListenVisible, setWsStatus} from "./page.js";
let wsUrl = getWsUrl(); let wsUrl = getWsUrl();
let socket = null; let socket = null;
@ -135,4 +135,4 @@ export function sendSocket(msg) {
return return
} }
socket.send(msg); socket.send(msg);
} }