From 104de78c0ed2fb2116550091f95f0155ab719995 Mon Sep 17 00:00:00 2001
From: Vicary A <vicary.archangel@member.mensa.org>
Date: Tue, 4 Feb 2025 11:39:38 +0800
Subject: [PATCH] fix: test configurations

---
 packages/react/jest.config.js           | 2 +-
 packages/react/test/graphqlHOC.test.tsx | 4 +---
 packages/react/test/utils.ts            | 1 -
 packages/solid/tsconfig.json            | 6 ++++++
 packages/solid/vitest.config.ts         | 2 ++
 packages/solid/vitest.setup.ts          | 1 +
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 packages/solid/tsconfig.json
 create mode 100644 packages/solid/vitest.setup.ts

diff --git a/packages/react/jest.config.js b/packages/react/jest.config.js
index f9507e52b..495ecb3c5 100644
--- a/packages/react/jest.config.js
+++ b/packages/react/jest.config.js
@@ -1,5 +1,5 @@
 module.exports = require('test-utils/jest.config.js').getConfig({
-  setupFilesAfterEnv: ['@testing-library/jest-dom/extend-expect'],
   setupFiles: ['./jest.setup.ts'],
+  setupFilesAfterEnv: ['@testing-library/jest-dom'],
   testEnvironment: 'jsdom',
 });
diff --git a/packages/react/test/graphqlHOC.test.tsx b/packages/react/test/graphqlHOC.test.tsx
index 1b49f11a9..d73bc437a 100644
--- a/packages/react/test/graphqlHOC.test.tsx
+++ b/packages/react/test/graphqlHOC.test.tsx
@@ -1,7 +1,5 @@
-import React from 'react';
-
 import { render, waitFor } from '@testing-library/react';
-
+import React from 'react';
 import { createReactTestClient } from './utils';
 
 test('Basic Non-Suspense', async () => {
diff --git a/packages/react/test/utils.ts b/packages/react/test/utils.ts
index ff926f5c6..21c2f1c78 100644
--- a/packages/react/test/utils.ts
+++ b/packages/react/test/utils.ts
@@ -1,4 +1,3 @@
-import '@testing-library/jest-dom/extend-expect';
 import {
   Cache,
   SchemaUnionsKey,
diff --git a/packages/solid/tsconfig.json b/packages/solid/tsconfig.json
new file mode 100644
index 000000000..885891f8c
--- /dev/null
+++ b/packages/solid/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "jsx": "preserve"
+  },
+  "include": ["src", "vitest.setup.ts"]
+}
diff --git a/packages/solid/vitest.config.ts b/packages/solid/vitest.config.ts
index c1cadf4a3..610fb3771 100644
--- a/packages/solid/vitest.config.ts
+++ b/packages/solid/vitest.config.ts
@@ -6,7 +6,9 @@ export default defineConfig({
   test: {
     coverage: {
       enabled: !!process.env.CI,
+      provider: 'v8',
     },
     environment: 'jsdom',
+    setupFiles: ['./vitest.setup.ts'],
   },
 });
diff --git a/packages/solid/vitest.setup.ts b/packages/solid/vitest.setup.ts
new file mode 100644
index 000000000..bb02c60cd
--- /dev/null
+++ b/packages/solid/vitest.setup.ts
@@ -0,0 +1 @@
+import '@testing-library/jest-dom/vitest';