Fix merge conflicts and build issues

This commit is contained in:
Ilango
2024-03-12 13:19:16 +05:30
parent 4a7da99996
commit dc59b0468f
10 changed files with 56 additions and 38 deletions
+19 -1
View File
@@ -4227,7 +4227,7 @@ packages:
dependencies:
lodash.camelcase: 4.3.0
long: 5.2.3
protobufjs: 7.2.4
protobufjs: 7.2.6
yargs: 17.7.2
dev: false
@@ -23845,6 +23845,24 @@ packages:
long: 5.2.3
dev: false
/protobufjs@7.2.6:
resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==}
engines: {node: '>=12.0.0'}
dependencies:
'@protobufjs/aspromise': 1.1.2
'@protobufjs/base64': 1.1.2
'@protobufjs/codegen': 2.0.4
'@protobufjs/eventemitter': 1.1.0
'@protobufjs/fetch': 1.1.0
'@protobufjs/float': 1.0.2
'@protobufjs/inquire': 1.1.0
'@protobufjs/path': 1.1.2
'@protobufjs/pool': 1.1.0
'@protobufjs/utf8': 1.1.0
'@types/node': 20.11.26
long: 5.2.3
dev: false
/protoc-gen-ts@0.8.7:
resolution: {integrity: sha512-jr4VJey2J9LVYCV7EVyVe53g1VMw28cCmYJhBe5e3YX5wiyiDwgxWxeDf9oTqAe4P1bN/YGAkW2jhlH8LohwiQ==}
hasBin: true