Heroic-Games-Launcher · flavioislima · Aug 25, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,5 @@
-public/start-react.js
 i18next-parser.config.js
 flatpak/build/
 flatpak/.flatpak-builder/
+vite.config.ts
 **/__tests__/**
diff --git a/.eslintrc b/.eslintrc
@@ -18,7 +18,7 @@
     },
     "ecmaVersion": 12,
     "sourceType": "module",
-    "project": ["./tsconfig.json", "./electron/tsconfig.json"]
+    "project": ["./tsconfig.json"]
   },
   "plugins": ["react", "@typescript-eslint"],
   "settings": {

diff --git a/.github/workflows/build-prs-linux.yml b/.github/workflows/build-prs-linux.yml
@@ -23,6 +23,9 @@ jobs:
         run: yarn
       - name: Build artifacts.
         run: yarn dist appimage --publish=never
+        env:
+          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
       - name: Upload AppImage.
         uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/build-prs-mac.yml b/.github/workflows/build-prs-mac.yml
@@ -23,6 +23,9 @@ jobs:
         run: yarn
       - name: Build artifacts.
         run: yarn dist-mac --publish=never
+        env:
+          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
       - name: Upload DMG.
         uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/build-prs-windows.yml b/.github/workflows/build-prs-windows.yml
@@ -22,7 +22,10 @@ jobs:
       - name: Install modules.
         run: npm i --legacy-peer-deps
       - name: Build artifacts.
-        run: npm run dist-win portable
+        run: npm run dist-win portable --publish=never
+        env:
+          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
       - name: Upload EXE.
         uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/draft-release-linux-beta.yml b/.github/workflows/draft-release-linux-beta.yml
@@ -19,3 +19,4 @@ jobs:
       - run: npm run release:linux
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/draft-release-linux.yml b/.github/workflows/draft-release-linux.yml
@@ -20,3 +20,4 @@ jobs:
       - run: npm run release:linux
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/draft-release-mac-beta.yml b/.github/workflows/draft-release-mac-beta.yml
@@ -18,3 +18,4 @@ jobs:
       - run: npm run release:mac
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/draft-release-mac.yml b/.github/workflows/draft-release-mac.yml
@@ -19,3 +19,4 @@ jobs:
       - run: npm run release:mac
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/draft-release-win-beta.yml b/.github/workflows/draft-release-win-beta.yml
@@ -19,3 +19,4 @@ jobs:
       - run: npm run release:win
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/.github/workflows/draft-release-win.yml b/.github/workflows/draft-release-win.yml
@@ -20,3 +20,4 @@ jobs:
       - run: npm run release:win
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,5 @@ downloads*.json
 
 flatpak/build
 .flatpak-builder
+
+vite-plugin-electron.log
diff --git a/.prettierignore b/.prettierignore
@@ -2,6 +2,5 @@ node_modules
 dist
 build
 coverage
-public/index.html
 public/locales/
 flatpak
diff --git a/Procfile b/Procfile
diff --git a/electron/tsconfig.json b/electron/tsconfig.json
diff --git a/i18next-parser.config.js b/i18next-parser.config.js
@@ -28,7 +28,7 @@ module.exports = {
   indentation: 4,
   // Indentation of the catalog files
 
-  input: ['src/**/*.{ts,tsx}', 'electron/**/*.{ts,tsx}'],
+  input: ['src/**/*.{ts,tsx}'],
   // An array of globs that describe where to look for source files
   // relative to the location of the configuration file
 

