From 990cbd5f877374961d1ed3899dcc0ef4d106be68 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Sat, 1 Jun 2024 18:23:14 +0200 Subject: [PATCH] chore: merge vite and vitest configs Signed-off-by: Richard Steinmetz --- vite.config.js | 7 +++++++ vitest.config.js | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 vitest.config.js diff --git a/vite.config.js b/vite.config.js index 1d31d01..85fd6fa 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,4 +8,11 @@ import { createLibConfig } from '@nextcloud/vite-config' export default createLibConfig({ index: 'src/index.js', }, { + config: { + test: { + setupFiles: [ + './tests/setup.js', + ], + }, + }, }) diff --git a/vitest.config.js b/vitest.config.js deleted file mode 100644 index adfcf41..0000000 --- a/vitest.config.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -import { defineConfig, mergeConfig } from 'vitest/config' -import viteConfig from './vite.config' - -export default defineConfig(configEnv => mergeConfig( - viteConfig(configEnv), - defineConfig({ - test: { - setupFiles: [ - './tests/setup.js' - ] - }, - }), -))