diff --git a/packages/vitest/package.json b/packages/vitest/package.json index 253b99bfff13..e3bacd409bd9 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -88,7 +88,7 @@ "chai": "^4.3.6", "debug": "^4.3.4", "local-pkg": "^0.4.1", - "tinypool": "^0.1.3", + "tinypool": "^0.2.1", "tinyspy": "^0.3.3", "vite": "^2.9.12" }, diff --git a/packages/vitest/src/node/pool.ts b/packages/vitest/src/node/pool.ts index c99936535f49..227d745b8336 100644 --- a/packages/vitest/src/node/pool.ts +++ b/packages/vitest/src/node/pool.ts @@ -76,7 +76,6 @@ export function createPool(ctx: Vitest): WorkerPool { files, invalidates, workerId, - poolId: !ctx.config.threads ? 1 : ((workerId - 1) % maxThreads) + 1, } try { await pool.run(data, { transferList: [workerPort], name }) diff --git a/packages/vitest/src/runtime/worker.ts b/packages/vitest/src/runtime/worker.ts index d3b0da3d5f20..4d3c463b70a0 100644 --- a/packages/vitest/src/runtime/worker.ts +++ b/packages/vitest/src/runtime/worker.ts @@ -1,5 +1,6 @@ import { resolve } from 'pathe' import { createBirpc } from 'birpc' +import { workerId as poolId } from 'tinypool' import { ModuleCacheMap } from 'vite-node/client' import type { ResolvedConfig, WorkerContext, WorkerRPC } from '../types' import { distDir } from '../constants' @@ -63,7 +64,7 @@ function init(ctx: WorkerContext) { if (typeof __vitest_worker__ !== 'undefined' && ctx.config.threads && ctx.config.isolate) throw new Error(`worker for ${ctx.files.join(',')} already initialized by ${getWorkerState().ctx.files.join(',')}. This is probably an internal bug of Vitest.`) - const { config, port, workerId, poolId } = ctx + const { config, port, workerId } = ctx process.env.VITEST_WORKER_ID = String(workerId) process.env.VITEST_POOL_ID = String(poolId) diff --git a/packages/vitest/src/types/worker.ts b/packages/vitest/src/types/worker.ts index 1ff9e70c0fac..24f5ed1b4dd3 100644 --- a/packages/vitest/src/types/worker.ts +++ b/packages/vitest/src/types/worker.ts @@ -9,7 +9,6 @@ import type { UserConsoleLog } from './general' export interface WorkerContext { workerId: number - poolId: number port: MessagePort config: ResolvedConfig files: string[] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8de30507a22a..9edd404c6508 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -685,7 +685,7 @@ importers: rollup: ^2.75.7 source-map-js: ^1.0.2 strip-ansi: ^7.0.1 - tinypool: ^0.1.3 + tinypool: ^0.2.1 tinyspy: ^0.3.3 typescript: ^4.7.4 vite: ^2.9.10 @@ -698,7 +698,7 @@ importers: chai: 4.3.6 debug: 4.3.4 local-pkg: 0.4.1 - tinypool: 0.1.3 + tinypool: 0.2.1 tinyspy: 0.3.3 vite: 2.9.10 devDependencies: @@ -19491,8 +19491,8 @@ packages: setimmediate: 1.0.5 dev: true - /tinypool/0.1.3: - resolution: {integrity: sha512-2IfcQh7CP46XGWGGbdyO4pjcKqsmVqFAPcXfPxcPXmOWt9cYkTP9HcDmGgsfijYoAEc4z9qcpM/BaBz46Y9/CQ==} + /tinypool/0.2.1: + resolution: {integrity: sha512-HFU5ZYVq3wBfhSaf8qdqGsneaqXm0FgJQpoUlJbVdHpRLzm77IneKAD3RjzJWZvIv0YpPB9S7LUW53f6BE6ZSg==} engines: {node: '>=14.0.0'} dev: false