diff --git a/index.html b/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Heroic Games Launcher</title>
+    <script type="module" src="/src/frontend/index.tsx"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+    <div class="simple-keyboard"></div>
+  </body>
+</html>
diff --git a/jest.config.js b/jest.config.js
@@ -1,16 +1,22 @@
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
 module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  globals: {
+    'ts-jest': {}
+  },
+
   collectCoverageFrom: ['**/*.{js,jsx,ts,tsx}', '!**/*.config.js'],
   coverageDirectory: '<rootDir>/coverage',
   coveragePathIgnorePatterns: [
     '<rootDir>/node_modules',
     '<rootDir>/public',
-    '<rootDir>/electron',
     '<rootDir>/dist',
     '<rootDir>/build',
     '<rootDir>/coverage'
   ],
   coverageReporters: ['text', 'html'],
-  projects: ['<rootDir>/electron'],
+  projects: ['<rootDir>/src/backend'],
 
   rootDir: '.'
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "heroic",
   "version": "2.4.0-beta.2",
   "private": true,
-  "main": "public/main.js",
+  "main": "build/electron/main.js",
   "homepage": "./",
   "license": "GPL-3.0-only",
   "description": "An Open Source Launcher for GOG and Epic Games",
@@ -30,9 +30,6 @@
       "build/icon-dark.png",
       "build/icon-light.png"
     ],
-    "directories": {
-      "buildResources": "public"
-    },
     "protocols": [
       {
         "name": "heroic",
@@ -156,7 +153,6 @@
     "react-dom": "17",
     "react-i18next": "^11.16.7",
     "react-router-dom": "^6.3.0",
-    "react-scripts": "^5.0.1",
     "shlex": "^2.1.2",
     "simple-keyboard": "^3.4.24",
     "source-map-support": "^0.5.21",
@@ -165,26 +161,19 @@
     "tslib": "^2.4.0"
   },
   "scripts": {
-    "start": "DISABLE_ESLINT_PLUGIN=true nf start -p 3000 && electron-start",
-    "electron-start": "ELECTRON_IS_DEV=1 node public/start-react",
-    "electron": "yarn build-electron && electron . --trace-warnings",
-    "react-start": "HOST=localhost BROWSER=none react-scripts start",
-    "react-start:win": "react-scripts start",
-    "build": "react-scripts build",
+    "dev": "vite",
+    "build": "vite build",
     "test": "jest --noStackTrace",
     "test-watch": "jest --watch --maxWorkers=25%",
     "test:ci": "jest --runInBand --silent",
-    "eject": "react-scripts eject",
-    "release:linux": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js -p always --linux deb AppImage rpm pacman tar.xz",
-    "release:mac": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js -p always --mac",
-    "release:win": "yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js -p always --win nsis portable",
-    "dist": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js --linux",
-    "dist-mac": "GH_TOKEN='${{ secrets.WORKFLOW_TOKEN }}' yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js --mac",
-    "dist-win": "yarn build-electron && yarn build && electron-builder -c.extraMetadata.main=build/main.js --win",
-    "lint": "eslint -c .eslintrc --ext .tsx,ts ./src && eslint -c .eslintrc --ext .ts ./electron",
-    "lint-fix": "eslint --fix -c .eslintrc --ext .tsx,ts ./src && eslint --fix -c .eslintrc --ext .ts ./electron",
-    "build-electron": "tsc --project electron/tsconfig.json",
-    "watch-electron": "tsc --watch --project electron/tsconfig.json",
+    "release:linux": "yarn build && electron-builder -p always --linux deb AppImage rpm pacman tar.xz",
+    "release:mac": "yarn build && electron-builder -p always --mac",
+    "release:win": "yarn build && electron-builder -p always --win nsis portable",
+    "dist": "yarn build && electron-builder --linux",
+    "dist-mac": "yarn build && electron-builder --mac",
+    "dist-win": "yarn build && electron-builder --win",
+    "lint": "eslint -c .eslintrc --ext .tsx,ts ./src",
+    "lint-fix": "eslint --fix -c .eslintrc --ext .tsx,ts ./src",
     "dist-flatpak": "cd flatpak && flatpak-builder build local.heroic.yml --install --force-clean --user",
     "flatpak-test": "yarn dist appimage && cd flatpak && flatpak-builder build local.heroic.yml --install --force-clean --user",
     "i18n": "i18next",
@@ -215,29 +204,24 @@
     "@types/tmp": "^0.2.3",
     "@typescript-eslint/eslint-plugin": "^5.20.0",
     "@typescript-eslint/parser": "^5.20.0",
+    "@vitejs/plugin-react": "^2.0.0",
     "electron": "^19.0.9",
     "electron-builder": "^23.1.0",
     "electron-devtools-installer": "^3.2.0",
     "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-react": "^7.29.4",
-    "foreman": "^3.0.1",
     "husky": "^7.0.4",
     "i18next-parser": "^6.3.0",
+    "jest": "^28.1.3",
     "prettier": "^2.6.2",
     "pretty-quick": "^3.1.3",
     "tmp": "^0.2.1",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.6.3"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version"
-    ]
+    "ts-jest": "^28.0.7",
+    "typescript": "^4.6.3",
+    "vite": "^3.0.3",
+    "vite-plugin-electron": "^0.8.3",
+    "vite-plugin-svgr": "^2.2.1",
+    "vite-tsconfig-paths": "^3.5.0"
   }
 }
