Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
aeharding committed Nov 23, 2024
1 parent 0b8d352 commit d8c01c8
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 30 deletions.
61 changes: 31 additions & 30 deletions src/core/App.tsx
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ export default defineConfig({
},
},
},
esbuild: {
logOverride: { "unsupported-css-nesting": "silent" },
},
test: {
exclude: ["**/e2e/**", "**/node_modules/**"],
globals: true,
Expand Down

0 comments on commit d8c01c8

Please sign in to comment.