From d11b666755f63eed04aaa14eb1128e98ecd37189 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 2 Mar 2025 14:05:59 +0100
Subject: [PATCH] remove vitest-mock-extended as vitest now exposes a
 vi.mocked() function

---
 commafeed-client/package-lock.json            | 32 +------------------
 commafeed-client/package.json                 |  3 +-
 .../src/app/entries/entries.test.ts           | 19 ++++-------
 3 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/commafeed-client/package-lock.json b/commafeed-client/package-lock.json
index bc05ff23..b2e87511 100644
--- a/commafeed-client/package-lock.json
+++ b/commafeed-client/package-lock.json
@@ -67,8 +67,7 @@
                 "vite": "^6.2.0",
                 "vite-plugin-checker": "^0.9.0",
                 "vite-tsconfig-paths": "^5.1.4",
-                "vitest": "^3.0.7",
-                "vitest-mock-extended": "^3.0.1"
+                "vitest": "^3.0.7"
             }
         },
         "node_modules/@adobe/css-tools": {
@@ -6916,21 +6915,6 @@
                 "node": ">=18"
             }
         },
-        "node_modules/ts-essentials": {
-            "version": "10.0.4",
-            "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-10.0.4.tgz",
-            "integrity": "sha512-lwYdz28+S4nicm+jFi6V58LaAIpxzhg9rLdgNC1VsdP/xiFBseGhF1M/shwCk6zMmwahBZdXcl34LVHrEang3A==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "typescript": ">=4.5.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/tsconfck": {
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/tsconfck/-/tsconfck-3.1.5.tgz",
@@ -8002,20 +7986,6 @@
                 }
             }
         },
-        "node_modules/vitest-mock-extended": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/vitest-mock-extended/-/vitest-mock-extended-3.0.1.tgz",
-            "integrity": "sha512-VI7CRRvIi+MbAsqdGTxp3K+eiY7BR1zrVflZ5DBrFUXPjRZRgxXajlYdNyIu3v1bb5ZfdLANXwZ9i/RfVMfS6A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ts-essentials": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "typescript": "3.x || 4.x || 5.x",
-                "vitest": ">=3.0.0"
-            }
-        },
         "node_modules/vitest/node_modules/pathe": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
diff --git a/commafeed-client/package.json b/commafeed-client/package.json
index bf443545..b98050cc 100644
--- a/commafeed-client/package.json
+++ b/commafeed-client/package.json
@@ -74,8 +74,7 @@
         "vite": "^6.2.0",
         "vite-plugin-checker": "^0.9.0",
         "vite-tsconfig-paths": "^5.1.4",
-        "vitest": "^3.0.7",
-        "vitest-mock-extended": "^3.0.1"
+        "vitest": "^3.0.7"
     },
     "overrides": {
         "react-infinite-scroller": {
diff --git a/commafeed-client/src/app/entries/entries.test.ts b/commafeed-client/src/app/entries/entries.test.ts
index 0804e024..71d33f53 100644
--- a/commafeed-client/src/app/entries/entries.test.ts
+++ b/commafeed-client/src/app/entries/entries.test.ts
@@ -1,25 +1,20 @@
 import { configureStore } from "@reduxjs/toolkit"
-import type { client } from "app/client"
+import { client } from "app/client"
 import { loadEntries, loadMoreEntries, markAllEntries, markEntry } from "app/entries/thunks"
 import { type RootState, reducers } from "app/store"
 import type { Entries, Entry } from "app/types"
 import type { AxiosResponse } from "axios"
 import { beforeEach, describe, expect, it, vi } from "vitest"
-import { any, mockReset } from "vitest-mock-extended"
 
-const mockClient = await vi.hoisted(async () => {
-    const mockModule = await import("vitest-mock-extended")
-    return mockModule.mockDeep<typeof client>()
-})
-vi.mock("app/client", () => ({ client: mockClient }))
+vi.mock("app/client")
 
 describe("entries", () => {
     beforeEach(() => {
-        mockReset(mockClient)
+        vi.resetAllMocks()
     })
 
     it("loads entries", async () => {
-        mockClient.feed.getEntries.calledWith(any()).mockResolvedValue({
+        vi.mocked(client.feed.getEntries).mockResolvedValue({
             data: {
                 entries: [{ id: "3" } as Entry],
                 hasMore: false,
@@ -53,7 +48,7 @@ describe("entries", () => {
     })
 
     it("loads more entries", async () => {
-        mockClient.category.getEntries.calledWith(any()).mockResolvedValue({
+        vi.mocked(client.category.getEntries).mockResolvedValue({
             data: {
                 entries: [{ id: "4" } as Entry],
                 hasMore: false,
@@ -113,7 +108,7 @@ describe("entries", () => {
             { id: "3", read: true },
             { id: "4", read: false },
         ])
-        expect(mockClient.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
+        expect(client.entry.mark).toHaveBeenCalledWith({ id: "3", read: true })
     })
 
     it("marks all entries as read", () => {
@@ -140,6 +135,6 @@ describe("entries", () => {
             { id: "3", read: true },
             { id: "4", read: true },
         ])
-        expect(mockClient.category.markEntries).toHaveBeenCalledWith({ id: "all", read: true })
+        expect(client.category.markEntries).toHaveBeenCalledWith({ id: "all", read: true })
     })
 })