diff --git a/src/core/App.tsx b/src/core/App.tsx index 7c23be1da4..2fa032fa8f 100644 --- a/src/core/App.tsx +++ b/src/core/App.tsx @@ -1,33 +1,3 @@ -import { IonApp, setupIonicReact } from "@ionic/react"; -import { NavModes } from "capacitor-android-nav-mode"; -import { ErrorBoundary } from "react-error-boundary"; - -import { AppContextProvider } from "#/features/auth/AppContext"; -import BeforeInstallPromptProvider from "#/features/pwa/BeforeInstallPromptProvider"; -import { - getAndroidNavMode, - getDeviceMode, - isInstalled, -} from "#/helpers/device"; -import { OptimizedRouterProvider } from "#/helpers/useOptimizedIonRouter"; -import Router from "#/routes/common/Router"; -import { UpdateContextProvider } from "#/routes/pages/settings/update/UpdateContext"; -import ConfigProvider from "#/services/app"; -import { StoreProvider } from "#/store"; - -import AppCrash from "./AppCrash"; -import GlobalStyles from "./GlobalStyles"; -import { TabContextProvider } from "./TabContext"; - -// preserve lexical order -import TabbedRoutes from "#/routes/TabbedRoutes"; - -import Auth from "./Auth"; -import Listeners from "./listeners"; - -// Setup global app lifecycle listeners -import "./listeners"; - // Core CSS required for Ionic components to work properly import "@ionic/react/css/core.css"; @@ -61,6 +31,37 @@ import "./syntaxHighlights.css"; // Global CSS overrides import "./globalCssOverrides.css"; +// Rest of imports after css +import { IonApp, setupIonicReact } from "@ionic/react"; +import { NavModes } from "capacitor-android-nav-mode"; +import { ErrorBoundary } from "react-error-boundary"; + +import { AppContextProvider } from "#/features/auth/AppContext"; +import BeforeInstallPromptProvider from "#/features/pwa/BeforeInstallPromptProvider"; +import { + getAndroidNavMode, + getDeviceMode, + isInstalled, +} from "#/helpers/device"; +import { OptimizedRouterProvider } from "#/helpers/useOptimizedIonRouter"; +import Router from "#/routes/common/Router"; +import { UpdateContextProvider } from "#/routes/pages/settings/update/UpdateContext"; +import ConfigProvider from "#/services/app"; +import { StoreProvider } from "#/store"; + +import AppCrash from "./AppCrash"; +import GlobalStyles from "./GlobalStyles"; +import { TabContextProvider } from "./TabContext"; + +// preserve lexical order +import TabbedRoutes from "#/routes/TabbedRoutes"; + +import Auth from "./Auth"; +import Listeners from "./listeners"; + +// Setup global app lifecycle listeners +import "./listeners"; + // index.tsx ensures android nav mode resolves before app is rendered (async () => { let navMode; diff --git a/vite.config.ts b/vite.config.ts index fdcf7b5925..72442444d0 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -73,6 +73,9 @@ export default defineConfig({ }, }, }, + esbuild: { + logOverride: { "unsupported-css-nesting": "silent" }, + }, test: { exclude: ["**/e2e/**", "**/node_modules/**"], globals: true,