diff --git a/electron/__mocks__/electron-store.ts → src/backend/__mocks__/electron-store.ts b/electron/__mocks__/electron-store.ts → src/backend/__mocks__/electron-store.ts
diff --git a/electron/__mocks__/electron.ts → src/backend/__mocks__/electron.ts b/electron/__mocks__/electron.ts → src/backend/__mocks__/electron.ts
diff --git a/electron/__tests__/constants.test.ts → src/backend/__tests__/constants.test.ts b/electron/__tests__/constants.test.ts → src/backend/__tests__/constants.test.ts
diff --git a/electron/__tests__/logger.test.ts → src/backend/__tests__/logger.test.ts b/electron/__tests__/logger.test.ts → src/backend/__tests__/logger.test.ts
diff --git a/...mes/test_data/ArchiveWithSubfolder.tar.xz → ...mes/test_data/ArchiveWithSubfolder.tar.xz b/...mes/test_data/ArchiveWithSubfolder.tar.xz → ...mes/test_data/ArchiveWithSubfolder.tar.xz
diff --git a/...s__/runtimes/test_data/TestArchive.tar.xz → ...s__/runtimes/test_data/TestArchive.tar.xz b/...s__/runtimes/test_data/TestArchive.tar.xz → ...s__/runtimes/test_data/TestArchive.tar.xz
diff --git a/...est_data/github-api-heroic-test-data.json → ...est_data/github-api-heroic-test-data.json b/...est_data/github-api-heroic-test-data.json → ...est_data/github-api-heroic-test-data.json
diff --git a/electron/__tests__/runtimes/utils.test.ts → src/backend/__tests__/runtimes/utils.test.ts b/electron/__tests__/runtimes/utils.test.ts → src/backend/__tests__/runtimes/utils.test.ts
diff --git a/...__tests__/shortcuts/nonesteamgame.test.ts → ...__tests__/shortcuts/nonesteamgame.test.ts b/...__tests__/shortcuts/nonesteamgame.test.ts → ...__tests__/shortcuts/nonesteamgame.test.ts
@@ -1,5 +1,5 @@
 import { readFileSync, copyFileSync, mkdirSync } from 'graceful-fs'
