cswimr/Vencord
1
0
Fork 0
forked from CoastalCommitsArchival/github.com-Vendicated-Vencord
Code Pull requests Packages 1 Wiki Activity

fix extractAndLoadChunks

Browse source
This commit is contained in:
Nuckyz 2023-11-26 01:00:10 -03:00
parent c8be348570
commit a5284c6acb
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/webpack/webpack.ts
View file

@ -19,6 +19,7 @@
import { proxyLazy } from "@utils/lazy"; import { proxyLazy } from "@utils/lazy";
import { LazyComponent } from "@utils/lazyReact"; import { LazyComponent } from "@utils/lazyReact";
import { Logger } from "@utils/Logger"; import { Logger } from "@utils/Logger";
import { canonicalizeMatch } from "@utils/patches";
import type { WebpackInstance } from "discord-types/other"; import type { WebpackInstance } from "discord-types/other";
import { traceFunction } from "../debug/Tracer"; import { traceFunction } from "../debug/Tracer";
@ -411,11 +412,17 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
*/ */
export async function extractAndLoadChunks(code: string[], matcher: RegExp) { export async function extractAndLoadChunks(code: string[], matcher: RegExp) {
const module = findModuleFactory(...code); const module = findModuleFactory(...code);
if (!module) {
const err = new Error("extractAndLoadChunks: Couldn't find module factory");
logger.warn(err, "Code:", code, "Matcher:", matcher);
const match = module.toString().match(matcher); return;
}
const match = module.toString().match(canonicalizeMatch(matcher));
if (!match) { if (!match) {
const err = new Error("extractAndLoadChunks: Couldn't find entry point id in module factory code"); const err = new Error("extractAndLoadChunks: Couldn't find entry point id in module factory code");
logger.warn(err); logger.warn(err, "Code:", code, "Matcher:", matcher);
// Strict behaviour in DevBuilds to fail early and make sure the issue is found // Strict behaviour in DevBuilds to fail early and make sure the issue is found
if (IS_DEV && !devToolsOpen) if (IS_DEV && !devToolsOpen)
@ -425,7 +432,9 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp) {
} }
const [, id] = match; const [, id] = match;
return (wreq as any).el(id).then(wreq.bind(wreq, id as any));
await (wreq as any).el(id);
return wreq(id as any);
} }
/** /**
@ -436,7 +445,7 @@ export async function extractAndLoadChunks(code: string[], matcher: RegExp) {
* @param matcher A RegExp that returns the entry point id as the first capture group * @param matcher A RegExp that returns the entry point id as the first capture group
* @returns A function that loads the chunks on first call * @returns A function that loads the chunks on first call
*/ */
export async function extractAndLoadChunksLazy(code: string[], matcher: RegExp) { export function extractAndLoadChunksLazy(code: string[], matcher: RegExp) {
if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]); if (IS_DEV) lazyWebpackSearchHistory.push(["extractAndLoadChunks", [code, matcher]]);
return () => extractAndLoadChunks(code, matcher); return () => extractAndLoadChunks(code, matcher);