Skip to content

Commit

Permalink
Merge pull request #972 from traPtitech/dependabot/npm_and_yarn/dashb…
Browse files Browse the repository at this point in the history
…oard/bufbuild/protobuf-2.2.2

build(deps): bump @bufbuild/protobuf from 1.10.0 to 2.2.2 in /dashboard
  • Loading branch information
Pugma authored Dec 9, 2024
2 parents 15b361a + b697d2f commit 83f4758
Show file tree
Hide file tree
Showing 34 changed files with 1,541 additions and 3,065 deletions.
5 changes: 5 additions & 0 deletions .local-dev/install-protoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ case $(uname -s) in
"Darwin") OS="osx";;
*) echo "unknown os" && exit 1;;
esac

ARCH=$(uname -m)

if [ $ARCH = "arm64" ]; then
ARCH="aarch_64"
fi

curl -sSLOf https://github.com/protocolbuffers/protobuf/releases/download/v"$PROTOC_VERSION"/protoc-"$PROTOC_VERSION"-"$OS"-"$ARCH".zip
unzip protoc-"$PROTOC_VERSION"-"$OS"-"$ARCH".zip

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PROTOC_VERSION := 27.1
PROTOC_VERSION := 29.0
TBLS_VERSION := 1.75.0

GO_REPO_ROOT_PACKAGE := "github.com/traPtitech/neoshowcase"
PROTOC_OPTS := -I ./api/proto --go_out=. --go_opt=module=$(GO_REPO_ROOT_PACKAGE) --connect-go_out=. --connect-go_opt=module=$(GO_REPO_ROOT_PACKAGE)
PROTOC_OPTS_CLIENT := -I ./api/proto --es_out=./dashboard/src/api --es_opt=target=ts --connect-es_out=./dashboard/src/api --connect-es_opt=target=ts
PROTOC_OPTS_CLIENT := -I ./api/proto --es_out=./dashboard/src/api --es_opt=target=ts
PROTOC_SOURCES ?= $(shell find ./api/proto/neoshowcase -type f -name "*.proto" -print)
PROTOC_SOURCES_CLIENT := ./api/proto/neoshowcase/protobuf/gateway.proto ./api/proto/neoshowcase/protobuf/null.proto

Expand Down Expand Up @@ -40,7 +40,7 @@ init-protoc:
init-protoc-tools:
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest
npm i -g @connectrpc/protoc-gen-connect-es @bufbuild/protoc-gen-es@1
npm i -g @bufbuild/protoc-gen-es@2

.PHONY: init
init: init-k3d init-kustomize init-protoc init-protoc-tools ## Install / update required tools
Expand Down
6 changes: 3 additions & 3 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"vitest": "2.1.1"
},
"dependencies": {
"@bufbuild/protobuf": "1.10.0",
"@connectrpc/connect": "1.5.0",
"@connectrpc/connect-web": "1.5.0",
"@bufbuild/protobuf": "2.2.2",
"@connectrpc/connect": "2.0.0",
"@connectrpc/connect-web": "2.0.0",
"@kobalte/core": "0.13.6",
"@modular-forms/solid": "0.23.0",
"@solid-primitives/refs": "1.0.8",
Expand Down
Loading

0 comments on commit 83f4758

Please sign in to comment.