From 2b59e7f7c17363a618ec80a4ed3c6ecd5be20f76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 24 Sep 2023 18:06:32 +0200 Subject: [PATCH] build(deps): apply updates MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- package.json | 12 ++--- pnpm-lock.yaml | 94 ++++++++++++++++----------------- src/worker/WorkerAbstract.ts | 4 +- src/worker/WorkerDynamicPool.ts | 8 +-- src/worker/WorkerFixedPool.ts | 8 +-- 5 files changed, 65 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index 7c090549..a940fa98 100644 --- a/package.json +++ b/package.json @@ -99,10 +99,10 @@ } }, "dependencies": { - "@mikro-orm/core": "^5.8.2", - "@mikro-orm/mariadb": "^5.8.2", - "@mikro-orm/reflection": "^5.8.2", - "@mikro-orm/sqlite": "^5.8.2", + "@mikro-orm/core": "^5.8.3", + "@mikro-orm/mariadb": "^5.8.3", + "@mikro-orm/reflection": "^5.8.3", + "@mikro-orm/sqlite": "^5.8.3", "ajv": "^8.12.0", "ajv-formats": "^2.1.1", "basic-ftp": "^5.0.3", @@ -113,7 +113,7 @@ "logform": "^2.5.1", "mnemonist": "^0.39.5", "mongodb": "^6.1.0", - "poolifier": "^2.7.2", + "poolifier": "^2.7.3", "source-map-support": "^0.5.21", "tar": "^6.2.0", "tslib": "^2.6.2", @@ -128,7 +128,7 @@ "devDependencies": { "@commitlint/cli": "^17.7.1", "@commitlint/config-conventional": "^17.7.0", - "@mikro-orm/cli": "^5.8.2", + "@mikro-orm/cli": "^5.8.3", "@release-it/bumper": "^5.1.0", "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-terser": "^0.4.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1531e94c..f3780235 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,17 +15,17 @@ overrides: dependencies: '@mikro-orm/core': - specifier: ^5.8.2 - version: 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) + specifier: ^5.8.3 + version: 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) '@mikro-orm/mariadb': - specifier: ^5.8.2 - version: 5.8.2(@mikro-orm/core@5.8.2) + specifier: ^5.8.3 + version: 5.8.3(@mikro-orm/core@5.8.3) '@mikro-orm/reflection': - specifier: ^5.8.2 - version: 5.8.2(@mikro-orm/core@5.8.2) + specifier: ^5.8.3 + version: 5.8.3(@mikro-orm/core@5.8.3) '@mikro-orm/sqlite': - specifier: ^5.8.2 - version: 5.8.2(@mikro-orm/core@5.8.2) + specifier: ^5.8.3 + version: 5.8.3(@mikro-orm/core@5.8.3) ajv: specifier: ^8.12.0 version: 8.12.0 @@ -57,8 +57,8 @@ dependencies: specifier: ^6.1.0 version: 6.1.0 poolifier: - specifier: ^2.7.2 - version: 2.7.2 + specifier: ^2.7.3 + version: 2.7.3 source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -94,8 +94,8 @@ devDependencies: specifier: ^17.7.0 version: 17.7.0 '@mikro-orm/cli': - specifier: ^5.8.2 - version: 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) + specifier: ^5.8.3 + version: 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) '@release-it/bumper': specifier: ^5.1.0 version: 5.1.0(release-it@16.2.0) @@ -826,8 +826,8 @@ packages: resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==} dev: true - /@mikro-orm/cli@5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2): - resolution: {integrity: sha512-hyKce5ffaKEwissrWoqImJ20ak5ANbPvHhDVCOTYrRSkzuvkH3vYebqFdLpfFTuOTAQjZF8qLO4xd4tqiqJgKw==} + /@mikro-orm/cli@5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3): + resolution: {integrity: sha512-79q8Cn9g5H21F/XjE6of/zXWsSBBFdSJzmqBHCmxN5cNXCYFNNYZZY8/EfqNCmgF6hxjRjp7j4GtpSuXxTbyFg==} engines: {node: '>= 14.0.0'} hasBin: true peerDependencies: @@ -864,10 +864,10 @@ packages: optional: true dependencies: '@jercle/yargonaut': 1.1.5 - '@mikro-orm/core': 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) - '@mikro-orm/knex': 5.8.2(@mikro-orm/core@5.8.2)(sqlite3@5.1.6) - '@mikro-orm/mariadb': 5.8.2(@mikro-orm/core@5.8.2) - '@mikro-orm/sqlite': 5.8.2(@mikro-orm/core@5.8.2) + '@mikro-orm/core': 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) + '@mikro-orm/knex': 5.8.3(@mikro-orm/core@5.8.3)(sqlite3@5.1.6) + '@mikro-orm/mariadb': 5.8.3(@mikro-orm/core@5.8.3) + '@mikro-orm/sqlite': 5.8.3(@mikro-orm/core@5.8.3) fs-extra: 11.1.1 tsconfig-paths: 4.2.0 yargs: 17.7.2 @@ -883,8 +883,8 @@ packages: - tedious dev: true - /@mikro-orm/core@5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2): - resolution: {integrity: sha512-EpXHZIhPwGUx833JTRl+AgIhctcvuqEE1KUhVbJgTmH3xOoGGkbpxYVkHzGehu+Yr66n+/SxJywfD3fDh5ujng==} + /@mikro-orm/core@5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3): + resolution: {integrity: sha512-KZIvcOSHa6K/1ej4GhXYg6QbtUDexmsswK4v5ZiIQcQka6f4v+K0FZR3fYJZXW5YoUzQjTuLX6cYaZ08uEM3Jw==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/better-sqlite': ^5.0.0 @@ -919,18 +919,18 @@ packages: '@mikro-orm/sqlite': optional: true dependencies: - '@mikro-orm/mariadb': 5.8.2(@mikro-orm/core@5.8.2) - '@mikro-orm/sqlite': 5.8.2(@mikro-orm/core@5.8.2) + '@mikro-orm/mariadb': 5.8.3(@mikro-orm/core@5.8.3) + '@mikro-orm/sqlite': 5.8.3(@mikro-orm/core@5.8.3) acorn-loose: 8.3.0 acorn-walk: 8.2.0 dotenv: 16.3.1 fs-extra: 11.1.1 globby: 11.1.0 - mikro-orm: 5.8.2 + mikro-orm: 5.8.3 reflect-metadata: 0.1.13 - /@mikro-orm/knex@5.8.2(@mikro-orm/core@5.8.2)(sqlite3@5.1.6): - resolution: {integrity: sha512-Sc/kXP1sX59XEYG3Ko+dHq6Ra8v/TI2UTEfYH97KyFiUvOmT4hXOjrOTOUKHUHPZFSPgUBWWNWcY/B525CCOXQ==} + /@mikro-orm/knex@5.8.3(@mikro-orm/core@5.8.3)(sqlite3@5.1.6): + resolution: {integrity: sha512-+fQ/Cl8wLJjmHUHPPRtnf5rwAGKW+reVIZe5qER7W7UIc2ZiGS0tTldKM9r4bWBme/+mppaK8lv1qwb8WikkoQ==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -960,7 +960,7 @@ packages: sqlite3: optional: true dependencies: - '@mikro-orm/core': 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) + '@mikro-orm/core': 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) fs-extra: 11.1.1 knex: 2.5.1(sqlite3@5.1.6) sqlite3: 5.1.6 @@ -970,8 +970,8 @@ packages: - supports-color - tedious - /@mikro-orm/mariadb@5.8.2(@mikro-orm/core@5.8.2): - resolution: {integrity: sha512-eZnGg3o6z6KNGkb1PO95803Qy0uNE+dzeHpDdo5+PworKipkowIWjbuQAsjcT7BlvyFS4HIgwg5ObLkPIbpO4w==} + /@mikro-orm/mariadb@5.8.3(@mikro-orm/core@5.8.3): + resolution: {integrity: sha512-SNJStVrYlTHJJFP2h+V6TiYj+YpUIGu+93lHIJg4CNnGlIf/c6tiGCeY4Xs9lKUTwPX+AL2fstS012dFICbKIw==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -986,8 +986,8 @@ packages: '@mikro-orm/seeder': optional: true dependencies: - '@mikro-orm/core': 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) - '@mikro-orm/knex': 5.8.2(@mikro-orm/core@5.8.2)(sqlite3@5.1.6) + '@mikro-orm/core': 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) + '@mikro-orm/knex': 5.8.3(@mikro-orm/core@5.8.3)(sqlite3@5.1.6) mariadb: 2.5.6 transitivePeerDependencies: - better-sqlite3 @@ -1000,19 +1000,19 @@ packages: - supports-color - tedious - /@mikro-orm/reflection@5.8.2(@mikro-orm/core@5.8.2): - resolution: {integrity: sha512-Fdx6OmII1eUPQ0XC4ydtPGNN7v8xUfCBBNX4/KXQVw8Cc3/BQqf60LDz+VKFdbwBasYZqhwEES4Rs4az57ocXQ==} + /@mikro-orm/reflection@5.8.3(@mikro-orm/core@5.8.3): + resolution: {integrity: sha512-VO0qd6RSS/04hbsPLolQ+6rgWcajJtlxL5liCjz9bXJ53w8C47bryi/1UzP3W0ywqTaYnGlP+gmzw797Te/nww==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 dependencies: - '@mikro-orm/core': 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) + '@mikro-orm/core': 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) globby: 11.1.0 - ts-morph: 19.0.0 + ts-morph: 20.0.0 dev: false - /@mikro-orm/sqlite@5.8.2(@mikro-orm/core@5.8.2): - resolution: {integrity: sha512-rPFYajRbIjPYwOprODhdeY2O4auH/P+GI2spUPW/5mLaPtxLCelenwipCUDjYbiXBOVTXBJs8TnebgirGCXreQ==} + /@mikro-orm/sqlite@5.8.3(@mikro-orm/core@5.8.3): + resolution: {integrity: sha512-UNQ6ABACE6e+Capjydg+mBmn62KsQygpVuROwjuC9KzXByEZXf45W9xhZ69MrJHuqKbEsc7/LEmCMYhiX5KAuQ==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -1027,8 +1027,8 @@ packages: '@mikro-orm/seeder': optional: true dependencies: - '@mikro-orm/core': 5.8.2(@mikro-orm/mariadb@5.8.2)(@mikro-orm/sqlite@5.8.2) - '@mikro-orm/knex': 5.8.2(@mikro-orm/core@5.8.2)(sqlite3@5.1.6) + '@mikro-orm/core': 5.8.3(@mikro-orm/mariadb@5.8.3)(@mikro-orm/sqlite@5.8.3) + '@mikro-orm/knex': 5.8.3(@mikro-orm/core@5.8.3)(sqlite3@5.1.6) fs-extra: 11.1.1 sqlite3: 5.1.6 sqlstring-sqlite: 0.1.1 @@ -1421,8 +1421,8 @@ packages: resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==} dev: true - /@ts-morph/common@0.20.0: - resolution: {integrity: sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==} + /@ts-morph/common@0.21.0: + resolution: {integrity: sha512-ES110Mmne5Vi4ypUKrtVQfXFDtCsDXiUiGxF6ILVlE90dDD4fdpC1LSjydl/ml7xJWKSDZwUYD2zkOePMSrPBA==} dependencies: fast-glob: 3.3.1 minimatch: 7.4.6 @@ -6526,8 +6526,8 @@ packages: braces: 3.0.2 picomatch: 2.3.1 - /mikro-orm@5.8.2: - resolution: {integrity: sha512-z/Rou5YS6hIIKEhiBcdLxsFAZvNNkMavrJ4cS/PCxuNb4vNDC51iKQYFS2Xm88q8rr0Ug2ctYdJ6ZA872KfWIQ==} + /mikro-orm@5.8.3: + resolution: {integrity: sha512-Iitd23Q3ZcT127SUmBPk8j7FHwCjLNDVlY7FSeQ+xwkRD51fLBqXMNjgbXcQtn8EHtWuA52Wzx6R401No/lqng==} engines: {node: '>= 14.0.0'} /miller-rabin@4.0.1: @@ -7744,8 +7744,8 @@ packages: dependencies: semver-compare: 1.0.0 - /poolifier@2.7.2: - resolution: {integrity: sha512-PazWvHDY+xnSK23QF1jTqo+nMPF1VWI8sS9Q8z8rAkAid6vnHJleMwfofMvN97F9kCSdCLsaL2QMekb/YxF/qA==} + /poolifier@2.7.3: + resolution: {integrity: sha512-s3O4womlvc3OSGEPBjJcPoIGczSxOMXaRfcnNzvbKWKg12PZtjONC2oacjxOIHxBzinY1gc6W7akwrqR4qPgxA==} engines: {node: '>=16.14.0', pnpm: '>=8.6.0'} requiresBuild: true dev: false @@ -9331,10 +9331,10 @@ packages: typescript: 5.2.2 dev: true - /ts-morph@19.0.0: - resolution: {integrity: sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==} + /ts-morph@20.0.0: + resolution: {integrity: sha512-JVmEJy2Wow5n/84I3igthL9sudQ8qzjh/6i4tmYCm6IqYyKFlNbJZi7oBdjyqcWSWYRu3CtL0xbT6fS03ESZIg==} dependencies: - '@ts-morph/common': 0.20.0 + '@ts-morph/common': 0.21.0 code-block-writer: 12.0.0 dev: false diff --git a/src/worker/WorkerAbstract.ts b/src/worker/WorkerAbstract.ts index 32319ab2..6f697a3c 100644 --- a/src/worker/WorkerAbstract.ts +++ b/src/worker/WorkerAbstract.ts @@ -1,7 +1,7 @@ import type { EventEmitter } from 'node:events'; import { existsSync } from 'node:fs'; -import type { PoolEmitter, PoolInfo } from 'poolifier'; +import type { PoolInfo } from 'poolifier'; import type { SetInfo, WorkerData, WorkerOptions } from './WorkerTypes'; import { defaultErrorHandler, defaultExitHandler } from './WorkerUtils'; @@ -12,7 +12,7 @@ export abstract class WorkerAbstract { public abstract readonly info: PoolInfo | SetInfo; public abstract readonly size: number; public abstract readonly maxElementsPerWorker: number | undefined; - public abstract readonly emitter: EventEmitter | PoolEmitter | undefined; + public abstract readonly emitter: EventEmitter | undefined; /** * `WorkerAbstract` constructor. diff --git a/src/worker/WorkerDynamicPool.ts b/src/worker/WorkerDynamicPool.ts index 7506a5f1..a5a7fa0c 100644 --- a/src/worker/WorkerDynamicPool.ts +++ b/src/worker/WorkerDynamicPool.ts @@ -1,4 +1,6 @@ -import { DynamicThreadPool, type PoolEmitter, type PoolInfo } from 'poolifier'; +import type { EventEmitter } from 'node:events'; + +import { DynamicThreadPool, type PoolInfo } from 'poolifier'; import { WorkerAbstract } from './WorkerAbstract'; import type { WorkerData, WorkerOptions } from './WorkerTypes'; @@ -35,8 +37,8 @@ export class WorkerDynamicPool extends WorkerAbstract { return undefined; } - get emitter(): PoolEmitter | undefined { - return this.pool?.emitter; + get emitter(): EventEmitter | undefined { + return this.pool?.emitter as EventEmitter; } /** @inheritDoc */ diff --git a/src/worker/WorkerFixedPool.ts b/src/worker/WorkerFixedPool.ts index f2a47cef..33fdae49 100644 --- a/src/worker/WorkerFixedPool.ts +++ b/src/worker/WorkerFixedPool.ts @@ -1,4 +1,6 @@ -import { FixedThreadPool, type PoolEmitter, type PoolInfo } from 'poolifier'; +import type { EventEmitter } from 'node:events'; + +import { FixedThreadPool, type PoolInfo } from 'poolifier'; import { WorkerAbstract } from './WorkerAbstract'; import type { WorkerData, WorkerOptions } from './WorkerTypes'; @@ -34,8 +36,8 @@ export class WorkerFixedPool extends WorkerAbstract { return undefined; } - get emitter(): PoolEmitter | undefined { - return this.pool?.emitter; + get emitter(): EventEmitter | undefined { + return this.pool?.emitter as EventEmitter; } /** @inheritDoc */ -- 2.34.1