From ef3cc604c3ce72c240bebff17754588472098a3d Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Mon, 20 Sep 2021 07:24:18 +0300
Subject: [PATCH] fix node-fetch load on renderer

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/main/window-manager.ts |  2 --
 webpack.main.ts            | 37 -------------------------------------
 webpack.renderer.ts        |  5 ++++-
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts
index be6d71498e..80e3224fd4 100644
--- a/src/main/window-manager.ts
+++ b/src/main/window-manager.ts
@@ -31,7 +31,6 @@ import { IpcRendererNavigationEvents } from "../renderer/navigation/events";
 import logger from "./logger";
 import { productName } from "../common/vars";
 import { LensProxy } from "./lens-proxy";
-import * as path from "path";
 
 function isHideable(window: BrowserWindow | null): boolean {
   return Boolean(window && !window.isDestroyed());
@@ -85,7 +84,6 @@ export class WindowManager extends Singleton {
         titleBarStyle: "hiddenInset",
         backgroundColor: "#1e2124",
         webPreferences: {
-          preload: path.join(__static, "build", "preload.js"),
           nodeIntegration: true,
           nodeIntegrationInSubFrames: true,
           enableRemoteModule: true,
diff --git a/webpack.main.ts b/webpack.main.ts
index 33d9daf6af..9418d3bd5e 100755
--- a/webpack.main.ts
+++ b/webpack.main.ts
@@ -68,41 +68,4 @@ configs.push((): webpack.Configuration => {
   };
 });
 
-configs.push((): webpack.Configuration => {
-  console.info("WEBPACK:preload", vars);
-
-  return {
-    context: __dirname,
-    target: "electron-main",
-    mode: isProduction ? "production" : "development",
-    devtool: isProduction ? "source-map" : "cheap-eval-source-map",
-    cache: isDevelopment,
-    entry: {
-      main: path.resolve(preloadEntrypoint),
-    },
-    output: {
-      libraryTarget: "global",
-      path: buildDir,
-      filename: "preload.js"
-    },
-    resolve: {
-      extensions: [".json", ".js", ".ts"],
-      mainFields: ["main"]
-    },
-    module: {
-      rules: [
-        {
-          test: /\.node$/,
-          use: "node-loader"
-        },
-        getTSLoader(/\.ts$/)
-      ]
-    },
-    plugins: [
-      new ProgressBarPlugin(),
-      new ForkTsCheckerPlugin(),
-    ].filter(Boolean)
-  };
-});
-
 export default configs;
diff --git a/webpack.renderer.ts b/webpack.renderer.ts
index 5be6ba09dc..adce9e9a34 100755
--- a/webpack.renderer.ts
+++ b/webpack.renderer.ts
@@ -77,7 +77,10 @@ export function webpackLensRenderer({ showVars = true } = {}): webpack.Configura
       extensions: [
         ".js", ".jsx", ".json",
         ".ts", ".tsx",
-      ]
+      ],
+    },
+    externals: {
+      "node-fetch": "commonjs node-fetch"
     },
     optimization: {
       minimize: false