From c985480fb9062532b5d50bc8d951770fff347825 Mon Sep 17 00:00:00 2001 From: Zack Rauen Date: Thu, 26 Oct 2023 14:06:34 -0400 Subject: [PATCH] Fix patchable modules --- preload/src/patcher.js | 32 +++++++++++--------------- renderer/src/modules/webpackmodules.js | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/preload/src/patcher.js b/preload/src/patcher.js index 09fab12a..7bbd26e2 100644 --- a/preload/src/patcher.js +++ b/preload/src/patcher.js @@ -34,24 +34,20 @@ export default function () { if (!Reflect.has(window, chunkName)) { predefine(window, chunkName, instance => { - predefine(instance, "push", () => { - instance.push([[Symbol()], {}, require => { - require.d = (target, exports) => { - for (const key in exports) { - if (!Reflect.has(exports, key) || target[key]) continue; - - Object.defineProperty(target, key, { - get: () => exports[key](), - set: v => {exports[key] = () => v;}, - enumerable: true, - configurable: true - }); - } - }; - }]); - - instance.pop(); - }); + instance.push([[Symbol()], {}, require => { + require.d = (target, exports) => { + for (const key in exports) { + if (!Reflect.has(exports, key) || target[key]) continue; + + Object.defineProperty(target, key, { + get: () => exports[key](), + set: v => {exports[key] = () => v;}, + enumerable: true, + configurable: true + }); + } + }; + }]); }); } }; diff --git a/renderer/src/modules/webpackmodules.js b/renderer/src/modules/webpackmodules.js index dc1fdea4..da646646 100644 --- a/renderer/src/modules/webpackmodules.js +++ b/renderer/src/modules/webpackmodules.js @@ -190,7 +190,7 @@ export default class WebpackModules { if (!modules.hasOwnProperty(index)) continue; let module = null; - try {module = modules[index]} catch {continue;}; + try {module = modules[index];} catch {continue;} const {exports} = module; if (!exports || exports === window || exports === document.documentElement || exports[Symbol.toStringTag] === "DOMTokenList") continue;