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

apply code suggestions

Browse source
This commit is contained in:
Nuckyz 2023-11-26 00:23:50 -03:00
parent 717b400f2e
commit 617d55dd0d
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
1 changed files with 61 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/webpack/webpack.ts
View file

@ -201,11 +201,13 @@ export const findBulk = traceFunction("findBulk", function findBulk(...filterFns
if (found !== length) { if (found !== length) {
const err = new Error(`Got ${length} filters, but only found ${found} modules!`); const err = new Error(`Got ${length} filters, but only found ${found} modules!`);
logger.warn(err); if (IS_DEV) {
if (!devToolsOpen)
// 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) throw err;
throw err; } else {
logger.warn(err);
}
} }
return results; return results;
@ -219,7 +221,7 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
const filter = filters.byCode(...code); const filter = filters.byCode(...code);
for (const id in wreq.m) { for (const id in wreq.m) {
const mod = wreq.m[id].original ?? wreq.m[id]; const mod = wreq.m[id];
if (filter(mod)) { if (filter(mod)) {
return id; return id;
@ -227,11 +229,13 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
} }
const err = new Error("Didn't find module with code(s):\n" + code.join("\n")); const err = new Error("Didn't find module with code(s):\n" + code.join("\n"));
logger.warn(err); if (IS_DEV) {
if (!devToolsOpen)
// 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) throw err;
throw err; } else {
logger.warn(err);
}
return null; return null;
}); });
@ -240,11 +244,11 @@ export const findModuleId = traceFunction("findModuleId", function findModuleId(
* Find the first module factory that includes all the given code * Find the first module factory that includes all the given code
* @returns The module factory or null * @returns The module factory or null
*/ */
export function findModule(...code: string[]) { export function findModuleFactory(...code: string[]) {
const id = findModuleId(...code); const id = findModuleId(...code);
if (!id) return null; if (!id) return null;
return wreq.m[id].original ?? wreq.m[id]; return wreq.m[id];
} }
export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack" | "extractAndLoadChunks", any[]]>; export const lazyWebpackSearchHistory = [] as Array<["find" | "findByProps" | "findByCode" | "findStore" | "findComponent" | "findComponentByCode" | "findExportedComponent" | "waitFor" | "waitForComponent" | "waitForStore" | "proxyLazyWebpack" | "LazyComponentWebpack" | "extractAndLoadChunks", any[]]>;
@ -290,17 +294,15 @@ export function findLazy(filter: FilterFn) {
return proxyLazy(() => find(filter)); return proxyLazy(() => find(filter));
} }
function indirectFind(name: string, filter: FilterFn) {
const res = find(filter, { isIndirect: true });
if (!res)
handleModuleNotFound(name, filter);
return res;
}
/** /**
* Find the first module that has the specified properties * Find the first module that has the specified properties
*/ */
export const findByProps = (...props: string[]) => indirectFind("findByProps", filters.byProps(...props)); export function findByProps(...props: string[]) {
const res = find(filters.byProps(...props), { isIndirect: true });
if (!res)
handleModuleNotFound("findByProps", ...props);
return res;
}
/** /**
* Find the first module that has the specified properties, lazily * Find the first module that has the specified properties, lazily
@ -314,7 +316,12 @@ export function findByPropsLazy(...props: string[]) {
/** /**
* Find the first function that includes all the given code * Find the first function that includes all the given code
*/ */
const findByCode = (...code: string[]) => indirectFind("findByCode", filters.byCode(...code)); export function findByCode(...code: string[]) {
const res = find(filters.byCode(...code), { isIndirect: true });
if (!res)
handleModuleNotFound("findByCode", ...code);
return res;
}
/** /**
* Find the first function that includes all the given code, lazily * Find the first function that includes all the given code, lazily
@ -328,7 +335,12 @@ export function findByCodeLazy(...code: string[]) {
/** /**
* Find a store by its displayName * Find a store by its displayName
*/ */
export const findStore = (name: string) => indirectFind("findStore", filters.byStoreName(name)); export function findStore(name: string) {
const res = find(filters.byStoreName(name), { isIndirect: true });
if (!res)
handleModuleNotFound("findStore", name);
return res;
}
/** /**
* Find a store by its displayName, lazily * Find a store by its displayName, lazily
@ -342,7 +354,12 @@ export function findStoreLazy(name: string) {
/** /**
* Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs * Finds the component which includes all the given code. Checks for plain components, memos and forwardRefs
*/ */
export const findComponentByCode = (...code: string[]) => indirectFind("findComponentByCode", filters.componentByCode(...code)); export function findComponentByCode(...code: string[]) {
const res = find(filters.componentByCode(...code), { isIndirect: true });
if (!res)
handleModuleNotFound("findComponentByCode", ...code);
return res;
}
/** /**
* Finds the first component that matches the filter, lazily. * Finds the first component that matches the filter, lazily.
@ -350,7 +367,13 @@ export const findComponentByCode = (...code: string[]) => indirectFind("findComp
export function findComponentLazy<T extends object = any>(filter: FilterFn) { export function findComponentLazy<T extends object = any>(filter: FilterFn) {
if (IS_DEV) lazyWebpackSearchHistory.push(["findComponent", [filter]]); if (IS_DEV) lazyWebpackSearchHistory.push(["findComponent", [filter]]);
return LazyComponent<T>(() => indirectFind("findComponent", filter));
return LazyComponent<T>(() => {
const res = find(filter, { isIndirect: true });
if (!res)
handleModuleNotFound("findComponent", filter);
return res;
});
} }
/** /**
@ -359,7 +382,12 @@ export function findComponentLazy<T extends object = any>(filter: FilterFn) {
export function findComponentByCodeLazy<T extends object = any>(...code: string[]) { export function findComponentByCodeLazy<T extends object = any>(...code: string[]) {
if (IS_DEV) lazyWebpackSearchHistory.push(["findComponentByCode", code]); if (IS_DEV) lazyWebpackSearchHistory.push(["findComponentByCode", code]);
return LazyComponent<T>(() => indirectFind("findComponentByCode", filters.componentByCode(...code))); return LazyComponent<T>(() => {
const res = find(filters.componentByCode(...code), { isIndirect: true });
if (!res)
handleModuleNotFound("findComponentByCode", ...code);
return res;
});
} }
/** /**
@ -368,7 +396,12 @@ export function findComponentByCodeLazy<T extends object = any>(...code: string[
export function findExportedComponentLazy<T extends object = any>(...props: string[]) { export function findExportedComponentLazy<T extends object = any>(...props: string[]) {
if (IS_DEV) lazyWebpackSearchHistory.push(["findExportedComponent", props]); if (IS_DEV) lazyWebpackSearchHistory.push(["findExportedComponent", props]);
return LazyComponent<T>(() => indirectFind("findExportedComponent", filters.byProps(...props))?.[props[0]]); return LazyComponent<T>(() => {
const res = find(filters.byProps(...props), { isIndirect: true });
if (!res)
handleModuleNotFound("findExportedComponent", ...props);
return res[props[0]];
});
} }
/** /**
@ -377,7 +410,7 @@ export function findExportedComponentLazy<T extends object = any>(...props: stri
* @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
*/ */
export async function extractAndLoadChunks(code: string[], matcher: RegExp) { export async function extractAndLoadChunks(code: string[], matcher: RegExp) {
const module = findModule(...code); const module = findModuleFactory(...code);
const match = module.toString().match(matcher); const match = module.toString().match(matcher);
if (!match) { if (!match) {