Better patch errors

This commit is contained in:
Vendicated 2022-09-02 05:11:45 +02:00
parent 138682f3eb
commit 5488f5cecb
No known key found for this signature in database
GPG key ID: EC781ADFB93EFFA3

View file

@ -6,7 +6,6 @@ let webpackChunk: any[];
const logger = new Logger("WebpackInterceptor", "#8caaee"); const logger = new Logger("WebpackInterceptor", "#8caaee");
Object.defineProperty(window, WEBPACK_CHUNK, { Object.defineProperty(window, WEBPACK_CHUNK, {
get: () => webpackChunk, get: () => webpackChunk,
set: (v) => { set: (v) => {
@ -87,12 +86,16 @@ function patchPush() {
logger.warn(`Patch by ${patch.plugin} had no effect: ${replacement.match}`); logger.warn(`Patch by ${patch.plugin} had no effect: ${replacement.match}`);
logger.debug("Function Source:\n", code); logger.debug("Function Source:\n", code);
} else { } else {
const newMod = (0, eval)(`// Webpack Module ${id} - Patched by ${[...patchedBy].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${id}`);
code = newCode; code = newCode;
mod = newMod; mod = (0, eval)(`// Webpack Module ${id} - Patched by ${[...patchedBy].join(", ")}\n${newCode}\n//# sourceURL=WebpackModule${id}`);
} }
} catch (err) { } catch (err) {
// TODO - More meaningful errors. This probably means moving away from string.replace
// in favour of manual matching. Then cut out the context and log some sort of
// diff
logger.error("Failed to apply patch of", patch.plugin, err); logger.error("Failed to apply patch of", patch.plugin, err);
logger.debug("Original Source\n", lastCode);
logger.debug("Patched Source\n", code);
code = lastCode; code = lastCode;
mod = lastMod; mod = lastMod;
patchedBy.delete(patch.plugin); patchedBy.delete(patch.plugin);