From 0827499db017ef03f86fcccd5bae72ac41f3dbf4 Mon Sep 17 00:00:00 2001 From: Nate Kelley Date: Mon, 7 Jul 2025 12:58:29 -0600 Subject: [PATCH] update vitest --- apps/web/package.json | 4 +- apps/web/vitest.config.ts | 3 +- packages/vitest-config/package.json | 4 +- pnpm-lock.yaml | 112 ++++++---------------------- pnpm-workspace.yaml | 4 +- vitest.config.ts | 6 +- 6 files changed, 33 insertions(+), 100 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index a5961b715..7804d054d 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -126,8 +126,8 @@ "utility-types": "^3.11.0", "uuid": "catalog:", "virtua": "^0.41.5", - "vite": "^6.3.5", - "vite-tsconfig-paths": "^5.1.4", + "vite": "catalog:", + "vite-tsconfig-paths": "catalog:", "zod": "catalog:", "zustand": "^5.0.6" }, diff --git a/apps/web/vitest.config.ts b/apps/web/vitest.config.ts index c2a8ef269..6d361a64e 100644 --- a/apps/web/vitest.config.ts +++ b/apps/web/vitest.config.ts @@ -2,9 +2,10 @@ import { defineConfig, type ViteUserConfig } from 'vitest/config'; export default defineConfig(async () => { const { default: tsconfigPaths } = await import('vite-tsconfig-paths'); + const tsconfigPathsPlugin = tsconfigPaths() as any; return { - plugins: [tsconfigPaths()], + plugins: [tsconfigPathsPlugin], esbuild: { jsx: 'automatic' }, diff --git a/packages/vitest-config/package.json b/packages/vitest-config/package.json index 0dfcd5475..a4c17645c 100644 --- a/packages/vitest-config/package.json +++ b/packages/vitest-config/package.json @@ -32,8 +32,8 @@ "glob": "^11.0.3", "jsdom": "^26.1.0", "nyc": "^17.1.0", - "vite": "^6.3.5", - "vite-tsconfig-paths": "^5.1.4", + "vite": "catalog:", + "vite-tsconfig-paths": "catalog:", "vitest": "catalog:" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d5e62890e..4c4fb65b2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,8 +33,14 @@ catalogs: uuid: specifier: ^11.0.0 version: 11.1.0 + vite: + specifier: 6.3.5 + version: 6.3.5 + vite-tsconfig-paths: + specifier: ^5.1.4 + version: 5.1.4 vitest: - specifier: ^3.2.4 + specifier: 3.2.4 version: 3.2.4 zod: specifier: ^3.0.0 @@ -489,10 +495,10 @@ importers: specifier: ^0.41.5 version: 0.41.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(svelte@5.34.9)(vue@3.5.17(typescript@5.8.3)) vite: - specifier: ^6.3.5 + specifier: 'catalog:' version: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) vite-tsconfig-paths: - specifier: ^5.1.4 + specifier: 'catalog:' version: 5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) zod: specifier: 'catalog:' @@ -854,10 +860,10 @@ importers: specifier: ^17.1.0 version: 17.1.0 vite: - specifier: ^6.3.5 + specifier: 'catalog:' version: 6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) vite-tsconfig-paths: - specifier: ^5.1.4 + specifier: 'catalog:' version: 5.1.4(typescript@5.8.3)(vite@6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) vitest: specifier: 'catalog:' @@ -11300,46 +11306,6 @@ packages: yaml: optional: true - vite@7.0.2: - resolution: {integrity: sha512-hxdyZDY1CM6SNpKI4w4lcUc3Mtkd9ej4ECWVHSMrOdSinVc2zYOAppHeGc/hzmRo3pxM5blMzkuWHOJA/3NiFw==} - engines: {node: ^20.19.0 || >=22.12.0} - hasBin: true - peerDependencies: - '@types/node': ^20.19.0 || >=22.12.0 - jiti: '>=1.21.0' - less: ^4.0.0 - lightningcss: ^1.21.0 - sass: ^1.70.0 - sass-embedded: ^1.70.0 - stylus: '>=0.54.8' - sugarss: ^5.0.0 - terser: ^5.16.0 - tsx: ^4.8.1 - yaml: ^2.4.2 - peerDependenciesMeta: - '@types/node': - optional: true - jiti: - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - sass-embedded: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - tsx: - optional: true - yaml: - optional: true - vitest@3.2.4: resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} @@ -17530,23 +17496,23 @@ snapshots: chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.2.4(msw@2.10.3(@types/node@20.19.4)(typescript@5.8.3))(vite@7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))': + '@vitest/mocker@3.2.4(msw@2.10.3(@types/node@20.19.4)(typescript@5.8.3))(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))': dependencies: '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.10.3(@types/node@20.19.4)(typescript@5.8.3) - vite: 7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) + vite: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) - '@vitest/mocker@3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))': + '@vitest/mocker@3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0))': dependencies: '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: msw: 2.10.3(@types/node@24.0.10)(typescript@5.8.3) - vite: 7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) + vite: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) '@vitest/pretty-format@2.0.5': dependencies: @@ -24204,7 +24170,7 @@ snapshots: debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) + vite: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) transitivePeerDependencies: - '@types/node' - jiti @@ -24225,7 +24191,7 @@ snapshots: debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 7.0.2(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) + vite: 6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) transitivePeerDependencies: - '@types/node' - jiti @@ -24298,47 +24264,11 @@ snapshots: tsx: 4.20.3 yaml: 2.8.0 - vite@7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0): - dependencies: - esbuild: 0.25.5 - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 - postcss: 8.5.6 - rollup: 4.44.2 - tinyglobby: 0.2.14 - optionalDependencies: - '@types/node': 20.19.4 - fsevents: 2.3.3 - jiti: 2.4.2 - lightningcss: 1.30.1 - sass: 1.89.2 - terser: 5.43.1 - tsx: 4.20.3 - yaml: 2.8.0 - - vite@7.0.2(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0): - dependencies: - esbuild: 0.25.5 - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 - postcss: 8.5.6 - rollup: 4.44.2 - tinyglobby: 0.2.14 - optionalDependencies: - '@types/node': 24.0.10 - fsevents: 2.3.3 - jiti: 2.4.2 - lightningcss: 1.30.1 - sass: 1.89.2 - terser: 5.43.1 - tsx: 4.20.3 - yaml: 2.8.0 - vitest@3.2.4(@edge-runtime/vm@3.2.0)(@types/debug@4.1.12)(@types/node@20.19.4)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(msw@2.10.3(@types/node@20.19.4)(typescript@5.8.3))(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0): dependencies: '@types/chai': 5.2.2 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(msw@2.10.3(@types/node@20.19.4)(typescript@5.8.3))(vite@7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) + '@vitest/mocker': 3.2.4(msw@2.10.3(@types/node@20.19.4)(typescript@5.8.3))(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4 @@ -24356,7 +24286,7 @@ snapshots: tinyglobby: 0.2.14 tinypool: 1.1.1 tinyrainbow: 2.0.0 - vite: 7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) + vite: 6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) vite-node: 3.2.4(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) why-is-node-running: 2.3.0 optionalDependencies: @@ -24383,7 +24313,7 @@ snapshots: dependencies: '@types/chai': 5.2.2 '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@7.0.2(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) + '@vitest/mocker': 3.2.4(msw@2.10.3(@types/node@24.0.10)(typescript@5.8.3))(vite@6.3.5(@types/node@20.19.4)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0)) '@vitest/pretty-format': 3.2.4 '@vitest/runner': 3.2.4 '@vitest/snapshot': 3.2.4 @@ -24401,7 +24331,7 @@ snapshots: tinyglobby: 0.2.14 tinypool: 1.1.1 tinyrainbow: 2.0.0 - vite: 7.0.2(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) + vite: 6.3.5(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) vite-node: 3.2.4(@types/node@24.0.10)(jiti@2.4.2)(lightningcss@1.30.1)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)(yaml@2.8.0) why-is-node-running: 2.3.0 optionalDependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index ec5f104d5..dc22dbe71 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -15,10 +15,12 @@ catalog: "@trigger.dev/sdk": "^4.0.0-v4-beta.22" ai: "^4.0.0" axios: "^1.10.0" + "vite-tsconfig-paths": "^5.1.4" drizzle-orm: "^0.44.2" hono: "^4.8.0" "@mastra/core": "^0.10.8" pg: "^8.16.2" uuid: "^11.0.0" - vitest: "^3.2.4" + vitest: "3.2.4" + vite: "6.3.5" zod: "^3.0.0" diff --git a/vitest.config.ts b/vitest.config.ts index d0db9913f..6043219fd 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -3,9 +3,6 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { projects: [ - 'apps/server', - 'apps/trigger', - 'apps/web', 'packages/server-shared', 'packages/ai', 'packages/access-controls', @@ -17,6 +14,9 @@ export default defineConfig({ 'packages/supabase', 'packages/test-utils', 'packages/web-tools', + 'apps/server', + 'apps/trigger', + 'apps/web', ], }, });