From 73ab3872a733495772f765bac9a57cde2ad87aa1 Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Tue, 18 Feb 2025 22:25:41 -0300 Subject: [PATCH 01/15] fix: lazy loading messing up custom css --- src/renderer/src/app.tsx | 4 +- src/renderer/src/main.tsx | 62 +++++-------------- .../settings/aparence/settings-appearance.tsx | 1 + 3 files changed, 18 insertions(+), 49 deletions(-) diff --git a/src/renderer/src/app.tsx b/src/renderer/src/app.tsx index daa93a6b..0b738c6f 100644 --- a/src/renderer/src/app.tsx +++ b/src/renderer/src/app.tsx @@ -263,9 +263,7 @@ export function App() { useEffect(() => { const unsubscribe = window.electron.onCssInjected((cssString) => { - if (cssString) { - injectCustomCss(cssString); - } + injectCustomCss(cssString); }); return () => unsubscribe(); diff --git a/src/renderer/src/main.tsx b/src/renderer/src/main.tsx index 13160aeb..eb890d18 100644 --- a/src/renderer/src/main.tsx +++ b/src/renderer/src/main.tsx @@ -18,26 +18,17 @@ import { store } from "./store"; import resources from "@locales"; -import { SuspenseWrapper } from "./components"; import { logger } from "./logger"; import { addCookieInterceptor } from "./cookies"; - -const Home = React.lazy(() => import("./pages/home/home")); -const GameDetails = React.lazy( - () => import("./pages/game-details/game-details") -); -const Downloads = React.lazy(() => import("./pages/downloads/downloads")); -const Settings = React.lazy(() => import("./pages/settings/settings")); -const Catalogue = React.lazy(() => import("./pages/catalogue/catalogue")); -const Profile = React.lazy(() => import("./pages/profile/profile")); -const Achievements = React.lazy( - () => import("./pages/achievements/achievements") -); -const ThemeEditor = React.lazy( - () => import("./pages/theme-editor/theme-editor") -); - import * as Sentry from "@sentry/react"; +import Catalogue from "./pages/catalogue/catalogue"; +import Home from "./pages/home/home"; +import Downloads from "./pages/downloads/downloads"; +import GameDetails from "./pages/game-details/game-details"; +import Settings from "./pages/settings/settings"; +import Profile from "./pages/profile/profile"; +import Achievements from "./pages/achievements/achievements"; +import ThemeEditor from "./pages/theme-editor/theme-editor"; Sentry.init({ dsn: import.meta.env.RENDERER_VITE_SENTRY_DSN, @@ -82,37 +73,16 @@ ReactDOM.createRoot(document.getElementById("root")!).render( }> - } /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> - } - /> + } /> diff --git a/src/renderer/src/pages/settings/aparence/settings-appearance.tsx b/src/renderer/src/pages/settings/aparence/settings-appearance.tsx index 2cc5bec1..b8ab0b84 100644 --- a/src/renderer/src/pages/settings/aparence/settings-appearance.tsx +++ b/src/renderer/src/pages/settings/aparence/settings-appearance.tsx @@ -110,6 +110,7 @@ export function SettingsAppearance({ onClose={() => { setIsImportThemeModalVisible(false); clearTheme(); + setHasShownModal(false); }} onThemeImported={onThemeImported} themeName={importTheme.theme} From d879f2e3df6bf228c2aef0f7b611f04be484f1a6 Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Tue, 18 Feb 2025 22:29:38 -0300 Subject: [PATCH 02/15] chore: bump version --- .github/workflows/build.yml | 3 +++ .github/workflows/release.yml | 3 +++ package.json | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 161708bb..e95b1329 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,8 @@ name: Build +concurrency: + group: build + on: pull_request jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afa5502c..1d960908 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,8 @@ name: Release +concurrency: + group: release + on: push: branches: main diff --git a/package.json b/package.json index f15861b2..136f3e2f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hydralauncher", - "version": "3.2.1", + "version": "3.2.2", "description": "Hydra", "main": "./out/main/index.js", "author": "Los Broxas", From 58855a93a80e5a1ee966eb3d53cd00de291bc14a Mon Sep 17 00:00:00 2001 From: Zamitto <167933696+zamitto@users.noreply.github.com> Date: Tue, 18 Feb 2025 22:31:19 -0300 Subject: [PATCH 03/15] feat: add readonly to test pipeline --- src/renderer/src/components/backdrop/backdrop.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/components/backdrop/backdrop.tsx b/src/renderer/src/components/backdrop/backdrop.tsx index e62d42ee..5caedb0e 100644 --- a/src/renderer/src/components/backdrop/backdrop.tsx +++ b/src/renderer/src/components/backdrop/backdrop.tsx @@ -6,7 +6,10 @@ export interface BackdropProps { children: React.ReactNode; } -export function Backdrop({ isClosing = false, children }: BackdropProps) { +export function Backdrop({ + isClosing = false, + children, +}: Readonly) { return (
Date: Tue, 18 Feb 2025 22:32:13 -0300 Subject: [PATCH 04/15] feat: add readonly to test pipeline --- src/renderer/src/components/button/button.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/components/button/button.tsx b/src/renderer/src/components/button/button.tsx index 8d8bf1dd..fd86d4b2 100644 --- a/src/renderer/src/components/button/button.tsx +++ b/src/renderer/src/components/button/button.tsx @@ -15,7 +15,7 @@ export function Button({ theme = "primary", className, ...props -}: ButtonProps) { +}: Readonly) { return (