diff --git a/scripts/generateReport.ts b/scripts/generateReport.ts index 2d72d5df9..67b833c61 100644 --- a/scripts/generateReport.ts +++ b/scripts/generateReport.ts @@ -529,9 +529,21 @@ async function runtime(token: string) { parsedArgs === args && ["waitFor", "find", "findComponent", "webpackDependantLazy", "webpackDependantLazyComponent"].includes(searchType) ) { - logMessage += `(${parsedArgs[0].toString().slice(0, 147)}...)`; + let filter = parsedArgs[0].toString(); + if (filter.length > 150) { + filter = filter.slice(0, 147) + "..."; + } + + logMessage += `(${filter})`; } else if (searchType === "extractAndLoadChunks") { - logMessage += `([${parsedArgs[0].map((arg: any) => `"${arg}"`).join(", ")}], ${parsedArgs[1].toString()})`; + let regexStr: string; + if (parsedArgs[1] === Vencord.Webpack.DefaultExtractAndLoadChunksRegex) { + regexStr = "DefaultExtractAndLoadChunksRegex"; + } else { + regexStr = parsedArgs[1].toString(); + } + + logMessage += `([${parsedArgs[0].map((arg: any) => `"${arg}"`).join(", ")}], ${regexStr})`; } else { logMessage += `(${filterName.length ? `${filterName}(` : ""}${parsedArgs.map(arg => `"${arg}"`).join(", ")})${filterName.length ? ")" : ""}`; } diff --git a/src/webpack/webpack.tsx b/src/webpack/webpack.tsx index 666f82a09..d3a3577cb 100644 --- a/src/webpack/webpack.tsx +++ b/src/webpack/webpack.tsx @@ -614,7 +614,7 @@ export const findAll = deprecatedRedirect("findAll", "cacheFindAll", cacheFindAl */ export const findBulk = deprecatedRedirect("findBulk", "cacheFindBulk", cacheFindBulk); -const DefaultExtractAndLoadChunksRegex = /(?:Promise\.all\((\[\i\.\i\(".+?"\).+?\])\)|Promise\.resolve\(\)).then\(\i\.bind\(\i,"(.+?)"\)\)/; +export const DefaultExtractAndLoadChunksRegex = /(?:Promise\.all\((\[\i\.\i\(".+?"\).+?\])\)|Promise\.resolve\(\)).then\(\i\.bind\(\i,"(.+?)"\)\)/; /** * Extract and load chunks using their entry point.