Skip to content

Commit a1ead7a

Browse files
flavioislimaNocccerweblateShimonOctopusET
authored
[Tech] Merge Beta Branch in Main (#1811)
* [Feat] Proper check if heroic can communicate with internet (#1677) * Added ping to check internet connection * removed console.log * Make log of error more clear * Remove ping package and just use ping cli command * Return if one ping succeed * [i18n] Updated Translations (#1728) * Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translation: Heroic Games Launcher/GamePage * Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translation: Heroic Games Launcher/GamePage * Translated using Weblate (Czech) Currently translated at 100.0% (358 of 358 strings) Translated using Weblate (Czech) Currently translated at 100.0% (358 of 358 strings) Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Shimon <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/globals/cs/ Translation: Heroic Games Launcher/GamePage Translation: Heroic Games Launcher/Globals * Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translation: Heroic Games Launcher/GamePage * Translated using Weblate (Korean) Currently translated at 100.0% (358 of 358 strings) Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Moon Sungjoon <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/globals/ko/ Translation: Heroic Games Launcher/Globals * Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translation: Heroic Games Launcher/GamePage * Translated using Weblate (Russian) Currently translated at 100.0% (358 of 358 strings) Translated using Weblate (Russian) Currently translated at 100.0% (358 of 358 strings) Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Sedative <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/globals/ru/ Translation: Heroic Games Launcher/Globals * Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translation: Heroic Games Launcher/GamePage * Translated using Weblate (Persian) Currently translated at 100.0% (358 of 358 strings) Update translation files Updated by "Squash Git commits" hook in Weblate. Co-authored-by: Hosted Weblate <[email protected]> Co-authored-by: Parsa Shadab <[email protected]> Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/gamepage/ Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/globals/fa/ Translation: Heroic Games Launcher/GamePage Translation: Heroic Games Launcher/Globals * Update translation files Updated by "Squash Git commits" hook in Weblate. Translation: Heroic Games Launcher/Globals Translate-URL: https://hosted.weblate.org/projects/heroic-games-launcher/globals/ Co-authored-by: Shimon <[email protected]> Co-authored-by: Moon Sungjoon <[email protected]> Co-authored-by: Sedative <[email protected]> Co-authored-by: Parsa Shadab <[email protected]> * Revert "[i18n] Updated Translations" (#1745) Revert "[i18n] Updated Translations (#1728)" This reverts commit 7f5d2b3. * [Tech] Switch from react-scripts to Vite & clean up everything to work with strict mode (#1633) * Change complete project structure - Rename "src" -> "src/frontend" - Rename "electron" -> "src/backend" - Move types.ts to "common/types.ts" * Switch from react-scripts + foreman + webpack + ts-loader -> Vite * Set GH_TOKEN and GITHUB_TOKEN in tests directly This just cleans up package.json a bit * Get SVG & JPG importing working in VSCode * Move type definitions into common/typedefs * Fixup tests * Rewrite large chunks of the backend to be compatible with strict mode * Modify frontend to reflect changes to type definition structure * Remove unused files These weren't necessary, at least as far as I can tell * Update translations * Fixup: Re-add `--filesystem` parameter for Proton Turns out refactoring a lot of stuff can introduce issues, who would've thought * Remove `build` script You never have to run this yourself, so it was a bit confusing to have. If you really need its functionality, `vite build` isn't that hard to type in on your own :^) * Fully remove all remnants of UE support * Add new 'codecheck' command This command can be used to make sure that no files in the project violate TS rules, since Vite itself doesn't check them It would probably be a good idea to add them to GH Workflows and/or pre-commit hooks, but I'm not too sure on how to do that * Update translation files * Fix translation files Not sure how this happens, but it seems they've gotten screwed up in the merge * Remove some more unnecessary files * Always get game updates from all libraries This fixes an issue where refreshing the library while only showing one library made the update icons of all the others disappear * Some misc code style changes * Merge branch 'main' of github.com:Heroic-Games-Launcher/HeroicGamesLauncher into beta * [Fix] Check if Legendary's `metadata` folder exists before trying to read it (#1785) * [Fix] Not permanently saving downloadNoHttps config option (#1797) fixing not permanently saving downloadNoHttps config option * Merge branch 'main' of github.com:Heroic-Games-Launcher/HeroicGamesLauncher into beta * [Fix] TypeError: Unexpected end of json (#1806) * remove useEffect double import * catch type error end of json * Added try catch * Add log prefix to see what runner fails * [Tech] Add codecheck to pre push and workflow (#1794) * Add codecheck to pre push and workflow * Add new workflow for codecheck * renaming * [Fix] Update legendary binaries (#1809) Update legendary binaries * fix: gog getGameinfo after clear the cache Co-authored-by: Niklas <[email protected]> Co-authored-by: Weblate (bot) <[email protected]> Co-authored-by: Shimon <[email protected]> Co-authored-by: Moon Sungjoon <[email protected]> Co-authored-by: Sedative <[email protected]> Co-authored-by: Parsa Shadab <[email protected]> Co-authored-by: Mathis Dröge <[email protected]> Co-authored-by: Jan B <[email protected]>
1 parent 4f3751f commit a1ead7a

File tree

386 files changed

+3656
-8974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

386 files changed

+3656
-8974
lines changed

‎.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
public/start-react.js
21
i18next-parser.config.js
32
flatpak/build/
43
flatpak/.flatpak-builder/
4+
vite.config.ts
55
**/__tests__/**

‎.eslintrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"ecmaVersion": 12,
2020
"sourceType": "module",
21-
"project": ["./tsconfig.json", "./electron/tsconfig.json"]
21+
"project": ["./tsconfig.json"]
2222
},
2323
"plugins": ["react", "@typescript-eslint"],
2424
"settings": {
@@ -27,6 +27,7 @@
2727
}
2828
},
2929
"rules": {
30+
"@typescript-eslint/no-non-null-assertion": "off",
3031
"@typescript-eslint/explicit-module-boundary-types": "off",
3132
"@typescript-eslint/no-explicit-any": "error",
3233
"@typescript-eslint/no-unused-vars": "error",

‎.github/workflows/build-prs-linux.yml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
run: yarn
2424
- name: Build artifacts.
2525
run: yarn dist:linux appimage --publish=never
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
28+
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
2629
- name: Upload AppImage.
2730
uses: actions/upload-artifact@v2
2831
with:

‎.github/workflows/build-prs-mac.yml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
run: yarn
2424
- name: Build artifacts.
2525
run: yarn dist:mac --publish=never
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
28+
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
2629
- name: Upload DMG.
2730
uses: actions/upload-artifact@v2
2831
with:

‎.github/workflows/build-prs-windows.yml

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
run: npm i --legacy-peer-deps
2424
- name: Build artifacts.
2525
run: npm run dist:win portable
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
28+
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
2629
- name: Upload EXE.
2730
uses: actions/upload-artifact@v2
2831
with:

‎.github/workflows/codecheck.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Code check
2+
3+
on:
4+
pull_request:
5+
branches: [main, beta]
6+
workflow_dispatch:
7+
8+
jobs:
9+
codecheck:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-node@v2
14+
with:
15+
node-version: '16'
16+
- name: Install modules.
17+
run: yarn
18+
- name: Check Typescript syntax
19+
run: yarn codecheck

‎.github/workflows/draft-release-linux.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ jobs:
1919
- run: npm run release:linux
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
22+
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}

‎.github/workflows/draft-release-mac.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ jobs:
1818
- run: npm run release:mac
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
21+
GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,6 @@ downloads*.json
3333

3434
flatpak/build
3535
.flatpak-builder
36+
37+
vite-plugin-electron.log
3638
.tool-versions

‎.husky/pre-push

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
yarn lint && yarn prettier-fix && yarn i18n
2+
yarn codecheck && yarn lint && yarn prettier-fix && yarn i18n

‎.prettierignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ node_modules
22
dist
33
build
44
coverage
5-
public/index.html
65
public/locales/
76
flatpak

‎Procfile

-2
This file was deleted.

0 commit comments

Comments
 (0)