From de6cdd19dfe7333b219345adb43e653a59f2c9f0 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Thu, 28 Dec 2023 09:30:56 +1100 Subject: [PATCH] Split up vitest command --- nx.json | 2 +- package.json | 9 ++++----- packages/match-sorter-utils/package.json | 4 +++- .../match-sorter-utils/test-setup.ts | 0 packages/match-sorter-utils/vitest.config.ts | 11 +++++++++++ packages/react-table/package.json | 4 +++- packages/react-table/test-setup.ts | 1 + packages/react-table/vitest.config.ts | 11 +++++++++++ packages/table-core/package.json | 4 +++- packages/table-core/test-setup.ts | 1 + packages/table-core/vitest.config.ts | 11 +++++++++++ project.json | 5 ----- scripts/publish.ts | 2 +- 13 files changed, 50 insertions(+), 15 deletions(-) rename test-setup.ts => packages/match-sorter-utils/test-setup.ts (100%) create mode 100644 packages/match-sorter-utils/vitest.config.ts create mode 100644 packages/react-table/test-setup.ts create mode 100644 packages/react-table/vitest.config.ts create mode 100644 packages/table-core/test-setup.ts create mode 100644 packages/table-core/vitest.config.ts diff --git a/nx.json b/nx.json index 63c6e4ccb1..f99212bfdf 100644 --- a/nx.json +++ b/nx.json @@ -26,7 +26,7 @@ "build-js": { "cache": true }, - "test:ci": { + "test:lib": { "cache": true }, "test:types": { diff --git a/package.json b/package.json index ef90220898..72c3b8b7a7 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "packageManager": "pnpm@8.12.1", "scripts": { "clean": "npm exec --workspaces -c \"rm -rf build || true\"", - "test": "(is-ci && npm run test:ci) || npm run test:dev", - "test:ci": "nx test:ci root", - "test:dev": "vitest --watch", + "test": "(is-ci && npm run test:lib) || npm run test:dev", + "test:lib": "nx run-many -t test:lib", + "test:lib:dev": "nx run-many -t test:lib:dev", "test:types": "nx run-many -t test:types", "build": "nx build root", "watch": "concurrently --kill-others \"rollup --config rollup.config.js -w\" \"tsc -b --watch\"", @@ -16,11 +16,10 @@ "cipublish": "ts-node scripts/publish.ts", "cipublishforce": "CI=true npm run cipublish", "typecheck": "nx typecheck root", - "pr": "nx run-many --targets=test:ci,build,test:types --projects=root" + "pr": "nx run-many --targets=test:lib,build,test:types --projects=root" }, "nx": { "includedScripts": [ - "test:ci", "build" ] }, diff --git a/packages/match-sorter-utils/package.json b/packages/match-sorter-utils/package.json index b310826aa5..75e85b21af 100644 --- a/packages/match-sorter-utils/package.json +++ b/packages/match-sorter-utils/package.json @@ -49,7 +49,9 @@ "src" ], "scripts": { - "test:types": "tsc" + "test:types": "tsc", + "test:lib": "vitest", + "test:lib:dev": "pnpm test:lib --watch" }, "dependencies": { "remove-accents": "0.4.2" diff --git a/test-setup.ts b/packages/match-sorter-utils/test-setup.ts similarity index 100% rename from test-setup.ts rename to packages/match-sorter-utils/test-setup.ts diff --git a/packages/match-sorter-utils/vitest.config.ts b/packages/match-sorter-utils/vitest.config.ts new file mode 100644 index 0000000000..76cc838656 --- /dev/null +++ b/packages/match-sorter-utils/vitest.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'vitest/config' + +export default defineConfig({ + test: { + watch: false, + setupFiles: ['test-setup.ts'], + environment: 'jsdom', + globals: true, + dir: '__tests__', + }, +}) diff --git a/packages/react-table/package.json b/packages/react-table/package.json index 3b1312df78..4d031b8be0 100644 --- a/packages/react-table/package.json +++ b/packages/react-table/package.json @@ -43,7 +43,9 @@ "src" ], "scripts": { - "test:types": "tsc" + "test:types": "tsc", + "test:lib": "vitest", + "test:lib:dev": "pnpm test:lib --watch" }, "dependencies": { "@tanstack/table-core": "workspace:*" diff --git a/packages/react-table/test-setup.ts b/packages/react-table/test-setup.ts new file mode 100644 index 0000000000..c44951a680 --- /dev/null +++ b/packages/react-table/test-setup.ts @@ -0,0 +1 @@ +import '@testing-library/jest-dom' diff --git a/packages/react-table/vitest.config.ts b/packages/react-table/vitest.config.ts new file mode 100644 index 0000000000..76cc838656 --- /dev/null +++ b/packages/react-table/vitest.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'vitest/config' + +export default defineConfig({ + test: { + watch: false, + setupFiles: ['test-setup.ts'], + environment: 'jsdom', + globals: true, + dir: '__tests__', + }, +}) diff --git a/packages/table-core/package.json b/packages/table-core/package.json index 5bc62ffc4b..c9c4ed04b5 100644 --- a/packages/table-core/package.json +++ b/packages/table-core/package.json @@ -45,6 +45,8 @@ "src" ], "scripts": { - "test:types": "tsc" + "test:types": "tsc", + "test:lib": "vitest", + "test:lib:dev": "pnpm test:lib --watch" } } diff --git a/packages/table-core/test-setup.ts b/packages/table-core/test-setup.ts new file mode 100644 index 0000000000..c44951a680 --- /dev/null +++ b/packages/table-core/test-setup.ts @@ -0,0 +1 @@ +import '@testing-library/jest-dom' diff --git a/packages/table-core/vitest.config.ts b/packages/table-core/vitest.config.ts new file mode 100644 index 0000000000..76cc838656 --- /dev/null +++ b/packages/table-core/vitest.config.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'vitest/config' + +export default defineConfig({ + test: { + watch: false, + setupFiles: ['test-setup.ts'], + environment: 'jsdom', + globals: true, + dir: '__tests__', + }, +}) diff --git a/project.json b/project.json index 8dc280d894..a8462f8198 100644 --- a/project.json +++ b/project.json @@ -14,11 +14,6 @@ "command": "echo \" @tanstack/table > All packages built! 📦\"", "dependsOn": ["build-js", "typecheck"], "inputs": ["packageSources"] - }, - "test:ci": { - "command": "vitest", - "inputs": ["packageSources", "{workspaceRoot}/packages/*/__tests__/**/*"], - "dependsOn": ["build-js"] } } } diff --git a/scripts/publish.ts b/scripts/publish.ts index 6710947865..70a1c7d23c 100644 --- a/scripts/publish.ts +++ b/scripts/publish.ts @@ -394,7 +394,7 @@ async function run() { } console.info('Testing packages...') - execSync(`npm run test:ci`, { encoding: 'utf8' }) + execSync(`npm run test:lib`, { encoding: 'utf8' }) console.info('') console.info(`Updating all changed packages to version ${version}...`)