From 137e6c6ed9ef1633f2d41d5f7173a1abad25de4b Mon Sep 17 00:00:00 2001 From: Steven RYDELL Date: Sat, 1 Aug 2026 17:00:12 +0200 Subject: [PATCH] fix(merge): remove upstream loadLogoOnce leftover, restore schema.ts formatting main.tsx no longer needs an eager logo fetch call: Logo.tsx already triggers ensureLogoLoaded() from logoCache.ts (the fork's own implementation, kept over upstream's during the sync merge). --- src/main.tsx | 3 --- src/types/schema.ts | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main.tsx b/src/main.tsx index b75ae05..4dfb752 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -16,7 +16,6 @@ import NotFound from './pages/NotFound'; import { AdminPanel } from './pages/AdminPanel.lazy'; import { ProtectedRoute } from './components/layout/ProtectedRoute'; import { getBasePath } from './lib/basePath'; -import { loadLogoOnce } from './lib/logoCache'; (() => { try { @@ -43,8 +42,6 @@ import { loadLogoOnce } from './lib/logoCache'; } catch {} })(); -loadLogoOnce(); - const basePath = getBasePath(); const router = createBrowserRouter( diff --git a/src/types/schema.ts b/src/types/schema.ts index a415dd8..20dae49 100644 --- a/src/types/schema.ts +++ b/src/types/schema.ts @@ -256,7 +256,11 @@ export interface MassActionSeparator { } export type ItemAction = - ItemActionDelete | ItemActionSetProperty | ItemActionQuery | ItemActionView | ItemActionSeparator; + | ItemActionDelete + | ItemActionSetProperty + | ItemActionQuery + | ItemActionView + | ItemActionSeparator; export interface ItemActionDelete { type: 'delete';