From b75e0490dea71500452e3e1ef25f289aefb85a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Tesa=C5=99?= Date: Mon, 9 Oct 2023 16:22:54 +0200 Subject: [PATCH] Fix rebase issues --- packages/api/package.json | 2 +- packages/e2e/package.json | 2 +- packages/pusher/package.json | 2 +- pnpm-lock.yaml | 61 +++++++++--------------------------- 4 files changed, 18 insertions(+), 49 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 7a4702f8..afa8f82b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -34,6 +34,6 @@ "ethers": "^5.7.2", "express": "^4.18.2", "lodash": "^4.17.21", - "zod": "^3.22.2" + "zod": "^3.22.3" } } diff --git a/packages/e2e/package.json b/packages/e2e/package.json index abf896f1..33402c0e 100644 --- a/packages/e2e/package.json +++ b/packages/e2e/package.json @@ -29,7 +29,7 @@ "ethers": "^5.7.2", "express": "^4.18.2", "lodash": "^4.17.21", - "zod": "^3.22.2" + "zod": "^3.22.3" }, "devDependencies": { "@types/express": "^4.17.18", diff --git a/packages/pusher/package.json b/packages/pusher/package.json index 6cd2edfa..be743206 100644 --- a/packages/pusher/package.json +++ b/packages/pusher/package.json @@ -34,7 +34,7 @@ "ethers": "^5.7.2", "express": "^4.18.2", "lodash": "^4.17.21", - "zod": "^3.22.2" + "zod": "^3.22.3" }, "devDependencies": { "@types/express": "^4.17.18", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b0f6e95d..17451517 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,7 +58,7 @@ importers: dependencies: '@api3/commons': specifier: ^0.1.0 - version: 0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.2) + version: 0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.4) '@api3/promise-utils': specifier: ^0.4.0 version: 0.4.0 @@ -91,11 +91,23 @@ importers: specifier: ^3.0.1 version: 3.0.1 + packages/common: + dependencies: + winston: + specifier: ^3.10.0 + version: 3.10.0 + winston-console-format: + specifier: ^1.0.8 + version: 1.0.8 + zod: + specifier: ^3.22.3 + version: 3.22.4 + packages/e2e: dependencies: '@api3/commons': specifier: ^0.1.0 - version: 0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.2) + version: 0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.4) '@api3/promise-utils': specifier: ^0.4.0 version: 0.4.0 @@ -138,7 +150,7 @@ importers: version: 0.12.0 '@api3/commons': specifier: ^0.1.0 - version: 0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.2) + version: 0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.4) '@api3/ois': specifier: ^2.2.0 version: 2.2.0 @@ -290,43 +302,6 @@ packages: - utf-8-validate dev: false - /@api3/commons@0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.2): - resolution: {integrity: sha512-5gBVs/rf93S076gyb0Ccj16BnRsUEjy6FJF6BQd6V47bjfTlPeelB2kK/shr0MuQ6gifWdTsxBCOYWvbhhBxbw==} - engines: {node: ^18.14.0, pnpm: ^8.8.0} - peerDependencies: - eslint: ^8.50.0 - zod: ^3.22.2 - dependencies: - '@typescript-eslint/eslint-plugin': 6.7.3(@typescript-eslint/parser@6.7.3)(eslint@8.50.0)(typescript@5.2.2) - '@typescript-eslint/parser': 6.7.3(eslint@8.50.0)(typescript@5.2.2) - eslint: 8.50.0 - eslint-config-next: 13.5.4(eslint@8.50.0)(typescript@5.2.2) - eslint-plugin-check-file: 2.6.2(eslint@8.50.0) - eslint-plugin-cypress: 2.15.1(eslint@8.50.0) - eslint-plugin-deprecation: 2.0.0(eslint@8.50.0)(typescript@5.2.2) - eslint-plugin-functional: 6.0.0(eslint@8.50.0)(typescript@5.2.2) - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@6.7.3)(eslint-import-resolver-typescript@3.6.1)(eslint@8.50.0) - eslint-plugin-jest: 27.4.2(@typescript-eslint/eslint-plugin@6.7.3)(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2) - eslint-plugin-jest-formatting: 3.1.0(eslint@8.50.0) - eslint-plugin-lodash: 7.4.0(eslint@8.50.0) - eslint-plugin-no-only-tests: 3.1.0 - eslint-plugin-prefer-arrow: 1.2.3(eslint@8.50.0) - eslint-plugin-promise: 6.1.1(eslint@8.50.0) - eslint-plugin-react: 7.33.2(eslint@8.50.0) - eslint-plugin-react-hooks: 4.6.0(eslint@8.50.0) - eslint-plugin-unicorn: 48.0.1(eslint@8.50.0) - lodash: 4.17.21 - winston: 3.10.0 - winston-console-format: 1.0.8 - zod: 3.22.2 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - jest - - supports-color - - typescript - dev: false - /@api3/commons@0.1.0(eslint@8.50.0)(jest@29.7.0)(typescript@5.2.2)(zod@3.22.4): resolution: {integrity: sha512-5gBVs/rf93S076gyb0Ccj16BnRsUEjy6FJF6BQd6V47bjfTlPeelB2kK/shr0MuQ6gifWdTsxBCOYWvbhhBxbw==} engines: {node: ^18.14.0, pnpm: ^8.8.0} @@ -362,7 +337,6 @@ packages: - jest - supports-color - typescript - dev: true /@api3/ois@2.1.0: resolution: {integrity: sha512-KcDzCNhC1z4XSrpz5G6XsvgUdJhTEtDwJLJX6VP8QNhIk6FWKgCqYUHuJ4PhOoSkMGUPPVu5jYqGbZj4q8ymEA==} @@ -7234,10 +7208,5 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - /zod@3.22.2: - resolution: {integrity: sha512-wvWkphh5WQsJbVk1tbx1l1Ly4yg+XecD+Mq280uBGt9wa5BKSWf4Mhp6GmrkPixhMxmabYY7RbzlwVP32pbGCg==} - dev: false - /zod@3.22.4: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} - dev: true