ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

Clean up Webpack ComponentWrapper

Browse source
This commit is contained in:
Nuckyz 2024-05-06 23:22:36 -03:00
parent 12c9c324a1
commit 886071af4d
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/webpack/webpack.tsx
View file

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