From 78aaac300f570ee90cc33e79b4bb35c5a46a09d8 Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Sat, 28 Oct 2023 13:51:33 -0500 Subject: [PATCH 1/9] `vite@5.0.0-beta.13` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08d31354e5..d7711314a7 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "rollup": "^4.0.2", "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", - "vite": "^4.4.2", + "vite": "^5.0.0-beta.13", "vitest": "^0.34.1" }, "peerDependencies": { From db87393afd8dfa41ac652b67265c4434d09c531a Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Sat, 28 Oct 2023 13:55:07 -0500 Subject: [PATCH 2/9] `vitest@1.0.0-beta.3` --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d7711314a7..727f9b2bd2 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", "@vitejs/plugin-react": "^4.0.2", - "@vitest/coverage-v8": "^0.34.1", + "@vitest/coverage-v8": "^1.0.0-beta.3", "babel-plugin-optimize-clsx": "^2.6.2", "eslint": "^8.43.0", "eslint-config-prettier": "^9.0.0", @@ -105,7 +105,7 @@ "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", "vite": "^5.0.0-beta.13", - "vitest": "^0.34.1" + "vitest": "^1.0.0-beta.3" }, "peerDependencies": { "react": "^18.0", From c7553dae2aad54515d6a630001dfd77aff4f6e6a Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Sat, 28 Oct 2023 14:05:49 -0500 Subject: [PATCH 3/9] Remove `experimentalVmThreads`, fix `useAtomics` --- vite.config.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index 7a57115da9..7924f10f7d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -38,7 +38,11 @@ export default defineConfig({ test: { root: '.', environment: 'jsdom', - experimentalVmThreads: true, + poolOptions: { + vmThreads: { + useAtomics: true + } + }, globals: true, coverage: { provider: 'v8', @@ -47,7 +51,6 @@ export default defineConfig({ all: true, reporter: ['text', 'json'] }, - useAtomics: true, testTimeout: isCI ? 10000 : 5000, setupFiles: ['test/setup.ts'], restoreMocks: true, From 50b14a866c40e72ec89d99ce3d60a1aa92841d0e Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Sat, 28 Oct 2023 14:08:42 -0500 Subject: [PATCH 4/9] Add `@types/node` --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 727f9b2bd2..f7655ed8d2 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.1.1", "@types/lodash-es": "^4.17.7", + "@types/node": "^20.8.9", "@types/react": "18.2.21", "@types/react-dom": "^18.2.4", "@typescript-eslint/eslint-plugin": "^6.1.0", From 43b77f9011fded3994044a787b7d6f426eb8b359 Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Mon, 6 Nov 2023 09:23:10 -0600 Subject: [PATCH 5/9] `5.0.0-beta.16` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7655ed8d2..9d1942dd9e 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "rollup": "^4.0.2", "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", - "vite": "^5.0.0-beta.13", + "vite": "^5.0.0-beta.16", "vitest": "^1.0.0-beta.3" }, "peerDependencies": { From a0b772a8658beee3db48ee3eebc06ef6f62d6d98 Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Fri, 10 Nov 2023 16:38:42 -0600 Subject: [PATCH 6/9] update deps --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 31f06a9f74..bf63020817 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@types/react-dom": "^18.2.4", "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", - "@vitejs/plugin-react": "^4.0.2", + "@vitejs/plugin-react": "^4.1.1", "@vitest/coverage-v8": "^1.0.0-beta.3", "babel-plugin-optimize-clsx": "^2.6.2", "eslint": "^8.43.0", @@ -105,8 +105,8 @@ "rollup": "^4.0.2", "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", - "vite": "^5.0.0-beta.16", - "vitest": "^1.0.0-beta.3" + "vite": "^5.0.0-beta.17", + "vitest": "^1.0.0-beta.4" }, "peerDependencies": { "react": "^18.0", From 4706c3d13001abcbf7632d7eadd991287be39587 Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Wed, 15 Nov 2023 13:51:33 -0600 Subject: [PATCH 7/9] update deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 83afd4f423..4ecd46d19f 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", "@vitejs/plugin-react": "^4.1.1", - "@vitest/coverage-v8": "^1.0.0-beta.3", + "@vitest/coverage-v8": "^1.0.0-beta.4", "babel-plugin-optimize-clsx": "^2.6.2", "eslint": "^8.43.0", "eslint-config-prettier": "^9.0.0", @@ -105,7 +105,7 @@ "rollup": "^4.0.2", "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", - "vite": "^5.0.0-beta.17", + "vite": "^5.0.0-beta.20", "vitest": "^1.0.0-beta.4" }, "peerDependencies": { From 561d7ab5d0a256c852696743e7e6c46fa6172d7e Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Thu, 16 Nov 2023 08:23:45 -0600 Subject: [PATCH 8/9] update deps --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4ecd46d19f..e6570ac75c 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "@types/react-dom": "^18.2.4", "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", - "@vitejs/plugin-react": "^4.1.1", + "@vitejs/plugin-react": "^4.2.0", "@vitest/coverage-v8": "^1.0.0-beta.4", "babel-plugin-optimize-clsx": "^2.6.2", "eslint": "^8.43.0", @@ -105,7 +105,7 @@ "rollup": "^4.0.2", "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", - "vite": "^5.0.0-beta.20", + "vite": "^5.0.0", "vitest": "^1.0.0-beta.4" }, "peerDependencies": { From ad90e5b9b7af3908cef5bc1c9659cc949044da5d Mon Sep 17 00:00:00 2001 From: Aman Mahajan Date: Mon, 20 Nov 2023 08:49:40 -0600 Subject: [PATCH 9/9] Use stable versions --- package.json | 8 ++++---- vite.config.ts | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index e6570ac75c..19273345b3 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,8 @@ "postpublish": "git push --follow-tags origin HEAD" }, "dependencies": { - "clsx": "^2.0.0" + "clsx": "^2.0.0", + "save-dev": "^0.0.1-security" }, "devDependencies": { "@babel/core": "^7.20.12", @@ -73,13 +74,12 @@ "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.1.1", "@types/lodash-es": "^4.17.7", - "@types/node": "^20.8.9", "@types/react": "^18.2.35", "@types/react-dom": "^18.2.4", "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", "@vitejs/plugin-react": "^4.2.0", - "@vitest/coverage-v8": "^1.0.0-beta.4", + "@vitest/coverage-v8": "^0.34.1", "babel-plugin-optimize-clsx": "^2.6.2", "eslint": "^8.43.0", "eslint-config-prettier": "^9.0.0", @@ -106,7 +106,7 @@ "rollup-plugin-postcss": "^4.0.2", "typescript": "~5.2.2", "vite": "^5.0.0", - "vitest": "^1.0.0-beta.4" + "vitest": "^0.34.1" }, "peerDependencies": { "react": "^18.0", diff --git a/vite.config.ts b/vite.config.ts index 7924f10f7d..7a57115da9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -38,11 +38,7 @@ export default defineConfig({ test: { root: '.', environment: 'jsdom', - poolOptions: { - vmThreads: { - useAtomics: true - } - }, + experimentalVmThreads: true, globals: true, coverage: { provider: 'v8', @@ -51,6 +47,7 @@ export default defineConfig({ all: true, reporter: ['text', 'json'] }, + useAtomics: true, testTimeout: isCI ? 10000 : 5000, setupFiles: ['test/setup.ts'], restoreMocks: true,