Merge branch 'main' of github.com:Heroic-Games-Launcher/HeroicGamesLa…

…uncher into refactor/wine_download

src/backend/tools/index.ts

@@ -10,7 +10,7 @@ import {
   rm
 } from 'graceful-fs'
 import { exec, spawn } from 'child_process'
-import { downloadFile, execAsync, getWineFromProton } from './utils'
+import { downloadFile, execAsync, getWineFromProton } from '../utils'
 import {
   execOptions,
   toolsPath,
@@ -38,9 +38,10 @@ import {
   get_vulkan_instance_version
 } from '../utils/graphics/vulkan'
 import { lt as semverLt } from 'semver'
-import { gameManagerMap } from './storeManagers'
-import { createAbortController } from './utils/aborthandler/aborthandler'
+import { createAbortController } from '../utils/aborthandler/aborthandler'
 import { mkdir } from 'fs'
+import { gameManagerMap } from '../storeManagers'
+import { sendFrontendMessage } from '../main_window'
 
 export const DXVK = {
   getLatest: async () => {
@@ -146,7 +147,7 @@ export const DXVK = {
               )
             })
         })
-        .catch((error) => {
+        .catch((error: string) => {
           logWarning(
             [`Error when downloading ${tool.name}`, error],
             LogPrefix.DXVKInstaller

yarn.lock

@@ -3407,15 +3407,10 @@ duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-easydl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/easydl/-/easydl-1.1.0.tgz#99bdaf0599686800450c043fd86e37fb0dc5f699"
-  integrity sha512-TSW/RRbgniHVqFFvyzmIhWNRulEZ2tJdZ7Ns1qn54yQAxg6afPPvtFUF1n9UdLRa9QWtutLrHtnJGA6ogE3PGQ==
-
-ejs@^3.1.7:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
-  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+ejs@^3.1.8:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
+  integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
   dependencies:
     jake "^10.8.5"