diff --git a/Src/WitsmlExplorer.Frontend/package.json b/Src/WitsmlExplorer.Frontend/package.json
index 3e5852570..0cddba0f4 100644
--- a/Src/WitsmlExplorer.Frontend/package.json
+++ b/Src/WitsmlExplorer.Frontend/package.json
@@ -80,7 +80,7 @@
"jsdom": "^24.0.0",
"lint-staged": "^13.0.3",
"typescript": "^5.4.3",
- "vite": "^5.2.0",
+ "vite": "^5.2.8",
"vite-tsconfig-paths": "^4.3.2",
"vitest": "^1.4.0"
}
diff --git a/Src/WitsmlExplorer.Frontend/vite.config.ts b/Src/WitsmlExplorer.Frontend/vite.config.ts
index 576121ba3..5e478e45c 100644
--- a/Src/WitsmlExplorer.Frontend/vite.config.ts
+++ b/Src/WitsmlExplorer.Frontend/vite.config.ts
@@ -1,4 +1,3 @@
-///
///
import react from "@vitejs/plugin-react";
@@ -17,12 +16,5 @@ export default defineConfig({
// port for dev
server: {
port: 3000
- },
-
- // test config
- test: {
- globals: true,
- environment: "jsdom",
- setupFiles: ["./setupTests.ts"]
}
});
diff --git a/Src/WitsmlExplorer.Frontend/vitest.config.ts b/Src/WitsmlExplorer.Frontend/vitest.config.ts
new file mode 100644
index 000000000..801660c47
--- /dev/null
+++ b/Src/WitsmlExplorer.Frontend/vitest.config.ts
@@ -0,0 +1,13 @@
+import { defineConfig, mergeConfig } from "vitest/config";
+import viteConfig from "./vite.config";
+
+export default mergeConfig(
+ viteConfig,
+ defineConfig({
+ test: {
+ globals: true,
+ environment: "jsdom",
+ setupFiles: ["./setupTests.ts"]
+ }
+ })
+);
diff --git a/yarn.lock b/yarn.lock
index 254035fc7..634eebf56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3682,7 +3682,7 @@ postcss-value-parser@^4.0.2:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-postcss@^8.4.36:
+postcss@^8.4.36, postcss@^8.4.38:
version "8.4.38"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
@@ -4537,7 +4537,7 @@ vite-tsconfig-paths@^4.3.2:
globrex "^0.1.2"
tsconfck "^3.0.3"
-vite@^5.0.0, vite@^5.2.0:
+vite@^5.0.0:
version "5.2.3"
resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.3.tgz#198efc2fd4d80eac813b146a68a4b0dbde884fc2"
integrity sha512-+i1oagbvkVIhEy9TnEV+fgXsng13nZM90JQbrcPrf6DvW2mXARlz+DK7DLiDP+qeKoD1FCVx/1SpFL1CLq9Mhw==
@@ -4548,6 +4548,17 @@ vite@^5.0.0, vite@^5.2.0:
optionalDependencies:
fsevents "~2.3.3"
+vite@^5.2.8:
+ version "5.2.8"
+ resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.8.tgz#a99e09939f1a502992381395ce93efa40a2844aa"
+ integrity sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==
+ dependencies:
+ esbuild "^0.20.1"
+ postcss "^8.4.38"
+ rollup "^4.13.0"
+ optionalDependencies:
+ fsevents "~2.3.3"
+
vitest@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.4.0.tgz#f5c812aaf5023818b89b7fc667fa45327396fece"