From 8e68a6324e3c592da5adc2966d29203eafb96846 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 26 May 2022 12:33:27 +0800 Subject: [PATCH] chore: update test setup --- __tests__/tsconfig.json | 10 ++-------- __tests__/{vitest.config.js => vitest.config.ts} | 5 ++++- package.json | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) rename __tests__/{vitest.config.js => vitest.config.ts} (74%) diff --git a/__tests__/tsconfig.json b/__tests__/tsconfig.json index 10d9e9a2..49605e11 100644 --- a/__tests__/tsconfig.json +++ b/__tests__/tsconfig.json @@ -1,14 +1,8 @@ { + "extends": "../tsconfig.json", "compilerOptions": { "baseUrl": ".", - "module": "esnext", - "moduleResolution": "node", - "strict": true, - "noUnusedLocals": true, - "skipLibCheck": true, - "esModuleInterop": true, - "lib": ["ESNext", "DOM"], - "types": ["node", "vitest/global"], + "types": ["node", "vitest/globals"], "paths": { "node/*": ["../src/node/*"], "client/*": ["../src/client/*"] diff --git a/__tests__/vitest.config.js b/__tests__/vitest.config.ts similarity index 74% rename from __tests__/vitest.config.js rename to __tests__/vitest.config.ts index 87b70c8c..2c8c9004 100644 --- a/__tests__/vitest.config.js +++ b/__tests__/vitest.config.ts @@ -1,5 +1,5 @@ import path from 'path' -import {defineConfig} from 'vite' +import { defineConfig } from 'vite' export default defineConfig({ resolve: { @@ -7,5 +7,8 @@ export default defineConfig({ node: path.resolve(__dirname, '../src/node'), client: path.resolve(__dirname, '../src/client') } + }, + test: { + globals: true } }) diff --git a/package.json b/package.json index 46b3c3e1..813d5e07 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "build-node": "rollup --config rollup.config.ts --configPlugin esbuild", "format": "prettier --write .", "lint": "pnpm run format", - "test": "vitest run __tests__ -c __tests__/vitest.config.js --global", + "test": "vitest -c __tests__/vitest.config.ts", "test:all": "run-s lint test", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "release": "node scripts/release.js",