fix webpack

src/renderer/modules/webpack/patch-load.ts

@@ -71,18 +71,13 @@ function patchChunk(chunk: WebpackChunk): void {
  * @internal
  */
 function patchPush(webpackChunk: WebpackChunkGlobal): void {
-  let original = webpackChunk.push;
-
+  const original = webpackChunk.push.bind(webpackChunk);
   function handlePush(chunk: WebpackChunk): unknown {
     patchChunk(chunk);
-    return original.call(webpackChunk, chunk);
+    return original(chunk);
   }
 
-  Object.defineProperty(webpackChunk, "push", {
-    get: () => handlePush,
-    set: (v) => (original = v),
-    configurable: true,
-  });
+  webpackChunk.push = handlePush as WebpackChunkGlobal["push"];
 }
 
 /**
@@ -91,32 +86,29 @@ function patchPush(webpackChunk: WebpackChunkGlobal): void {
  * @internal
  */
 function loadWebpackModules(chunksGlobal: WebpackChunkGlobal): void {
+  // once the webpack loads the modules, wpRequire is patched and exported
   chunksGlobal.push([
     [Symbol("replugged")],
     {},
     (r: WebpackRequire) => {
       wpRequire = r;
+      wpRequire.d = (module: unknown, exports: Record<string, () => unknown>) => {
+        for (const prop in exports) {
+          if (
+            Object.hasOwnProperty.call(exports, prop) &&
+            !Object.hasOwnProperty.call(module, prop)
+          ) {
+            Object.defineProperty(module, prop, {
+              enumerable: true,
+              configurable: true,
+              get: () => exports[prop](),
+              set: (value) => (exports[prop] = () => value),
+            });
+          }
+        }
+      };
     },
   ]);
-  chunksGlobal.pop();
-
-  if (wpRequire) {
-    wpRequire.d = (module: unknown, exports: Record<string, () => unknown>) => {
-      for (const prop in exports) {
-        if (
-          Object.hasOwnProperty.call(exports, prop) &&
-          !Object.hasOwnProperty.call(module, prop)
-        ) {
-          Object.defineProperty(module, prop, {
-            enumerable: true,
-            configurable: true,
-            get: () => exports[prop](),
-            set: (value) => (exports[prop] = () => value),
-          });
-        }
-      }
-    };
-  }
 
   // Patch previously loaded chunks
   if (Array.isArray(chunksGlobal)) {

src/types/webpack.ts

@@ -27,14 +27,17 @@ export type WebpackModule = (
   wpRequire: WebpackRequire,
 ) => void;
 
-export type WebpackChunk = [Array<symbol | number>, Record<number, WebpackModule>];
+export type WebpackChunk = [
+  Array<symbol | number>,
+  Record<number, WebpackModule>,
+  ((r: WebpackRequire) => unknown)?,
+];
 
 // Do NOT put `WebpackChunk[]` first, otherwise TS
 // prioritizes Array.prototype.push over this custom
 // push method and starts producing errors.
 export type WebpackChunkGlobal = {
-  push(chunk: WebpackChunk): void;
-  push<T extends (r: WebpackRequire) => unknown>(chunk: [...WebpackChunk, T]): ReturnType<T>;
+  push(chunk: WebpackChunk): unknown;
 } & WebpackChunk[];
 
 export type Filter = (module: RawModule) => boolean | ModuleExports;