Merge pull request #50 from openhacku-team-a/shion/intro-protobuf-ts

protobuf-tsを用いたPB生成に変更
a-company-jp · Mar 15, 2024 · e6b1095 · e6b1095
2 parents 9c5f83b + 71fa0fe
commit e6b1095
Show file tree

Hide file tree

Showing 4 changed files with 903 additions and 60 deletions.
diff --git a/Makefile b/Makefile
@@ -9,16 +9,8 @@ gen_proto:
 	$(MAKE) gen_proto_ts
 	$(MAKE) gen_proto_go
 
-gen_proto_win:
-	$(MAKE) gen_proto_ts_win
-	$(MAKE) gen_proto_go
-
 gen_proto_go:
 	protoc --proto_path=./proto/src --go_out=./proto/golang/pb_out --go_opt=paths=source_relative --go-grpc_out=./proto/golang/pb_out --go-grpc_opt=paths=source_relative ./proto/src/*.proto
 
 gen_proto_ts:
-	protoc --ts_proto_opt=nestJs=true --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./proto/typescript/pb_out --proto_path=./proto/src ./proto/src/*.proto
-
-# Node file for ts proto generation exists on different path on Windows
-gen_proto_ts_win:
-	protoc --ts_proto_opt=nestJs=true --plugin=./node_modules/.bin/protoc-gen-ts_proto.ps1 --ts_proto_out=./proto/typescript/pb_out --proto_path=./proto/src ./proto/src/*.proto
+	npx protoc --ts_out=./proto/typescript/pb_out --proto_path=./proto/src ./proto/src/*.proto
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,8 @@
     "format": "prettier --write --ignore-path .prettierignore './**/*.{js,jsx,ts,tsx,json}'"
   },
   "dependencies": {
+    "@protobuf-ts/plugin": "^2.9.4",
+    "axios": "^1.6.7",
     "firebase": "^10.8.1",
     "next": "14.1.3",
     "react": "^18",