From 886071af4d5a76db5012ed411f2875e0298fa8a2 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Mon, 6 May 2024 23:22:36 -0300
Subject: [PATCH] Clean up Webpack ComponentWrapper

---
 src/webpack/webpack.tsx | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/webpack/webpack.tsx b/src/webpack/webpack.tsx
index 23b3e0992..f8945c28b 100644
--- a/src/webpack/webpack.tsx
+++ b/src/webpack/webpack.tsx
@@ -189,20 +189,16 @@ export function findComponent<T extends object = any>(filter: FilterFn, parse: (
 
     if (IS_DEV && !isIndirect) webpackSearchHistory.push(["findComponent", [filter]]);
 
-    let noMatchLogged = false;
-    const NoopComponent = (() => {
-        if (!noMatchLogged) {
-            noMatchLogged = true;
+    let InnerComponent = null as null | React.ComponentType<T>;
+
+    let findFailedLogged = false;
+    const WrapperComponent = (props: T) => {
+        if (InnerComponent === null && !findFailedLogged) {
+            findFailedLogged = true;
             logger.error(`Webpack find matched no module. Filter: ${printFilter(filter)}`);
         }
 
-        return null;
-    }) as React.ComponentType<T>;
-
-    let InnerComponent = NoopComponent;
-
-    const WrapperComponent = (props: T) => {
-        return <InnerComponent {...props} />;
+        return InnerComponent && <InnerComponent {...props} />;
     };
 
     WrapperComponent.$$vencordGetter = () => InnerComponent;
@@ -213,7 +209,7 @@ export function findComponent<T extends object = any>(filter: FilterFn, parse: (
         Object.assign(InnerComponent, parsedComponent);
     }, { isIndirect: true });
 
-    if (InnerComponent !== NoopComponent) return InnerComponent;
+    if (InnerComponent !== null) return InnerComponent;
 
     return WrapperComponent;
 }
@@ -236,20 +232,16 @@ export function findExportedComponent<T extends object = any>(...props: string[]
 
     if (IS_DEV) webpackSearchHistory.push(["findExportedComponent", props]);
 
-    let noMatchLogged = false;
-    const NoopComponent = (() => {
-        if (!noMatchLogged) {
-            noMatchLogged = true;
+    let InnerComponent = null as null | React.ComponentType<T>;
+
+    let findFailedLogged = false;
+    const WrapperComponent = (props: T) => {
+        if (InnerComponent === null && !findFailedLogged) {
+            findFailedLogged = true;
             logger.error(`Webpack find matched no module. Filter: ${printFilter(filter)}`);
         }
 
-        return null;
-    }) as React.ComponentType<T>;
-
-    let InnerComponent = NoopComponent;
-
-    const WrapperComponent = (props: T) => {
-        return <InnerComponent {...props} />;
+        return InnerComponent && <InnerComponent {...props} />;
     };
 
     WrapperComponent.$$vencordGetter = () => InnerComponent;
@@ -260,7 +252,7 @@ export function findExportedComponent<T extends object = any>(...props: string[]
         Object.assign(InnerComponent, parsedComponent);
     }, { isIndirect: true });
 
-    if (InnerComponent !== NoopComponent) return InnerComponent;
+    if (InnerComponent !== null) return InnerComponent;
 
     return WrapperComponent as React.ComponentType<T>;
 }