Update some dependencies

packages/cli/package.json

@@ -45,13 +45,12 @@
         "@types/inquirer": "^9.0.7",
         "@types/shelljs": "^0.8.15",
         "@types/yargs": "^17.0.33",
-        "@vitejs/plugin-react": "^4.2.1",
-        "@vitest/coverage-v8": "^1.1.0",
+        "@vitest/coverage-v8": "^4.0.8",
         "globals": "^16.0.0",
         "rollup-plugin-node-externals": "^8.0.0",
         "typescript": "^5.3.3",
-        "vite": "^5.0.10",
-        "vitest": "^1.1.0"
+        "vite": "^7.2.2",
+        "vitest": "^4.0.8"
     },
     "overrides": {
         "minimatch": "5.1.2",

packages/cli/src/commands/__tests__/auth.test.ts

@@ -31,7 +31,7 @@ describe("Auth Commands", () => {
             getCloudflareSecrets: vi.fn(),
             setCloudflareSecrets: vi.fn(),
         };
-        (CloudflareClient as any).mockImplementation(() => mockCloudflareClient);
+        (CloudflareClient as any).mockImplementation(function() { return mockCloudflareClient });
 
         mockConsoleLog = vi.spyOn(console, "log").mockImplementation(() => {});
         mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {});

packages/cli/src/commands/__tests__/install.test.ts

@@ -54,7 +54,6 @@ describe("install prompts", () => {
     beforeEach(() => {
         vi.resetModules();
         vi.resetAllMocks();
-        // @ts-expect-error <just couldnt sort this out>
         mockExit = vi
             .spyOn(process, "exit")
             .mockImplementation((..._args: unknown[]) => {

packages/cli/src/commands/auth.ts

@@ -83,7 +83,7 @@ export async function updatePassword() {
 
         const existingSecrets = await cloudflare.getCloudflareSecrets();
 
-        if (!existingSecrets.CF_AUTH_ENABLED) {
+        if (!existingSecrets?.CF_AUTH_ENABLED) {
             console.error("❌ Authentication is not enabled. Run 'counterscale auth enable' first.");
             process.exit(1);
         }

packages/cli/tsconfig.json

@@ -1,6 +1,7 @@
 {
     "extends": "../../tsconfig.json",
     "include": ["src/**/*.ts"],
+    "exclude": ["src/**/*.test.ts"],
     "compilerOptions": {
         "module": "nodenext",
         "strict": true,

packages/server/app/routes/__tests__/resources.timeseries.test.tsx

@@ -105,6 +105,9 @@ describe("TimeSeriesCard", () => {
     };
 
     beforeEach(() => {
+        // Clear mock call counts before each test
+        mockFetcher.submit.mockClear();
+
         // @ts-expect-error we don't need to provide all the properties of the mockFetcher
         vi.mocked(RemixReact.useFetcher).mockReturnValue(mockFetcher);
 

packages/server/package.json

@@ -65,8 +65,8 @@
         "@types/ua-parser-js": "^0.7.39",
         "@typescript-eslint/eslint-plugin": "^8.26.1",
         "@typescript-eslint/parser": "^8.26.1",
-        "@vitest/coverage-istanbul": "2.1",
-        "@vitest/coverage-v8": "2.1",
+        "@vitest/coverage-istanbul": "~4.0.8",
+        "@vitest/coverage-v8": "~4.0.8",
         "autoprefixer": "^10.4.19",
         "globals": "^16.0.0",
         "husky": "^9.0.11",
@@ -76,9 +76,9 @@
         "resize-observer-polyfill": "^1.5.1",
         "tailwindcss": "^3.4.4",
         "typescript": "^5.7.2",
-        "vite": "^5.3.1",
-        "vite-tsconfig-paths": "^4.3.2",
-        "vitest": "2.1",
+        "vite": "^7.2.2",
+        "vite-tsconfig-paths": "^5.1.4",
+        "vitest": "~4.0.8",
         "vitest-dom": "^0.1.1",
         "wrangler": "^4.23.0"
     },

packages/tracker/package.json

@@ -22,14 +22,14 @@
         "@counterscale/eslint-config": "workspace:*",
         "@playwright/test": "^1.49.1",
         "@types/node": "^22.10.2",
-        "@vitest/coverage-v8": "2.1",
+        "@vitest/coverage-v8": "~4.0.8",
         "globals": "^16.0.0",
         "install": "^0.13.0",
         "typescript": "^5.7.2",
-        "vite": "^5.3.1",
+        "vite": "^7.2.2",
         "vite-plugin-dts": "^4.4.0",
         "vite-tsconfig-paths": "^5.1.4",
-        "vitest": "2.1"
+        "vitest": "~4.0.8"
     },
     "publishConfig": {
         "access": "public",

packages/tracker/src/__tests__/index.spec.ts

@@ -18,19 +18,26 @@ interface MockXHR {
 describe("api", () => {
     let mockXhrObjects: MockXHR[] = [];
     beforeAll(() => {
-        const XMLHttpRequestMock = vi.fn(() => {
-            const obj = {
-                open: vi.fn(),
-                send: vi.fn(),
-                setRequestHeader: vi.fn(),
-                addEventListener: vi.fn(),
-                responseText: "",
-                status: 200,
-                statusText: "OK",
-            };
-            mockXhrObjects.push(obj);
-            return obj;
-        });
+        class XMLHttpRequestMock {
+            open: ReturnType<typeof vi.fn>;
+            send: ReturnType<typeof vi.fn>;
+            setRequestHeader: ReturnType<typeof vi.fn>;
+            addEventListener: ReturnType<typeof vi.fn>;
+            responseText: string;
+            status: number;
+            statusText: string;
+
+            constructor() {
+                this.open = vi.fn();
+                this.send = vi.fn();
+                this.setRequestHeader = vi.fn();
+                this.addEventListener = vi.fn();
+                this.responseText = "";
+                this.status = 200;
+                this.statusText = "OK";
+                mockXhrObjects.push(this);
+            }
+        }
 
         vi.stubGlobal("XMLHttpRequest", XMLHttpRequestMock);
 
@@ -67,7 +74,7 @@ describe("api", () => {
                     reporterUrl: "https://example.com/collect",
                     autoTrackPageviews: false,
                 });
-            }).not.toThrow()
+            }).not.toThrow();
         });
     });
 

packages/tracker/src/server/__tests__/request.test.ts

@@ -4,13 +4,16 @@
 
 // Mock fetch and buildCollectUrl
 global.fetch = vi.fn();
-global.AbortController = vi.fn().mockImplementation(() => ({
-    signal: {},
-    abort: vi.fn(),
-}));
+
+class MockAbortController {
+    signal = {} as AbortSignal;
+    abort = vi.fn();
+}
+
+global.AbortController = MockAbortController;
 global.setTimeout = vi.fn().mockImplementation(() => {
     return 123 as any; // Mock timeout ID
 }) as any;
 global.clearTimeout = vi.fn();
 
 vi.mock("../../shared/request", () => ({
@@ -27,7 +30,6 @@
 
     beforeEach(() => {
         vi.clearAllMocks();
-        (global.AbortController as any).mockReturnValue(mockAbortController);
     });
 
     it("should make a GET request with correct headers", async () => {
@@ -39,7 +41,7 @@
 
         mockFetch.mockResolvedValue({
             text: vi.fn().mockResolvedValue("ok"),
         } as any);
 
         const url = "https://example.com/collect";
         const params: CollectRequestParams = {
@@ -69,10 +71,10 @@
         mockBuildCollectUrl.mockReturnValue("https://example.com/collect");
         mockFetch.mockResolvedValue({
             text: vi.fn().mockResolvedValue("ok"),
         } as any);
 
         const timeout = 2000;
         await makeRequest("https://example.com/collect", {} as any, timeout);
 
         expect(global.setTimeout).toHaveBeenCalledWith(
             expect.any(Function),
@@ -88,9 +90,9 @@
         mockBuildCollectUrl.mockReturnValue("https://example.com/collect");
         mockFetch.mockResolvedValue({
             text: vi.fn().mockResolvedValue("ok"),
         } as any);
 
         await makeRequest("https://example.com/collect", {} as any);
 
         expect(global.setTimeout).toHaveBeenCalledWith(
             expect.any(Function),
@@ -106,7 +108,7 @@
         const mockText = vi.fn().mockResolvedValue("response body");
         mockFetch.mockResolvedValue({
             text: mockText,
         } as any);
 
         await makeRequest("https://example.com/collect", {} as any);
 
@@ -148,8 +150,12 @@
             text: vi.fn().mockResolvedValue("ok"),
         } as any);
 
+        // Spy on AbortController constructor
+        const abortControllerSpy = vi.spyOn(global, "AbortController");
+
         await makeRequest("https://example.com/collect", {} as any);
 
-        expect(global.AbortController).toHaveBeenCalled();
+        expect(abortControllerSpy).toHaveBeenCalled();
+        abortControllerSpy.mockRestore();
     });
 });