From 022b8fa38095b7b7fb8b2e6583f73cf95440ca01 Mon Sep 17 00:00:00 2001 From: Neodymium <68879269+Neodymium7@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:39:55 -0700 Subject: [PATCH] Fix module search warnings (#1608) - Fix module search warnings - Add checks to other methods - Fixes #1589 --- renderer/src/modules/webpackmodules.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/renderer/src/modules/webpackmodules.js b/renderer/src/modules/webpackmodules.js index 287c38a0..051ed72e 100644 --- a/renderer/src/modules/webpackmodules.js +++ b/renderer/src/modules/webpackmodules.js @@ -164,9 +164,9 @@ export default class WebpackModules { try {module = modules[index]} catch {continue;}; const {exports} = module; - if (!exports || exports === window || exports === document.documentElement) continue; + if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") continue; - if (typeof(exports) === "object" && searchExports && exports[Symbol.toStringTag] !== "DOMTokenList") { + if (typeof(exports) === "object" && searchExports && !exports.TypedArray) { for (const key in exports) { let foundModule = null; let wrappedExport = null; @@ -215,7 +215,7 @@ export default class WebpackModules { if (!modules.hasOwnProperty(index)) continue; const module = modules[index]; const {exports} = module; - if (!exports || exports === window || exports === document.documentElement) continue; + if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") continue; for (let q = 0; q < queries.length; q++) { const query = queries[q]; @@ -225,7 +225,7 @@ export default class WebpackModules { const wrappedFilter = wrapFilter(filter); - if (typeof(exports) === "object" && searchExports) { + if (typeof(exports) === "object" && searchExports && !exports.TypedArray) { for (const key in exports) { let foundModule = null; const wrappedExport = exports[key]; @@ -350,10 +350,10 @@ export default class WebpackModules { return new Promise((resolve) => { const cancel = () => this.removeListener(listener); const listener = function(exports) { - if (!exports || exports === window || exports === document.documentElement) return; + if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") return; let foundModule = null; - if (typeof(exports) === "object" && searchExports) { + if (typeof(exports) === "object" && searchExports && !exports.TypedArray) { for (const key in exports) { foundModule = null; const wrappedExport = exports[key];