From 609536c865483e28856d7c6608ac1a3a2e79dfbb Mon Sep 17 00:00:00 2001 From: Dimitri Mitropoulos Date: Wed, 9 Oct 2024 18:11:49 -0400 Subject: [PATCH] merge conflict --- pnpm-lock.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd76002d36624..1616797145e2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -161,7 +161,7 @@ importers: version: 29.7.0(@types/node@18.17.4) ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.2.2) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.2.2) tsup: specifier: ^6.7.0 version: 6.7.0(typescript@5.2.2) @@ -235,7 +235,7 @@ importers: version: 2.2.3 ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3) tsup: specifier: ^6.2.0 version: 6.7.0(ts-node@10.9.1)(typescript@5.3.3) @@ -418,7 +418,7 @@ importers: version: 3.1.1 ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3) tsup: specifier: ^6.7.0 version: 6.7.0(ts-node@10.9.1)(typescript@5.3.3) @@ -496,7 +496,7 @@ importers: version: 29.7.0(@types/node@18.17.4)(ts-node@10.9.1) ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3) tsup: specifier: ^6.7.0 version: 6.7.0(ts-node@10.9.1)(typescript@5.3.3) @@ -542,7 +542,7 @@ importers: version: 29.7.0(@types/node@18.17.4) ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) tsup: specifier: ^5.12.1 version: 5.12.9(typescript@5.3.3) @@ -649,7 +649,7 @@ importers: version: 29.7.0(@types/node@18.17.4) ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) typescript: specifier: 5.3.3 version: 5.3.3 @@ -748,7 +748,7 @@ importers: version: 6.1.13 ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) typescript: specifier: 5.3.3 version: 5.3.3 @@ -858,7 +858,7 @@ importers: version: 6.0.1 ts-jest: specifier: ^29.2.5 - version: 29.2.5(@babel/core@7.23.6)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) + version: 29.2.5(@babel/core@7.25.2)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3) tsup: specifier: ^5.10.3 version: 5.12.9(typescript@5.3.3) @@ -9761,9 +9761,9 @@ packages: hasBin: true dev: true - /pretty-format@27.5.1: - resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + /pretty-format@29.7.0: + resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/schemas': 29.6.3 ansi-styles: 5.2.0 @@ -11015,7 +11015,7 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: true - /ts-jest@29.2.5(@babel/core@7.23.6)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3): + /ts-jest@29.2.5(@babel/core@7.25.2)(esbuild@0.14.49)(jest@29.7.0)(typescript@5.3.3): resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -11039,7 +11039,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.6 + '@babel/core': 7.25.2 bs-logger: 0.2.6 ejs: 3.1.10 esbuild: 0.14.49 @@ -11054,7 +11054,7 @@ packages: yargs-parser: 21.1.1 dev: true - /ts-jest@29.2.5(@babel/core@7.23.6)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.2.2): + /ts-jest@29.2.5(@babel/core@7.25.2)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.2.2): resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -11078,7 +11078,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.6 + '@babel/core': 7.25.2 bs-logger: 0.2.6 ejs: 3.1.10 esbuild: 0.17.18 @@ -11093,7 +11093,7 @@ packages: yargs-parser: 21.1.1 dev: true - /ts-jest@29.2.5(@babel/core@7.23.6)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3): + /ts-jest@29.2.5(@babel/core@7.25.2)(esbuild@0.17.18)(jest@29.7.0)(typescript@5.3.3): resolution: {integrity: sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==} engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0} hasBin: true @@ -11117,7 +11117,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.23.6 + '@babel/core': 7.25.2 bs-logger: 0.2.6 ejs: 3.1.10 esbuild: 0.17.18