webpack: ignore window in findAll and waitFor

Vendicated · May 29, 2024 · 24b67cf · 24b67cf
1 parent da01237
commit 24b67cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/webpack/patchWebpack.ts b/src/webpack/patchWebpack.ts
@@ -229,10 +229,10 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re
 
             for (const [filter, callback] of subscriptions) {
                 try {
-                    if (filter(exports)) {
+                    if (exports && exports !== window && filter(exports)) {
                         subscriptions.delete(filter);
                         callback(exports, id);
-                    } else if (exports.default && filter(exports.default)) {
+                    } else if (exports.default && exports.default !== window && filter(exports.default)) {
                         subscriptions.delete(filter);
                         callback(exports.default, id);
                     }

diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
@@ -132,12 +132,12 @@ export function findAll(filter: FilterFn) {
     const ret = [] as any[];
     for (const key in cache) {
         const mod = cache[key];
-        if (!mod?.exports) continue;
+        if (!mod?.exports || mod.exports === window) continue;
 
         if (filter(mod.exports))
             ret.push(mod.exports);
 
-        if (mod.exports.default && filter(mod.exports.default))
+        if (mod.exports.default && mod.exports.default !== window && filter(mod.exports.default))
             ret.push(mod.exports.default);
     }