Merge branch 'main' into feature/isClass

scripts/bench-file/src/main.ts

@@ -13,7 +13,7 @@ async function main() {
     watch: false,
     pool: 'vmThreads',
     includeTaskLocation: true,
-    config: new URL('../vitest.config.ts', import.meta.url).pathname,
+    config: new URL('../../../vitest.config.ts', import.meta.url).pathname,
     benchmark: {
       reporters: [
         reportToBenchmarkHandler(report => {

scripts/benchmarks/src/runner.ts

@@ -1,17 +1,14 @@
 import { execa } from 'execa'
 import type { BenchmarkReport } from './reporter.ts'
 
-const tsx = './scripts/benchmarks/node_modules/.bin/tsx'
-const runner = './scripts/benchmarks/vitest-bench.ts'
-
-export function runVitest(file: string) {
+export async function runVitest(file: string) {
   console.log(`Running benchmarks in ./${file}`)
-
-  return execa(tsx, [runner, file], { reject: false }).then(result => {
-    if (result.exitCode !== 0) {
-      console.error(result.stderr)
-      throw new Error('Benchmark failed. See above for details.')
-    }
-    return JSON.parse(result.stdout) as BenchmarkReport[]
+  const result = await execa('node', ['scripts/run', 'bench-file', file], {
+    reject: false,
   })
+  if (result.exitCode !== 0) {
+    console.error(result.stderr)
+    throw new Error('Benchmark failed. See above for details.')
+  }
+  return JSON.parse(result.stdout) as BenchmarkReport[]
 }