From 4cabe1b9ebfbf856e30d5f2440ae8780679a9b06 Mon Sep 17 00:00:00 2001 From: JJ-Cro Date: Tue, 9 Jun 2026 14:42:50 +0200 Subject: [PATCH 1/2] Move optionalDependencies to devDependencies and update README badges --- README.md | 1 + package.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 1bc5fbcd..f90c5995 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ [![last commit](https://img.shields.io/github/last-commit/tiagosiebler/bybit-api)][1] [![CodeFactor](https://www.codefactor.io/repository/github/tiagosiebler/bybit-api/badge)](https://www.codefactor.io/repository/github/tiagosiebler/bybit-api) [![Telegram](https://img.shields.io/badge/chat-on%20telegram-blue.svg)](https://t.me/nodetraders) +[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/tiagosiebler/bybit-api)

diff --git a/package.json b/package.json index fce6ac8d..28cdafcc 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,12 @@ "eslint-plugin-require-extensions": "^0.1.3", "eslint-plugin-simple-import-sort": "^12.1.1", "jest": "^29.7.0", +<<<<<<< Updated upstream +======= + "ts-jest": "^29.1.2", + "ts-node": "^10.9.2", + "typescript": "^5.7.3", +>>>>>>> Stashed changes "source-map-loader": "^2.0.0", "ts-jest": "^29.1.2", "ts-loader": "^8.0.11", From 5de09e68fc8fd98885b300f48181e990077a16f1 Mon Sep 17 00:00:00 2001 From: JJ-Cro Date: Tue, 9 Jun 2026 14:45:44 +0200 Subject: [PATCH 2/2] Fix package.json merge conflict after optionalDependencies move Co-authored-by: Cursor --- package.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package.json b/package.json index 28cdafcc..fce6ac8d 100644 --- a/package.json +++ b/package.json @@ -39,12 +39,6 @@ "eslint-plugin-require-extensions": "^0.1.3", "eslint-plugin-simple-import-sort": "^12.1.1", "jest": "^29.7.0", -<<<<<<< Updated upstream -======= - "ts-jest": "^29.1.2", - "ts-node": "^10.9.2", - "typescript": "^5.7.3", ->>>>>>> Stashed changes "source-map-loader": "^2.0.0", "ts-jest": "^29.1.2", "ts-loader": "^8.0.11",