dep upgrades

.config/dotnet-tools.json

@@ -1,14 +1,18 @@
 {
-	"version": 1,
-	"isRoot": true,
-	"tools": {
-		"csharpier": {
-			"version": "0.26.7",
-			"commands": ["dotnet-csharpier"]
-		},
-		"dotnet-outdated-tool": {
-			"version": "4.6.0",
-			"commands": ["dotnet-outdated"]
-		}
-	}
-}
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "csharpier": {
+      "version": "0.28.2",
+      "commands": [
+        "dotnet-csharpier"
+      ]
+    },
+    "dotnet-outdated-tool": {
+      "version": "4.6.4",
+      "commands": [
+        "dotnet-outdated"
+      ]
+    }
+  }
+}

package.json

@@ -15,8 +15,8 @@
     "devDependencies": {
         "@biomejs/biome": "^1.8.1",
         "husky": "^9.0.11",
-        "lint-staged": "^15.2.5",
-        "turbo": "^2.0.3",
+        "lint-staged": "^15.2.7",
+        "turbo": "^2.0.4",
         "typescript": "~5.4.5"
     },
     "overrides": {

src/lanco-incidents-app/package.json

@@ -50,7 +50,7 @@
     "tailwindcss": "^3.4.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
-    "vite": "^5.2.13",
+    "vite": "^5.3.1",
     "vite-plugin-pwa": "^0.20.0",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0"

src/lanco-incidents-app/src/app.tsx

@@ -1,9 +1,8 @@
-import ServiceWorkerProvider from "providers/service-worker-provider";
-import SettingsProvider from "providers/settings-provider";
-import React from "react";
 import { RouterProvider } from "react-router-dom";
-import { router } from "router";
-import { GeolocationStore } from "stores/geolocation-store";
+import ServiceWorkerProvider from "./providers/service-worker-provider";
+import SettingsProvider from "./providers/settings-provider";
+import { router } from "./router";
+import { GeolocationStore } from "./stores/geolocation-store";
 
 GeolocationStore.Default.setConfig({
   enableHighAccuracy: true,

src/lanco-incidents-app/src/atoms/incidents.ts

@@ -1,6 +1,6 @@
-import { Getter, atom } from "jotai";
+import { type Getter, atom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
-import { IncidentRecord } from "models/view-models/incident-record";
+import { IncidentRecord } from "../models/view-models/incident-record";
 
 interface IncidentsState {
   error?: unknown;

src/lanco-incidents-app/src/components/confirm-update-dialog.tsx

@@ -1,6 +1,5 @@
-import { IsAppUpdatingAtom } from "atoms/app-update";
 import { useAtom } from "jotai";
-import React from "react";
+import { IsAppUpdatingAtom } from "../atoms/app-update";
 
 interface ConfirmUpdateDialogProps {
   onDismiss: () => void;

src/lanco-incidents-app/src/components/file-sort-menu/filter-sort-menu-closed.tsx

@@ -1,5 +1,4 @@
-import { Sort } from "models/view-models/settings-record";
-import React from "react";
+import { Sort } from "../../models/view-models/settings-record";
 
 interface FilterSortMenuClosedProps {
   onClick: () => void;

src/lanco-incidents-app/src/components/file-sort-menu/filter-sort-menu-opened.tsx

@@ -1,7 +1,7 @@
 import { chain } from "lodash";
-import { Sort } from "models/view-models/settings-record";
-import React, { useCallback, useMemo } from "react";
+import { useCallback, useMemo } from "react";
 import { useState } from "react";
+import { Sort } from "../../models/view-models/settings-record";
 
 interface FilterSortMenuOpenedProps {
   incidentTypeFilters: Record<string, boolean>;

src/lanco-incidents-app/src/components/file-sort-menu/filter-sort-menu.tsx

@@ -1,8 +1,8 @@
-import FilterSortMenuClosed from "components/file-sort-menu/filter-sort-menu-closed";
-import FilterSortMenuOpened from "components/file-sort-menu/filter-sort-menu-opened";
-import useSettings from "hooks/use-settings";
-import { Sort } from "models/view-models/settings-record";
-import React, { useState } from "react";
+import { useState } from "react";
+import FilterSortMenuClosed from "../../components/file-sort-menu/filter-sort-menu-closed";
+import FilterSortMenuOpened from "../../components/file-sort-menu/filter-sort-menu-opened";
+import useSettings from "../../hooks/use-settings";
+import type { Sort } from "../../models/view-models/settings-record";
 
 export type FilterSortMenuStatus = "open" | "closed";
 

src/lanco-incidents-app/src/components/incident-list-item.tsx

@@ -1,6 +1,6 @@
-import { IncidentRecord } from "models/view-models/incident-record";
-import React from "react";
+import type React from "react";
 import { Link } from "react-router-dom";
+import type { IncidentRecord } from "../models/view-models/incident-record";
 
 interface IncidentListItemProps {
   incident: IncidentRecord;

src/lanco-incidents-app/src/components/incidents-list.tsx

@@ -1,7 +1,6 @@
-import { IncidentListItem } from "components/incident-list-item";
-import ScreenLoader from "components/screen-loader/screen-loader";
-import { IncidentRecord } from "models/view-models/incident-record";
-import React from "react";
+import { IncidentListItem } from "../components/incident-list-item";
+import ScreenLoader from "../components/screen-loader/screen-loader";
+import type { IncidentRecord } from "../models/view-models/incident-record";
 
 export interface IncidentsListProps {
   incidents: IncidentRecord[];

src/lanco-incidents-app/src/components/map/incident-map.tsx

@@ -1,10 +1,9 @@
-import { IncidentMarker } from "components/map/incident-marker";
-import { LatLngLiteral } from "leaflet";
-import "leaflet/dist/leaflet.css";
-import { IncidentRecord } from "models/view-models/incident-record";
-import React from "react";
+import type { LatLngLiteral } from "leaflet";
 import { MapContainer, TileLayer } from "react-leaflet";
-import { Geocode } from "types/geocode";
+import { IncidentMarker } from "../../components/map/incident-marker";
+import type { IncidentRecord } from "../../models/view-models/incident-record";
+import type { Geocode } from "../../types/geocode";
+import "leaflet/dist/leaflet.css";
 
 interface MapProps {
   currentPosition?: Geocode;

src/lanco-incidents-app/src/components/map/incident-marker.tsx

@@ -1,8 +1,7 @@
-import { DivMarker, DivMarkerProps } from "components/map/div-marker";
-import { LeafletEventHandlerFnMap } from "leaflet";
-import React from "react";
+import type { LeafletEventHandlerFnMap } from "leaflet";
 import { useMap } from "react-leaflet";
-import { To, useLinkClickHandler } from "react-router-dom";
+import { type To, useLinkClickHandler } from "react-router-dom";
+import { DivMarker, type DivMarkerProps } from "./div-marker";
 
 interface IncidentMarkerProps extends Pick<DivMarkerProps, "html" | "position"> {
   to?: To;

src/lanco-incidents-app/src/components/page-loader/page-loader.tsx

@@ -1,5 +1,4 @@
-import IconLoader from "components/icons/icon-refresh";
-import React from "react";
+import IconLoader from "../../components/icons/icon-refresh";
 
 const PageLoader: React.FC = () => {
   return (

src/lanco-incidents-app/src/components/refresh-button.tsx

@@ -1,5 +1,4 @@
-import IconLoader from "components/icons/icon-refresh";
-import React from "react";
+import IconLoader from "../components/icons/icon-refresh";
 
 interface RefreshButtonProps {
   disabled?: boolean;

src/lanco-incidents-app/src/components/screen-loader/screen-loader.tsx

@@ -1,5 +1,4 @@
-import IconLoader from "components/icons/icon-refresh";
-import React from "react";
+import IconLoader from "../../components/icons/icon-refresh";
 
 interface ScreenLoaderProps {
   text: string;

src/lanco-incidents-app/src/components/settings-button.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import { NavLink } from "react-router-dom";
 
 const SettingsButton = () => {

src/lanco-incidents-app/src/components/settings/settings-sections/settings-section-sortby.tsx

@@ -1,5 +1,4 @@
-import { Sort } from "models/view-models/settings-record";
-import React from "react";
+import { Sort } from "../../../models/view-models/settings-record";
 
 interface SettingsSectionSortProps {
   onSortChange: (sort: Sort) => void;

src/lanco-incidents-app/src/containers/app-layout.tsx

@@ -1,11 +1,12 @@
-import { IsAppUpdatingAtom } from "atoms/app-update";
-import ConfirmUpdateDialog from "components/confirm-update-dialog";
-import ScreenLoader from "components/screen-loader/screen-loader";
-import { SITE_TITLE } from "constants/app-constants";
-import useServiceWorker from "hooks/use-service-worker";
 import { useAtomValue } from "jotai";
-import React, { ReactNode, useEffect, useState } from "react";
+import type React from "react";
+import { type ReactNode, useEffect, useState } from "react";
 import { Outlet, useOutletContext } from "react-router-dom";
+import { IsAppUpdatingAtom } from "../atoms/app-update";
+import ConfirmUpdateDialog from "../components/confirm-update-dialog";
+import ScreenLoader from "../components/screen-loader/screen-loader";
+import { SITE_TITLE } from "../constants/app-constants";
+import useServiceWorker from "../hooks/use-service-worker";
 
 interface AppLayoutContext {
   headerLeft: ReactNode;

src/lanco-incidents-app/src/containers/layout.tsx

@@ -1,10 +1,10 @@
-import { IsAppUpdatingAtom } from "atoms/app-update";
-import ConfirmUpdateDialog from "components/confirm-update-dialog";
-import ScreenLoader from "components/screen-loader/screen-loader";
-import useServiceWorker from "hooks/use-service-worker";
 import { useAtomValue } from "jotai";
-import React, { ReactNode } from "react";
-import { PropsWithChildren } from "react";
+import type { ReactNode } from "react";
+import type { PropsWithChildren } from "react";
+import { IsAppUpdatingAtom } from "../atoms/app-update";
+import ConfirmUpdateDialog from "../components/confirm-update-dialog";
+import ScreenLoader from "../components/screen-loader/screen-loader";
+import useServiceWorker from "../hooks/use-service-worker";
 
 interface LayoutProps {
   headerLeft: ReactNode;

src/lanco-incidents-app/src/hooks/use-gps-location.ts

@@ -1,6 +1,6 @@
 import { useSyncExternalStore } from "react";
 import { concat, fromEvent, interval, throttle } from "rxjs";
-import { GeolocationStore, GeoplocationEvent } from "stores/geolocation-store";
+import { GeolocationStore, GeoplocationEvent } from "../stores/geolocation-store";
 
 function subscribe(onStoreChange: () => void) {
   const positionChanges = fromEvent(GeolocationStore.Default, GeoplocationEvent.PositionChange);

src/lanco-incidents-app/src/hooks/use-incident.ts

@@ -1,5 +1,5 @@
-import useIncidents from "hooks/use-incidents";
 import { chain } from "lodash";
+import useIncidents from "../hooks/use-incidents";
 
 interface UseIncidentsHookOptions {
   id?: string | null;

src/lanco-incidents-app/src/hooks/use-incidents.ts

@@ -1,15 +1,15 @@
-import { IncidentsAtom } from "atoms/incidents";
 import axios from "axios";
-import { LIVE_FEED } from "constants/app-constants";
-import useGeolocation from "hooks/use-gps-location";
-import useSettings from "hooks/use-settings";
 import { useAtom } from "jotai";
 import { chain } from "lodash";
-import { FeedIncident } from "models/dtos/feed-incident";
-import { IncidentRecord } from "models/view-models/incident-record";
-import { Sort } from "models/view-models/settings-record";
 import { useCallback, useEffect, useMemo } from "react";
-import { DistanceUtils } from "utils/distance-utils";
+import { IncidentsAtom } from "../atoms/incidents";
+import { LIVE_FEED } from "../constants/app-constants";
+import useGeolocation from "../hooks/use-gps-location";
+import useSettings from "../hooks/use-settings";
+import type { FeedIncident } from "../models/dtos/feed-incident";
+import { IncidentRecord } from "../models/view-models/incident-record";
+import { Sort } from "../models/view-models/settings-record";
+import { DistanceUtils } from "../utils/distance-utils";
 
 export default function useIncidents() {
   const { incidentTypeFilters, sort } = useSettings();

src/lanco-incidents-app/src/hooks/use-service-worker.ts

@@ -1,5 +1,5 @@
-import { ServiceWorkerContext } from "providers/service-worker-provider";
 import { useContext } from "react";
+import { ServiceWorkerContext } from "../providers/service-worker-provider";
 
 export default function useServiceWorker() {
   const { appNeedsRefresh, offlineAppReady, updateIgnored, ignoreUpdate, updateServiceWorker } =

src/lanco-incidents-app/src/hooks/use-settings.ts

@@ -1,8 +1,8 @@
-import { IncidentsAtom } from "atoms/incidents";
 import { useAtom } from "jotai";
-import { Sort } from "models/view-models/settings-record";
-import { SettingsContext } from "providers/settings-provider";
 import { useCallback, useContext, useEffect } from "react";
+import { IncidentsAtom } from "../atoms/incidents";
+import type { Sort } from "../models/view-models/settings-record";
+import { SettingsContext } from "../providers/settings-provider";
 
 export interface UseSettingsHook {
   incidentTypeFilters: Record<string, boolean>;

src/lanco-incidents-app/src/hooks/use-web-share.test.tsx

@@ -3,9 +3,8 @@
  */
 
 import { act, renderHook, waitFor } from "@testing-library/react";
-import { Mock, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import { useWebShare } from "hooks/use-web-share";
+import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { useWebShare } from "../hooks/use-web-share";
 
 describe("useWebShare", () => {
   it("initializes", async () => {

src/lanco-incidents-app/src/hooks/use-workbox.test.tsx

@@ -1,7 +1,7 @@
 import { renderHook } from "@testing-library/react";
 import { describe, expect, it } from "vitest";
 
-import useWorkbox from "hooks/use-workbox";
+import useWorkbox from "../hooks/use-workbox";
 
 describe("useWorkbox", () => {
   it("hook initializes successfully", async () => {

src/lanco-incidents-app/src/models/dtos/feed-incident.ts

@@ -1,4 +1,4 @@
-import { Geocode } from "types/geocode";
+import type { Geocode } from "../../types/geocode";
 
 export interface FeedIncident {
   id: string;

src/lanco-incidents-app/src/models/view-models/incident-record.ts

@@ -1,7 +1,7 @@
 import { DateTime } from "luxon";
-import { FeedIncident } from "models/dtos/feed-incident";
 import { ImmutableRecord } from "simple-immutable-record";
-import { Geocode } from "types/geocode";
+import type { FeedIncident } from "../../models/dtos/feed-incident";
+import type { Geocode } from "../../types/geocode";
 
 interface Incident {
   area: string;

src/lanco-incidents-app/src/pages/home.tsx

@@ -1,9 +1,8 @@
-import IncidentsList from "components/incidents-list";
-import RefreshButton from "components/refresh-button";
-import SettingsButton from "components/settings-button";
-import { useAppLayout } from "containers/app-layout";
-import useIncidents from "hooks/use-incidents";
-import React from "react";
+import IncidentsList from "../components/incidents-list";
+import RefreshButton from "../components/refresh-button";
+import SettingsButton from "../components/settings-button";
+import { useAppLayout } from "../containers/app-layout";
+import useIncidents from "../hooks/use-incidents";
 
 const Home: React.FC = () => {
   const { loading, incidents, refresh } = useIncidents();

src/lanco-incidents-app/src/pages/incident-detail/incident-detail-content.tsx

@@ -1,8 +1,7 @@
-import { IncidentMap } from "components/map/incident-map";
-import useGeolocation from "hooks/use-gps-location";
-import useIncidents from "hooks/use-incidents";
-import { IncidentRecord } from "models/view-models/incident-record";
-import React from "react";
+import { IncidentMap } from "../../components/map/incident-map";
+import useGeolocation from "../../hooks/use-gps-location";
+import useIncidents from "../../hooks/use-incidents";
+import type { IncidentRecord } from "../../models/view-models/incident-record";
 import { IncidentDetailSection } from "./incident-detail-section";
 
 export interface IncidentDetailContentProps {

src/lanco-incidents-app/src/pages/incident-detail/incident-detail.tsx

@@ -1,11 +1,10 @@
-import PageTitle from "components/page-title";
-import { SITE_TITLE } from "constants/app-constants";
-import { useAppLayout } from "containers/app-layout";
-import useIncident from "hooks/use-incident";
-import { useWebShare } from "hooks/use-web-share";
-import { IncidentRecord } from "models/view-models/incident-record";
-import React from "react";
 import { useNavigate, useParams } from "react-router-dom";
+import PageTitle from "../../components/page-title";
+import { SITE_TITLE } from "../../constants/app-constants";
+import { useAppLayout } from "../../containers/app-layout";
+import useIncident from "../../hooks/use-incident";
+import { useWebShare } from "../../hooks/use-web-share";
+import type { IncidentRecord } from "../../models/view-models/incident-record";
 import { IncidentDetailContent } from "./incident-detail-content";
 
 export function IncidentDetail() {

src/lanco-incidents-app/src/pages/not-found.tsx

@@ -1,7 +1,6 @@
-import PageTitle from "components/page-title";
-import { useAppLayout } from "containers/app-layout";
-import React from "react";
 import { useNavigate } from "react-router-dom";
+import PageTitle from "../components/page-title";
+import { useAppLayout } from "../containers/app-layout";
 
 export function NotFound() {
   const navigate = useNavigate();