From b8fc16891899f53e88fbe23dba14d9d2f5db16ce Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Sat, 6 Jul 2024 17:45:46 -0700
Subject: [PATCH] minor

---
 electron/webpack.config.js | 2 +-
 package.json               | 3 ++-
 yarn.lock                  | 7 +------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/electron/webpack.config.js b/electron/webpack.config.js
index 8f126d6..8261d17 100644
--- a/electron/webpack.config.js
+++ b/electron/webpack.config.js
@@ -25,7 +25,7 @@ const mainConfig = {
                     transpileOnly: true
                 }
             },
-            {test: path.join(__dirname, 'package.json'), loader: 'json-loader', options: {name: 'package.json'}, type: 'javascript/auto'},
+            {test: path.join(__dirname, 'package.json'), loader: 'file-loader', options: {name: 'package.json'}, type: 'javascript/auto'},
             {test: /\.(png|ico|html)$/, loader: 'file-loader', options: {name: '[name].[ext]'}},
             {test: /\.raw\.js$/, loader: 'raw-loader'}
         ]
diff --git a/package.json b/package.json
index 22e7117..cbd5fb5 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "author": "The F-List Team and and Mister Stallion (Esq.)",
   "description": "A heavily modded F-Chat 3.0 client for F-List",
   "license": "MIT",
+  "main": "main.js",
   "devDependencies": {
     "@electron/remote": "^2.0.11",
     "@f-list/fork-ts-checker-webpack-plugin": "^3.1.1",
@@ -33,7 +34,6 @@
     "electron-settings": "~4.0.2",
     "extract-loader": "^5.1.0",
     "file-loader": "^6.2.0",
-    "json-loader": "^0.5.7",
     "lodash": "^4.17.20",
     "sass": "^1.68.0",
     "optimize-css-assets-webpack-plugin": "^5.0.4",
@@ -60,6 +60,7 @@
   },
   "dependencies": {
     "@cliqz/adblocker-electron": "~1.27.11",
+    "@cliqz/adblocker-electron-preload": "~1.27.11",
     "jquery": "^3.7.1",
     "node-fetch": "^2.7.0"
   },
diff --git a/yarn.lock b/yarn.lock
index f90c9e7..3fbc158 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,7 +32,7 @@
   dependencies:
     "@cliqz/adblocker-extended-selectors" "^1.27.11"
 
-"@cliqz/adblocker-electron-preload@^1.27.11":
+"@cliqz/adblocker-electron-preload@^1.27.11", "@cliqz/adblocker-electron-preload@~1.27.11":
   version "1.27.11"
   resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.27.11.tgz#704f8bd2983c48c839eec500a13219eb68ef14d4"
   integrity sha512-c5UOknqMGUYlzkxTaTwCsoH3ooABW0WhLQl/Arc6HAFOt1HikUq4loty10x3mOi7/UTN9Oqa5nadSUq8ooiq3Q==
@@ -4393,11 +4393,6 @@ json-buffer@3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-loader@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
-  integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
-
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"