-import { GameInfo } from '../../types'
+import { GameInfo } from 'common/types'
 import { join } from 'path'
 import { DirResult, dirSync } from 'tmp'
 import {

diff --git a/...ortcuts/test_data/shortcuts_commandmc.vdf → ...ortcuts/test_data/shortcuts_commandmc.vdf b/...ortcuts/test_data/shortcuts_commandmc.vdf → ...ortcuts/test_data/shortcuts_commandmc.vdf
diff --git a/...ortcuts/test_data/shortcuts_felipecrs.vdf → ...ortcuts/test_data/shortcuts_felipecrs.vdf b/...ortcuts/test_data/shortcuts_felipecrs.vdf → ...ortcuts/test_data/shortcuts_felipecrs.vdf
diff --git a/...s/test_data/shortcuts_missing_appname.vdf → ...s/test_data/shortcuts_missing_appname.vdf b/...s/test_data/shortcuts_missing_appname.vdf → ...s/test_data/shortcuts_missing_appname.vdf
diff --git a/...tcuts/test_data/shortcuts_missing_exe.vdf → ...tcuts/test_data/shortcuts_missing_exe.vdf b/...tcuts/test_data/shortcuts_missing_exe.vdf → ...tcuts/test_data/shortcuts_missing_exe.vdf
diff --git a/..._data/shortcuts_missing_launchoptions.vdf → ..._data/shortcuts_missing_launchoptions.vdf b/..._data/shortcuts_missing_launchoptions.vdf → ..._data/shortcuts_missing_launchoptions.vdf
diff --git a/...ortcuts/test_data/shortcuts_redromnon.vdf → ...ortcuts/test_data/shortcuts_redromnon.vdf b/...ortcuts/test_data/shortcuts_redromnon.vdf → ...ortcuts/test_data/shortcuts_redromnon.vdf
diff --git a/..._/shortcuts/test_data/shortcuts_valid.vdf → ..._/shortcuts/test_data/shortcuts_valid.vdf b/..._/shortcuts/test_data/shortcuts_valid.vdf → ..._/shortcuts/test_data/shortcuts_valid.vdf
diff --git a/electron/__tests__/utils.test.ts → src/backend/__tests__/utils.test.ts b/electron/__tests__/utils.test.ts → src/backend/__tests__/utils.test.ts
diff --git a/electron/anticheat/ipc_handler.ts → src/backend/anticheat/ipc_handler.ts b/electron/anticheat/ipc_handler.ts → src/backend/anticheat/ipc_handler.ts
diff --git a/electron/anticheat/utils.ts → src/backend/anticheat/utils.ts b/electron/anticheat/utils.ts → src/backend/anticheat/utils.ts
@@ -2,7 +2,7 @@ import { heroicAnticheatDataPath, isLinux } from '../constants'
 import * as axios from 'axios'
 import { logInfo, LogPrefix, logWarning } from '../logger/logger'
 import { readFileSync, writeFileSync } from 'graceful-fs'
-import { AntiCheatInfo } from '../types'
+import { AntiCheatInfo } from 'common/types'
 
 async function downloadAntiCheatData() {
   if (!isLinux) return

diff --git a/electron/config.ts → src/backend/config.ts b/electron/config.ts → src/backend/config.ts
@@ -8,7 +8,11 @@ import {
 import { homedir, userInfo as user } from 'os'
 import { parse as plistParse, PlistObject } from 'plist'
 
-import { AppSettings, GlobalConfigVersion, WineInstallation } from './types'
+import {
+  AppSettings,
+  GlobalConfigVersion,
+  WineInstallation
+} from 'common/types'
 import { LegendaryUser } from './legendary/user'
 import {
   currentGlobalConfigVersion,

diff --git a/electron/constants.ts → src/backend/constants.ts b/electron/constants.ts → src/backend/constants.ts
@@ -1,9 +1,9 @@
 import { homedir, platform } from 'os'
-import { join, normalize } from 'path'
+import path, { join, normalize } from 'path'
 import Store from 'electron-store'
 import { parse } from '@node-steam/vdf'
 
-import { GameConfigVersion, GlobalConfigVersion } from './types'
+import { GameConfigVersion, GlobalConfigVersion } from 'common/types'
 import {
   createNewLogFileAndClearOldOnces,
   logDebug,
@@ -58,9 +58,14 @@ const heroicAnticheatDataPath = join(heroicFolder, 'areweanticheatyet.json')
 const { currentLogFile: currentLogFile, lastLogFile: lastLogFile } =
   createNewLogFileAndClearOldOnces()
 
-const icon = fixAsarPath(join(__dirname, 'icon.png'))
-const iconDark = fixAsarPath(join(__dirname, 'icon-dark.png'))
-const iconLight = fixAsarPath(join(__dirname, 'icon-light.png'))
+const publicDir = path.resolve(
+  __dirname,
+  '..',
+  app.isPackaged ? '' : '../public'
+)
+const icon = fixAsarPath(join(publicDir, 'icon.png'))
+const iconDark = fixAsarPath(join(publicDir, 'icon-dark.png'))
+const iconLight = fixAsarPath(join(publicDir, 'icon-light.png'))
 const installed = join(legendaryConfigPath, 'installed.json')
 const libraryPath = join(legendaryConfigPath, 'metadata')
 const fallBackImage = 'fallback'
@@ -218,5 +223,6 @@ export {
   isSteamDeckGameMode,
   runtimePath,
   isCLIFullscreen,
-  isCLINoGui
+  isCLINoGui,
+  publicDir
 }
diff --git a/electron/game_config.ts → src/backend/game_config.ts b/electron/game_config.ts → src/backend/game_config.ts
@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, writeFileSync } from 'graceful-fs'
 
-import { GameConfigVersion, GameSettings } from './types'
+import { GameConfigVersion, GameSettings } from 'common/types'
 import { GlobalConfig } from './config'
 import {
   currentGameConfigVersion,

diff --git a/electron/games.ts → src/backend/games.ts b/electron/games.ts → src/backend/games.ts
@@ -4,21 +4,11 @@ import {
   GameInfo,
   GameSettings,
   InstallArgs,
-  InstallInfo,
-  Runner
-} from './types'
+  InstallInfo
+} from '../common/types'
+import type { Runner } from '../common/types'
 
 abstract class Game {
-  public static get(
-    appName: string,
-    runner: Runner = 'legendary'
-  ): LegendaryGame | GOGGame {
-    if (runner === 'legendary') {
-      return LegendaryGame.get(appName)
-    } else if (runner === 'gog') {
-      return GOGGame.get(appName)
-    }
-  }
   public get logFileLocation() {
     return join(heroicGamesConfigPath, `${this.appName}-lastPlay.log`)
   }
@@ -45,9 +35,7 @@ abstract class Game {
   abstract runWineCommand(command: string, wait?: boolean): Promise<ExecResult>
 }
 
-import { LegendaryGame } from './legendary/games'
 import { BrowserWindow } from 'electron'
-import { GOGGame } from './gog/games'
 import { join } from 'path'
 import { heroicGamesConfigPath } from './constants'
 

diff --git a/electron/gog/electronStores.ts → src/backend/gog/electronStores.ts b/electron/gog/electronStores.ts → src/backend/gog/electronStores.ts
diff --git a/electron/gog/games.ts → src/backend/gog/games.ts b/electron/gog/games.ts → src/backend/gog/games.ts
@@ -16,7 +16,7 @@ import {
   GOGLoginData,
   InstalledInfo,
   SteamRuntime
-} from 'types'
+} from 'common/types'
 import { appendFileSync, existsSync, rmSync } from 'graceful-fs'
 import {
   heroicGamesConfigPath,
@@ -66,7 +66,7 @@ class GOGGame extends Game {
     if (!this.instances.get(appName)) {
       this.instances.set(appName, new GOGGame(appName))
     }
-    return this.instances.get(appName)
+    return this.instances.get(appName) as GOGGame
   }
   public async getExtraInfo(): Promise<ExtraInfo> {
     const gameInfo = GOGLibrary.get().getGameInfo(this.appName)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,5 @@ downloads*.json

		flatpak/build
		.flatpak-builder

		vite-plugin-electron.log