diff --git a/Makefile b/Makefile index fb5bcd4c69900006350a3419e3913173fabe8632..c14d429b802719349256c51e1dc9247e971b47d7 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ DSTDIR=config/clients ALLPROTO?=$(shell find $(PROTODIR) -name '*.proto' ) PROTOFILES= $(filter-out proto/status/status.proto, $(ALLPROTO)) PROTOTSFILES=$(ALLPROTO:.proto=.ts) -PROTOJSFILES=$(PROTOFILES:.proto=_pb.js) PROTOC_MAJOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f1) PROTOC_MINOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f2) @@ -22,6 +21,7 @@ proto-js: protoc-check js-check generate-js $(PROTOTSFILES) @echo "Generated all protobuf JavaScrypt files" %.ts: %.proto + @echo "Generating ts files" @protoc -I=$(PROTODIR) \ --plugin=@protoc-gen-ts_proto \ --ts_proto_opt=env=browser,outputServices=generic-definitions,outputJsonMethods=false,esModuleInterop=true,useOptionals=messages,exportCommonSymbols=false,useDate=false,useExactTypes=false \ @@ -32,7 +32,7 @@ generate-js: @./config/generate.sh proto-clean: - @rm -f $(PROTOTSFILES) -f $(PROTOJSFILES) + @rm -f $(PROTOTSFILES) .FORCE: # Проверка, что установлены необходимые инструменты для генерации proto-файлов diff --git a/config/tsconfig.json b/config/tsconfig.json index cc5b5e699e93076d9d66cf249f89f5d993aa1503..682cc987949707541450ef136e8bb7dc5821af68 100644 --- a/config/tsconfig.json +++ b/config/tsconfig.json @@ -98,5 +98,6 @@ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */ }, - "include": ["./clients"], + "include": ["../clients/**/*"], + "exclude": ["../config/**/*"] }