Upgrade vitest and some related packages (#3482)

* vitest * Upgrade @testing-library * Fix error building ds-react * Upgrade "jsdom" in react-workspace (fixes "The `punycode` module is deprecated") * ♻️ Matched JSDOM-versions across workspace (v25) --------- Co-authored-by: Ken <[email protected]>
navikt · Dec 28, 2024 · fa15677 · fa15677
1 parent 137b4c4
commit fa15677
Show file tree

Hide file tree

Showing 14 changed files with 299 additions and 735 deletions.
diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
@@ -87,6 +87,6 @@
     "tsx": "^4.7.1",
     "typescript": "5.5.4",
     "unified": "10.1.2",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   }
 }
diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
@@ -46,7 +46,7 @@
   "devDependencies": {
     "rimraf": "6.0.1",
     "typescript": "5.5.4",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   },
   "sideEffects": false,
   "engines": {

diff --git a/@navikt/core/css/package.json b/@navikt/core/css/package.json
@@ -44,7 +44,7 @@
     "postcss-combine-duplicated-selectors": "10.0.3",
     "postcss-import": "^14.1.0",
     "tsx": "^4.7.1",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   },
   "browserslist": [
     ">0.2%",

diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json
@@ -622,23 +622,23 @@
     "react-day-picker": "8.10.1"
   },
   "devDependencies": {
-    "@testing-library/dom": "9.3.4",
-    "@testing-library/jest-dom": "^5.16.0",
-    "@testing-library/react": "^15.0.7",
-    "@testing-library/user-event": "^14.2.0",
+    "@testing-library/dom": "10.4.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.1.0",
+    "@testing-library/user-event": "^14.5.2",
     "@types/jscodeshift": "^0.11.11",
     "concurrently": "9.0.1",
     "fast-glob": "3.2.11",
     "jscodeshift": "^0.15.1",
-    "jsdom": "24.0.0",
+    "jsdom": "25.0.1",
     "react-dom": "^18.0.0",
     "react-router-dom": "^6.3.0",
     "rimraf": "6.0.1",
     "swr": "^1.1.2",
     "tsc-alias": "1.8.8",
     "tsx": "^4.19.1",
     "typescript": "5.5.4",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   },
   "peerDependencies": {
     "@types/react": ">=17.0.30",

diff --git a/@navikt/core/react/src/date/datepicker/datepicker.test.tsx b/@navikt/core/react/src/date/datepicker/datepicker.test.tsx
@@ -1,4 +1,4 @@
-import { act, render, screen } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import React from "react";
 import { describe, test } from "vitest";
@@ -23,9 +23,6 @@ describe("Render datepicker", () => {
   test("Should not crash when e.target is window", async () => {
     render(<App />);
 
-    // eslint-disable-next-line testing-library/no-unnecessary-act -- https://kentcdodds.com/blog/fix-the-not-wrapped-in-act-warning
-    await act(async () => {
-      await userEvent.click(screen.getByText("Velg dato"));
-    });
+    await userEvent.click(screen.getByText("Velg dato"));
   });
 });
diff --git a/@navikt/core/react/src/date/hooks/useRangeDatepicker.test.tsx b/@navikt/core/react/src/date/hooks/useRangeDatepicker.test.tsx
@@ -1,5 +1,4 @@
-/* eslint-disable testing-library/no-unnecessary-act -- https://kentcdodds.com/blog/fix-the-not-wrapped-in-act-warning */
-import { act, render, screen } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import React from "react";
 import { describe, expect, test } from "vitest";
@@ -29,10 +28,8 @@ describe("Writing in input sets correct values", () => {
 
     const fraInput = screen.getByRole("textbox", { name: "Fra" });
     const tilInput = screen.getByRole("textbox", { name: "Til" });
-    await act(async () => {
-      await userEvent.type(fraInput, "03.08.2022");
-      await userEvent.type(tilInput, "03.08.2022");
-    });
+    await userEvent.type(fraInput, "03.08.2022");
+    await userEvent.type(tilInput, "03.08.2022");
     const res = screen.getByTitle("res");
     expect(res.innerHTML).toEqual(
       JSON.stringify({
@@ -47,10 +44,8 @@ describe("Writing in input sets correct values", () => {
 
     const fraInput = screen.getByRole("textbox", { name: "Fra" });
     const tilInput = screen.getByRole("textbox", { name: "Til" });
-    await act(async () => {
-      await userEvent.type(fraInput, "03.08.2022");
-      await userEvent.type(tilInput, "02.08.2022");
-    });
+    await userEvent.type(fraInput, "03.08.2022");
+    await userEvent.type(tilInput, "02.08.2022");
     const res = screen.getByTitle("res");
     expect(res.innerHTML).toEqual(
       JSON.stringify({

diff --git a/@navikt/core/react/src/tabs/Tabs.test.tsx b/@navikt/core/react/src/tabs/Tabs.test.tsx
@@ -1,4 +1,4 @@
-import { act, fireEvent, render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import React from "react";
 import { describe, expect, test } from "vitest";
@@ -154,19 +154,11 @@ describe("Tabs", () => {
     expect(screen.getByTestId("tab2")).toHaveFocus();
 
     /* Move focus to tabPanel */
-    // eslint-disable-next-line testing-library/no-unnecessary-act
-    await act(async () => {
-      /* Tablist handles tabbing with setTimeout, so we need to use act */
-      await userEvent.tab();
-    });
-
+    await userEvent.tab();
     expect(screen.getByTestId("tabpanel1")).toHaveFocus();
-    /* Move focus back to tablist, now tab1 should have focus */
 
-    // eslint-disable-next-line testing-library/no-unnecessary-act
-    await act(async () => {
-      await userEvent.tab({ shift: true });
-    });
+    /* Move focus back to tablist, now tab1 should have focus */
+    await userEvent.tab({ shift: true });
     expect(screen.getByTestId("tab1")).toHaveFocus();
   });
 });
diff --git a/@navikt/core/react/tests/setup.ts b/@navikt/core/react/tests/setup.ts
@@ -1,7 +1 @@
-/**
- * Setup-file is required to avoid "chai" type errors when using testing-library with vitest
- */
-import matchers from "@testing-library/jest-dom/matchers";
-import { expect } from "vitest";
-
-expect.extend(matchers);
+import "@testing-library/jest-dom/vitest";
diff --git a/@navikt/core/react/tsconfig.build.json b/@navikt/core/react/tsconfig.build.json
@@ -7,5 +7,11 @@
     "declaration": true,
     "sourceMap": true
   },
-  "include": ["./src"]
+  "include": ["./src"],
+  "exclude": [
+    "./src/**/*.test.ts",
+    "./src/**/*.test.tsx",
+    "./src/**/*.test-d.ts",
+    "./src/**/*.stories.tsx"
+  ]
 }
diff --git a/@navikt/core/react/tsconfig.json b/@navikt/core/react/tsconfig.json
@@ -2,6 +2,7 @@
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "noImplicitAny": false,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "types": ["vitest/globals"]
   }
 }
diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
@@ -30,7 +30,7 @@
     "tailwindcss": "^3.3.3",
     "tsx": "^4.19.1",
     "typescript": "5.5.4",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   },
   "publishConfig": {
     "access": "public",

diff --git a/@navikt/core/tokens/package.json b/@navikt/core/tokens/package.json
@@ -40,7 +40,7 @@
     "style-dictionary": "^4.1.1",
     "tsx": "^4.19.1",
     "typescript": "5.5.4",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   },
   "publishConfig": {
     "access": "public",

diff --git a/aksel.nav.no/website/package.json b/aksel.nav.no/website/package.json
@@ -94,7 +94,7 @@
     "babel-loader": "^8.2.0",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.0",
-    "jsdom": "^22.1.0",
+    "jsdom": "25.0.1",
     "json5": "2.2.1",
     "pino-pretty": "^10.0.0",
     "postcss": "^8.4.31",
@@ -105,6 +105,6 @@
     "start-server-and-test": "^2.0.3",
     "tsx": "^4.19.1",
     "typescript": "5.5.4",
-    "vitest": "^1.2.2"
+    "vitest": "^2.1.8"
   }
 }