Skip to content

Commit cbbef0f

Browse files
authored
feat: bump buf version and generated files (#212)
This PR updates the buf version for the generated API files. This version generates files that now depend on `@bufbuild/protobuf/codegenv2` instead of codegenv1. It also removes unused old `api/package.json` and co files in the api directory to clean it. They were added in the begining of the project for some (csharp or desktop?) example apps. --------- Signed-off-by: D4ryl00 <[email protected]>
1 parent 6bc8405 commit cbbef0f

File tree

10 files changed

+29
-86
lines changed

10 files changed

+29
-86
lines changed

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ cocoapods 1.15.2
44
java openjdk-17.0.2
55
yarn 1.22.19
66
golang 1.23.7
7-
buf 1.53.0
7+
buf 1.55.1

Makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ clean: framework.clean
5959

6060
# - API : Handle API generation and cleaning
6161

62-
api.generate: _api.generate.protocol _api.generate.modules
63-
api.clean: _api.clean.protocol _api.clean.modules
62+
api.generate: _api.generate.protocol
63+
api.clean: _api.clean.protocol
6464

6565
# - API - rpc
6666

@@ -86,16 +86,7 @@ $(gen_sum): $(gen_src)
8686
go mod tidy \
8787
)
8888

89-
_api.generate.modules: api/package-lock.json
90-
91-
api/package-lock.json:
92-
$(call check-program, npm)
93-
cd api; npm install
94-
95-
_api.clean.modules:
96-
cd api; rm -fr node_modules
97-
98-
.PHONY: api.generate _api.generate.protocol _api.generate.modules _api.clean.protocol _api.clean.modules
89+
.PHONY: api.generate _api.generate.protocol _api.clean.protocol
9990

10091
# - Bind : Handle gomobile bind
10192

api/gen/es/gnonativetypes_pb.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// @generated by protoc-gen-es v2.2.5 with parameter "target=ts"
1+
// @generated by protoc-gen-es v2.6.2 with parameter "target=ts"
22
// @generated from file gnonativetypes.proto (package land.gno.gnonative.v1, syntax proto3)
33
/* eslint-disable */
44

5-
import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
6-
import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
5+
import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
6+
import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
77
import type { Message } from "@bufbuild/protobuf";
88

99
/**

api/gen/es/rpc_pb.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// @generated by protoc-gen-es v2.2.5 with parameter "target=ts"
1+
// @generated by protoc-gen-es v2.6.2 with parameter "target=ts"
22
// @generated from file rpc.proto (package land.gno.gnonative.v1, syntax proto3)
33
/* eslint-disable */
44

5-
import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
6-
import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
5+
import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
6+
import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
77
import type { ActivateAccountRequestSchema, ActivateAccountResponseSchema, AddressFromBech32RequestSchema, AddressFromBech32ResponseSchema, AddressFromMnemonicRequestSchema, AddressFromMnemonicResponseSchema, AddressToBech32RequestSchema, AddressToBech32ResponseSchema, BroadcastTxCommitRequestSchema, BroadcastTxCommitResponseSchema, CallRequestSchema, CallResponseSchema, CreateAccountRequestSchema, CreateAccountResponseSchema, CreateLedgerRequestSchema, CreateLedgerResponseSchema, DeleteAccountRequestSchema, DeleteAccountResponseSchema, EstimateGasRequestSchema, EstimateGasResponseSchema, GenerateRecoveryPhraseRequestSchema, GenerateRecoveryPhraseResponseSchema, GetActivatedAccountRequestSchema, GetActivatedAccountResponseSchema, GetChainIDRequestSchema, GetChainIDResponseSchema, GetKeyInfoByAddressRequestSchema, GetKeyInfoByAddressResponseSchema, GetKeyInfoByNameOrAddressRequestSchema, GetKeyInfoByNameOrAddressResponseSchema, GetKeyInfoByNameRequestSchema, GetKeyInfoByNameResponseSchema, GetRemoteRequestSchema, GetRemoteResponseSchema, HasKeyByAddressRequestSchema, HasKeyByAddressResponseSchema, HasKeyByNameOrAddressRequestSchema, HasKeyByNameOrAddressResponseSchema, HasKeyByNameRequestSchema, HasKeyByNameResponseSchema, HelloRequestSchema, HelloResponseSchema, HelloStreamRequestSchema, HelloStreamResponseSchema, ListKeyInfoRequestSchema, ListKeyInfoResponseSchema, MakeTxResponseSchema, QEvalRequestSchema, QEvalResponseSchema, QueryAccountRequestSchema, QueryAccountResponseSchema, QueryRequestSchema, QueryResponseSchema, RenderRequestSchema, RenderResponseSchema, RotatePasswordRequestSchema, RotatePasswordResponseSchema, RunRequestSchema, RunResponseSchema, SendRequestSchema, SendResponseSchema, SetChainIDRequestSchema, SetChainIDResponseSchema, SetPasswordRequestSchema, SetPasswordResponseSchema, SetRemoteRequestSchema, SetRemoteResponseSchema, SignTxRequestSchema, SignTxResponseSchema, ValidateMnemonicPhraseRequestSchema, ValidateMnemonicPhraseResponseSchema, ValidateMnemonicWordRequestSchema, ValidateMnemonicWordResponseSchema } from "./gnonativetypes_pb";
88
import { file_gnonativetypes } from "./gnonativetypes_pb";
99
import type { Message } from "@bufbuild/protobuf";

api/package-lock.json

Lines changed: 0 additions & 38 deletions
This file was deleted.

api/package.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

buf.gen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins:
66
- remote: buf.build/connectrpc/go
77
out: ./api/gen/go
88
opt: module=github.com/gnolang/gnonative/v4/api/gen/go
9-
- remote: buf.build/bufbuild/es:v2.2.5
9+
- remote: buf.build/bufbuild/es:v2.6.2
1010
opt: target=ts
1111
out: ./api/gen/es
1212
- remote: buf.build/protocolbuffers/csharp

expo/package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

expo/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"license": "MIT",
3030
"homepage": "https://github.com/gnolang/gnonative#readme",
3131
"dependencies": {
32-
"@bufbuild/protobuf": "^2.2.5",
33-
"@connectrpc/connect": "^2.0.2",
34-
"@connectrpc/connect-web": "^2.0.2",
32+
"@bufbuild/protobuf": "^2.6.2",
33+
"@connectrpc/connect": "^2.0.3",
34+
"@connectrpc/connect-web": "^2.0.3",
3535
"base64-js": "^1.5.1",
3636
"fast-text-encoding": "^1.0.6"
3737
},

gen.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
4606ed9c6426464cc8c4d11ec15abbd6f32cdb8f api/gnonativetypes/gnonativetypes.go
33
5c1423cfce48514cbb29ce4a76e3a7017c055ba0 api/gnonativetypes/package.go
44
5e9ce9eb1815d8d2771fe948fb20223df36ff182 api/rpc.proto
5-
6444ae88d6497a551ba1d5d611e1f81b1ce6a21c buf.gen.yaml
6-
db011306fec5f34668398da58861399025f4abc8 Makefile
5+
426b4aee8f1f2b045062c7c745b4d3559d59daf9 buf.gen.yaml
6+
cfa69b131531fcb5ca340fbede8c7ccf094d62bb Makefile

0 commit comments

Comments
 (0)