Merge pull request #676 from evandroforks/fix_pbjs_on_windows

Fixed pbjs not working on Windows because package.json runs by
This commit is contained in:
Damien Elmes 2020-06-30 09:50:02 +10:00 committed by GitHub
commit 41f75c00a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -24,7 +24,8 @@ PROTODEPS := ../proto/backend.proto ../proto/fluent.proto
BUILDDEPS := .build/npm webpack.config.js
.build/proto: $(BUILDDEPS) $(PROTODEPS)
npm run proto
npx pbjs -t json-module -w es6 ../proto/backend.proto -o src/backend/proto.js
npx pbjs -t static-module ../proto/backend.proto | npx pbts -o src/backend/proto.d.ts -
@touch $@
PHONY: dev

View file

@ -42,7 +42,6 @@
"webpack-dev-server": "^3.11.0"
},
"scripts": {
"proto": "pbjs -t json-module -w es6 ../proto/backend.proto -o src/backend/proto.js; pbjs -t static-module ../proto/backend.proto | pbts -o src/backend/proto.d.ts -",
"fix": "prettier --write src/*/*.ts",
"check": "prettier --check src/*/*.ts && eslint --max-warnings=0 --ext .ts src",
"build": "cross-env NODE_ENV=production webpack",