From 510bfb8fa32ca3b94bd17e57d57b4d658838adde Mon Sep 17 00:00:00 2001 From: maisy Date: Sat, 9 Dec 2023 20:36:58 +0000 Subject: [PATCH] ReactErrorDecoder: fix using wrong react version's error map (#2040) Co-authored-by: V --- src/plugins/reactErrorDecoder/index.ts | 9 +++++---- src/utils/constants.ts | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/plugins/reactErrorDecoder/index.ts b/src/plugins/reactErrorDecoder/index.ts index 2332d457..9e2e5dc5 100644 --- a/src/plugins/reactErrorDecoder/index.ts +++ b/src/plugins/reactErrorDecoder/index.ts @@ -18,27 +18,28 @@ import { Devs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { React } from "@webpack/common"; let ERROR_CODES: any; -const CODES_URL = - "https://raw.githubusercontent.com/facebook/react/17.0.2/scripts/error-codes/codes.json"; export default definePlugin({ name: "ReactErrorDecoder", description: 'Replaces "Minifed React Error" with the actual error.', - authors: [Devs.Cyn], + authors: [Devs.Cyn, Devs.maisymoe], patches: [ { find: '"https://reactjs.org/docs/error-decoder.html?invariant="', replacement: { match: /(function .\(.\)){(for\(var .="https:\/\/reactjs\.org\/docs\/error-decoder\.html\?invariant="\+.,.=1;. - `${func}{var decoded=Vencord.Plugins.plugins.ReactErrorDecoder.decodeError.apply(null, arguments);if(decoded)return decoded;${original}}`, + `${func}{var decoded=$self.decodeError.apply(null, arguments);if(decoded)return decoded;${original}}`, }, }, ], async start() { + const CODES_URL = `https://raw.githubusercontent.com/facebook/react/v${React.version}/scripts/error-codes/codes.json`; + ERROR_CODES = await fetch(CODES_URL) .then(res => res.json()) .catch(e => console.error("[ReactErrorDecoder] Failed to fetch React error codes\n", e)); diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 1c477b12..2962df06 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -395,6 +395,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({ name: "Korbo", id: 455856406420258827n }, + maisymoe: { + name: "maisy", + id: 257109471589957632n, + }, } satisfies Record); // iife so #__PURE__ works correctly