resolve pnpm lock error

pull/3386/head
Yuxuan Zhang 2 years ago
parent 754a8cb993
commit e98da5ba9c
No known key found for this signature in database
GPG Key ID: 6910B04F3351EF7D

@ -193,7 +193,7 @@
"rollup": "^4.9.4",
"rollup-plugin-dts": "^6.1.0",
"rollup-plugin-esbuild": "^6.1.0",
"rpc-magic-proxy": "^1.0.6",
"rpc-magic-proxy": "^2.0.5",
"semver": "^7.5.4",
"simple-git-hooks": "^2.9.0",
"sirv": "^2.0.4",

@ -280,8 +280,8 @@ importers:
specifier: ^6.1.0
version: 6.1.0(esbuild@0.19.11)(rollup@4.9.4)(supports-color@9.4.0)
rpc-magic-proxy:
specifier: ^1.0.6
version: 1.0.6
specifier: ^2.0.5
version: 2.0.5
semver:
specifier: ^7.5.4
version: 7.5.4
@ -302,7 +302,7 @@ importers:
version: 5.3.3
vitest:
specifier: ^1.1.3
version: 1.1.3(@types/node@20.10.7)(supports-color@9.4.0)
version: 1.1.3(@types/node@20.10.7)(jsdom@23.0.1)(supports-color@9.4.0)
vue-tsc:
specifier: ^1.8.27
version: 1.8.27(typescript@5.3.3)
@ -1173,7 +1173,7 @@ packages:
/@types/jsdom@21.1.6:
resolution: {integrity: sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==}
dependencies:
'@types/node': 20.10.6
'@types/node': 20.10.7
'@types/tough-cookie': 4.0.5
parse5: 7.1.2
dev: true
@ -4024,8 +4024,8 @@ packages:
'@rollup/rollup-win32-x64-msvc': 4.9.4
fsevents: 2.3.3
/rpc-magic-proxy@1.0.6:
resolution: {integrity: sha512-0h0zldD09BLpMi/46xuGFsre2h68LVhIIEqjrSq0bAyeP+ph4/BDmoG4ykNFrU7v2Bx4mS3vX/KNZPVlG6JXQQ==}
/rpc-magic-proxy@2.0.5:
resolution: {integrity: sha512-kWSijJDMMpYdOW79eMLfRQLuKtrTVeV0fsm6s9pjhujD0Z9cD1ZbutT1q4h7PGwr1qEWwcdgMEPgKUiqOX2JoQ==}
dev: true
/rrweb-cssom@0.6.0:
@ -4679,7 +4679,7 @@ packages:
optionalDependencies:
fsevents: 2.3.3
/vitest@1.1.3(@types/node@20.10.7)(supports-color@9.4.0):
/vitest@1.1.3(@types/node@20.10.7)(jsdom@23.0.1)(supports-color@9.4.0):
resolution: {integrity: sha512-2l8om1NOkiA90/Y207PsEvJLYygddsOyr81wLQ20Ra8IlLKbyQncWsGZjnbkyG2KwwuTXLQjEPOJuxGMG8qJBQ==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true

@ -1,5 +1,5 @@
import { Worker, isMainThread, parentPort, workerData } from 'worker_threads'
import RpcContext, { deferPromise } from 'rpc-magic-proxy'
import RPCContext, { deferPromise } from 'rpc-magic-proxy'
import { task, updateCurrentTask } from './utils/task'
import c from 'picocolors'
import Queue from './utils/queue'
@ -61,11 +61,11 @@ export async function launchWorkers(numWorkers: number, context: Object) {
debug(`launching ${numWorkers} workers`)
taskQueue = new Queue<WorkerTask>()
const allInitialized: Array<Promise<void>> = []
const ctx = new RpcContext()
const ctx = new RPCContext()
const getNextTask = () => taskQueue?.dequeue() ?? null
for (let i = 0; i < numWorkers; i++) {
const workerId = (i + 1).toString().padStart(2, '0')
const { promise, resolve } = deferPromise()
const { promise, resolve } = deferPromise<void>()
const initWorkerHooks = (hooks: WorkerInstance['hooks']) => {
Object.assign(worker, { workerId, hooks })
resolve()
@ -87,7 +87,7 @@ export async function launchWorkers(numWorkers: number, context: Object) {
const worker = new Worker(new URL(import.meta.url), {
workerData: { [WORKER_MAGIC]: payload }
}) as WorkerInstance
ctx.bind(worker)
ctx.bind(worker as any)
workers.push(worker)
allInitialized.push(promise)
worker.on('error', console.error)
@ -152,7 +152,7 @@ export function registerWorkload<T extends Object, K extends any[], V>(
// Will keep querying next workload from main thread
async function workerMainLoop() {
const ctx = new RpcContext({ preserveThis: true }).bind(parentPort!)
const ctx = new RPCContext().bind(parentPort! as any)
const {
workerMeta: _workerMeta,
initWorkerHooks,
@ -163,7 +163,7 @@ async function workerMainLoop() {
getNextTask: () => Promise<WorkerTask | null>
initWorkerHooks: (hooks: Object) => Promise<void>
context: Object
} = ctx.deserialize(workerData[WORKER_MAGIC])
} = ctx.deserialize(workerData[WORKER_MAGIC]) as any
// Set up magic proxy to main thread dispatchWork
workerMeta = _workerMeta!
if (workerMeta.debug) debug = workerMeta.debug

Loading…
Cancel
Save