From ed559e94e147cd8996e8628302c81ace2efb7dbd Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Fri, 23 Jan 2026 10:30:06 -0500 Subject: [PATCH] Update Dev Companion --- src/plugins/devCompanion.dev/index.tsx | 2 +- src/plugins/devCompanion.dev/initWs.tsx | 2 ++ src/plugins/devCompanion.dev/util.tsx | 13 ++++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/plugins/devCompanion.dev/index.tsx b/src/plugins/devCompanion.dev/index.tsx index afe0730dc..178d5c681 100644 --- a/src/plugins/devCompanion.dev/index.tsx +++ b/src/plugins/devCompanion.dev/index.tsx @@ -23,7 +23,7 @@ import definePlugin, { OptionType, ReporterTestable } from "@utils/types"; import { initWs, socket, stopWs } from "./initWs"; export const PORT = 8485; -export const CLIENT_VERSION: readonly [major: number, minor: number, patch: number] = [0, 1, 1]; +export const CLIENT_VERSION: readonly [major: number, minor: number, patch: number] = [0, 1, 2]; export const logger = new Logger("DevCompanion"); diff --git a/src/plugins/devCompanion.dev/initWs.tsx b/src/plugins/devCompanion.dev/initWs.tsx index 4221a9fb7..27e77bb0b 100644 --- a/src/plugins/devCompanion.dev/initWs.tsx +++ b/src/plugins/devCompanion.dev/initWs.tsx @@ -329,6 +329,8 @@ export function initWs(isManual = false) { if (src.startsWith("function(")) { src = "0," + src; + } else if (src.charCodeAt(0) >= 49 /* 1*/ && src.charCodeAt(0) <= 57 /* 9*/) { + src = "0,function" + src.substring(src.indexOf("(")); } let i = 0; diff --git a/src/plugins/devCompanion.dev/util.tsx b/src/plugins/devCompanion.dev/util.tsx index 0002e7276..4fda47040 100644 --- a/src/plugins/devCompanion.dev/util.tsx +++ b/src/plugins/devCompanion.dev/util.tsx @@ -45,11 +45,22 @@ export function extractModule(id: PropertyKey, patched = companionSettings.store } return extractUnpatchedModule(id); } + +// FIXME: maybe update companion to support new style later +function getNormalizedModuleText(id_: PropertyKey): string { + const id = String(id_); + if (Number.isNaN(parseInt(String(id), 10))) { + throw new Error("can't normalize module with non-numeric id"); + } + const moduleText = wreq.m[id].toString(); + return "function" + moduleText.substring(moduleText.indexOf("(")); +} + function extractUnpatchedModule(id: PropertyKey): string { if (!wreq.m[id]) { throw new Error(`Module not found for id: ${String(id)}`); } - return `// Webpack Module ${String(id)} - Patched by\n0,${wreq.m[id]}\n//# sourceURL=WebpackModule${String(id)}`; + return `// Webpack Module ${String(id)} - Patched by\n0,${getNormalizedModuleText(id)}\n//# sourceURL=WebpackModule${String(id)}`; } /**