Update various build dependencies

Author: CommandMC

package.json

@@ -2,7 +2,7 @@
   "name": "heroic",
   "version": "2.7.0",
   "private": true,
-  "main": "build/electron/main.js",
+  "main": "build/main/main.js",
   "homepage": "./",
   "license": "GPL-3.0-only",
   "description": "An Open Source Launcher for GOG and Epic Games",
@@ -154,7 +154,7 @@
     "@mui/material": "^5.11.12",
     "@node-steam/vdf": "^2.2.0",
     "@shockpkg/icon-encoder": "^2.1.3",
-    "axios": "^0.26.1",
+    "axios": "^1.3.5",
     "check-disk-space": "^3.3.1",
     "classnames": "^2.3.1",
     "crc": "^4.3.2",
@@ -234,7 +234,7 @@
     "@types/tmp": "^0.2.3",
     "@typescript-eslint/eslint-plugin": "^5.47.1",
     "@typescript-eslint/parser": "^5.47.1",
-    "@vitejs/plugin-react-swc": "^3.2.0",
+    "@vitejs/plugin-react-swc": "^3.3.0",
     "electron": "^23.1.3",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
@@ -249,13 +249,13 @@
     "pretty-quick": "^3.1.3",
     "sass": "^1.59.2",
     "tmp": "^0.2.1",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.1.0",
     "ts-prune": "^0.10.3",
-    "type-fest": "^3.6.1",
-    "typescript": "^4.9.4",
+    "type-fest": "^3.8.0",
+    "typescript": "^5.0.4",
     "unimported": "^1.26.0",
-    "vite": "^3.2.5",
-    "vite-plugin-electron": "^0.10.2",
+    "vite": "^4.2.1",
+    "vite-plugin-electron": "^0.11.2",
     "vite-plugin-svgr": "^2.4.0"
   },
   "resolutions": {

src/backend/main_window.ts

@@ -62,7 +62,7 @@ export const createMainWindow = () => {
       contextIsolation: true,
       nodeIntegration: true,
       // sandbox: false,
-      preload: path.join(__dirname, 'preload.js')
+      preload: path.join(__dirname, '..', 'preload', 'preload.js')
     }
   })
 

src/backend/storeManagers/sideload/games.ts

@@ -91,7 +91,7 @@ const openNewBrowserGameWindow = async (
         webviewTag: true,
         contextIsolation: true,
         nodeIntegration: true,
-        preload: path.join(__dirname, 'preload.js')
+        preload: path.join(__dirname, '..', 'preload', 'preload.js')
       }
     })
 

src/backend/storeManagers/storeManagerCommon/games.ts

@@ -42,7 +42,7 @@ const openNewBrowserGameWindow = async (
         webviewTag: true,
         contextIsolation: true,
         nodeIntegration: true,
-        preload: path.join(__dirname, 'preload.js')
+        preload: path.join(__dirname, '..', 'preload', 'preload.js')
       }
     })
 

src/frontend/components/UI/Sidebar/index.tsx

@@ -8,7 +8,7 @@ import { DMQueueElement } from 'common/types'
 
 import { ReactComponent as HeroicIcon } from 'frontend/assets/heroic-icon.svg'
 
-let sidebarSize = localStorage.getItem('sidebar-width') || 240
+let sidebarSize = Number(localStorage.getItem('sidebar-width')) || 240
 const minWidth = 60
 const maxWidth = 400
 const collapsedWidth = 120

tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "ignoreDeprecations": "5.0",
     "module": "esnext",
     "target": "es2017",
     "lib": ["esnext", "dom", "dom.iterable"],

vite.config.ts

@@ -1,53 +1,61 @@
-import { defineConfig, UserConfigExport } from 'vite'
+import { defineConfig, BuildOptions } from 'vite'
 import electron from 'vite-plugin-electron'
 import react from '@vitejs/plugin-react-swc'
 import svgr from 'vite-plugin-svgr'
-import path from 'path'
+import * as path from 'path'
 
 const srcAliases = ['backend', 'frontend', 'common'].map((srcFolder) => {
   return {
     find: srcFolder,
     replacement: path.resolve(__dirname, `./src/${srcFolder}`)
   }
 })
+srcAliases.push({
+  find: '~@fontsource',
+  replacement: path.resolve(__dirname, 'node_modules/@fontsource')
+})
 
-const electronViteConfig: UserConfigExport = {
-  build: { outDir: 'build/electron', target: 'esnext' },
-  resolve: {
-    alias: [
-      {
-        find: '~@fontsource',
-        replacement: path.resolve(__dirname, 'node_modules/@fontsource')
-      },
-      ...srcAliases
-    ]
-  }
+const otherBuildOptions: BuildOptions = {
+  reportCompressedSize: false,
+  target: 'esnext'
 }
 
 export default defineConfig({
   build: {
-    target: 'esnext',
-    outDir: 'build'
+    outDir: 'build',
+    ...otherBuildOptions
   },
   resolve: {
-    alias: [
-      {
-        find: '~@fontsource',
-        replacement: path.resolve(__dirname, 'node_modules/@fontsource')
-      },
-      ...srcAliases
-    ]
+    alias: srcAliases
   },
   plugins: [
     react(),
     electron([
       {
         entry: 'src/backend/main.ts',
-        vite: electronViteConfig
+        vite: {
+          build: {
+            outDir: 'build/main',
+            ...otherBuildOptions
+          },
+          resolve: {
+            alias: srcAliases
+          },
+          clearScreen: false
+        }
       },
       {
         entry: 'src/backend/preload.ts',
-        vite: electronViteConfig,
+        vite: {
+          build: {
+            outDir: 'build/preload',
+            ...otherBuildOptions
+          },
+          resolve: {
+            alias: srcAliases
+          },
+          clearScreen: false
+        },
         onstart: ({ reload }) => reload()
       }
     ]),