Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 13 additions & 43 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"lucide-react": "^1.26.0",
"react": "^19.2.8",
"react-dom": "^19.2.8",
"react-router-dom": "^7.1.1"
"react-router": "^8.3.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.9.1",
Expand Down
2 changes: 1 addition & 1 deletion web/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
import { BrowserRouter, Navigate, Route, Routes } from "react-router";
import { AuthProvider } from "./auth/AuthContext";
import { ErrorBoundary } from "./components/ErrorBoundary";
import { FarmProvider } from "./farm/FarmContext";
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/BottomNav.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { NavLink, useLocation } from "react-router-dom";
import { NavLink, useLocation } from "react-router";
import { LogOut, Menu } from "lucide-react";
import { Dialog } from "./Dialog";
import { ThemeToggle } from "./ThemeToggle";
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/ErrorBoundary.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import { render, screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { Link, MemoryRouter, useLocation } from "react-router-dom";
import { Link, MemoryRouter, useLocation } from "react-router";
import { ErrorBoundary } from "./ErrorBoundary";

// A child that throws during render — the exact case a boundary exists for.
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/ErrorBoundary.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, useEffect, useRef, type ErrorInfo, type ReactNode } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";

// #140: without a boundary, any throw during render unmounts the whole tree and
// the user is left on a blank page — no message, no way back. On a phone in a
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/AppLayout.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect, beforeEach, afterEach } from "vitest";
import { render, screen, fireEvent, within } from "@testing-library/react";
import { MemoryRouter } from "react-router-dom";
import { MemoryRouter } from "react-router";
import { renderWithProviders } from "../test/renderWithProviders";
import { AuthProvider } from "../auth/AuthContext";
import { FarmContext } from "../farm/FarmContext";
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/AppLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NavLink, Outlet, useLocation, useNavigate } from "react-router-dom";
import { NavLink, Outlet, useLocation, useNavigate } from "react-router";
import { LogOut } from "lucide-react";
import { useAuth } from "../auth/useAuth";
import { ThemeToggle } from "../components/ThemeToggle";
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/Dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import {
formatMoney, getStock, listCustomers, listDailyEntries, listFlocks, listOrders,
} from "../api/cluckwork";
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/HistoryPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useRef, useState } from "react";
import type { FormEvent } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import {
adjustDailyEntry, getDailyEntry, listDailyEntries, listEggGrades, listFlocks, voidDailyEntry,
} from "../api/cluckwork";
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/Login.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { screen, fireEvent, act } from "@testing-library/react";
import { Routes, Route } from "react-router-dom";
import { Routes, Route } from "react-router";
import { Login } from "./Login";
import { ProtectedRoute } from "./ProtectedRoute";
import { renderWithProviders } from "../test/renderWithProviders";
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import type { FormEvent } from "react";
import { useLocation, useNavigate } from "react-router-dom";
import { useLocation, useNavigate } from "react-router";
import { useAuth } from "../auth/useAuth";
import { ApiError } from "../api/client";
import { ThemeToggle } from "../components/ThemeToggle";
Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/ProtectedRoute.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect } from "vitest";
import { screen } from "@testing-library/react";
import { Routes, Route } from "react-router-dom";
import { Routes, Route } from "react-router";
import { ProtectedRoute } from "./ProtectedRoute";
import { renderWithProviders } from "../test/renderWithProviders";

Expand Down
2 changes: 1 addition & 1 deletion web/src/routes/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Navigate, Outlet, useLocation } from "react-router-dom";
import { Navigate, Outlet, useLocation } from "react-router";
import { useAuth } from "../auth/useAuth";

export function ProtectedRoute() {
Expand Down
2 changes: 1 addition & 1 deletion web/src/test/renderWithProviders.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ReactNode } from "react";
import { MemoryRouter } from "react-router-dom";
import { MemoryRouter } from "react-router";
import { render } from "@testing-library/react";
import { AuthProvider } from "../auth/AuthContext";
import { FarmContext } from "../farm/FarmContext";
Expand Down
Loading