From f5f6f567383711dc1092d86c8d65cd5511df13b8 Mon Sep 17 00:00:00 2001 From: programminglaboratorys Date: Sat, 8 Jun 2024 13:21:05 +0300 Subject: [PATCH] resolving conflicts --- src/debug/loadLazyChunks.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/debug/loadLazyChunks.ts b/src/debug/loadLazyChunks.ts index 38f171061..0aeae732b 100644 --- a/src/debug/loadLazyChunks.ts +++ b/src/debug/loadLazyChunks.ts @@ -47,19 +47,11 @@ export async function loadLazyChunks() { for (const id of chunkIds) { if (wreq.u(id) == null || wreq.u(id) === "undefined.js") continue; -<<<<<<< HEAD - const isWasm = await fetch(wreq.p + wreq.u(id)) - .then(r => r.text()) - .then(t => (IS_WEB && t.includes(".module.wasm")) || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push")); - - if (isWasm && IS_WEB) { -======= const isWorkerAsset = await fetch(wreq.p + wreq.u(id)) .then(r => r.text()) .then(t => t.includes("importScripts(")); if (isWorkerAsset) { ->>>>>>> dev invalidChunks.add(id); invalidChunkGroup = true; continue; @@ -157,15 +149,6 @@ export async function loadLazyChunks() { }); await Promise.all(chunksLeft.map(async id => { -<<<<<<< HEAD - const isWasm = await fetch(wreq.p + wreq.u(id)) - .then(r => r.text()) - .then(t => (IS_WEB && t.includes(".module.wasm")) || !t.includes("(this.webpackChunkdiscord_app=this.webpackChunkdiscord_app||[]).push")); - - // Loads and requires a chunk - if (!isWasm) { - await wreq.e(id as any); -======= const isWorkerAsset = await fetch(wreq.p + wreq.u(id)) .then(r => r.text()) .then(t => t.includes("importScripts(")); @@ -175,7 +158,6 @@ export async function loadLazyChunks() { await wreq.e(id as any); // Technically, the id of the chunk does not match the entry point // But, still try it because we have no way to get the actual entry point ->>>>>>> dev if (wreq.m[id]) wreq(id as any); } }));