Исправлено удаление временных файлов

.gitlab-ci.yml

@@ -13,8 +13,7 @@ publish_npm:
     - cd ./config && npm i && cd ../
 
   rules:
-    # - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-    - if: '$CI_COMMIT_BRANCH'
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       changes:
         - config/package.json
   script:

Makefile

@@ -3,7 +3,7 @@ SHELL = /bin/bash -o pipefail
 
 PROTODIR=perxis-proto/proto
 DSTDIR=config/dist
-TSPROTODIR=config/node_modules/.bin/protoc-gen-ts_proto
+TSPROTOPLUGIN=config/node_modules/.bin/protoc-gen-ts_proto
 
 
 ALLPROTO?=$(shell find $(PROTODIR) -name '*.proto' )
@@ -12,9 +12,6 @@ PROTOTSFILES=$(ALLPROTO:.proto=.ts)
 
 # PROTOC_MAJOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f1)
 # PROTOC_MINOR_VERSION=$(shell protoc --version | awk '{print $$2;}' | cut -d. -f2)
-# TSC_MAJOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f1)
-# TSC_MINOR_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f2)
-# TSC_MIC_VERSION=$(shell tsc --version | awk '{print $$2;}' | cut -d. -f3)
 $(shell mkdir $(DSTDIR))
 
 # Генерация
@@ -23,7 +20,7 @@ js-client: protoc-check js-check $(PROTOTSFILES) generate-js
 
 %.ts: %.proto
 	@protoc -I=$(PROTODIR) \
-	--plugin=$(TSPROTODIR) \
+	--plugin=$(TSPROTOPLUGIN) \
  	--ts_proto_opt=env=browser,outputServices=generic-definitions,outputJsonMethods=false,esModuleInterop=true,useOptionals=messages,exportCommonSymbols=false,useDate=false,useExactTypes=false \
  	--ts_proto_out=$(DSTDIR) \
  	"$<"
@@ -55,26 +52,4 @@ js-check:
 ifeq (,$(shell which npm))
 	$(error "NPM not found. Run for linux: \"sudo apt install npm\", for mac: \"brew install npm\" \
 	or visit \"https://docs.npmjs.com/getting-started\" for more.\n")
-endif
-# TODO точная версия ставится локально через npm i поэтому проверка не требуется
-# ifeq (,$(shell which protoc-gen-ts_proto))
-# 	$(error "Ts-proto plugin for protoc not found. \
-# 	Run \"npm install -g ts-proto@1.158.0\" \
-# 	or visit \"https://github.com/stephenh/ts-proto\" for more.\n")
-# endif
-# ifeq (,$(shell which tsc))
-# 	$(error "Typescript not found. \
-# 	Run \"npm install -g typescript@5.6.3\" \
-# 	or visit \"https://github.com/microsoft/TypeScript\" for more.\n")
-# endif
-# BUG проверка для минимальной версии 5.1.6 будет ошибочно не пройдена с версией 5.6.3 так как
-# каждая цифра проверяется отдельно
-# ifneq ($(shell expr $(TSC_MAJOR_VERSION) \>= 5), 1)
-#   	 $(error "Current version is outdated. Please update typescript \n")
-# endif
-# ifneq ($(shell expr $(TSC_MINOR_VERSION) \>= 1), 1)
-#   	 $(error "Current version is lower than 5.1 Please update typescript \n")
-# endif
-# ifneq ($(shell expr $(TSC_MIC_VERSION) \>= 6), 1)
-#   	 $(error "Current version is lower than 5.1.6 Please update typescript \n")
-# endif
+endif
\ No newline at end of file

config/generate.sh

@@ -50,14 +50,14 @@ generate_index() {
 cd ./config
 
 echo "Generate index.ts files"
-ts_files=$(find ./dist/**/ -name '*.ts')
+ts_files=$(find ./dist -name '*.ts' -type f)
 ts_files_array=($ts_files)
 generate_index "${ts_files_array[@]}"
 
 echo "Generate *.js files"
-npx tsc --project ./ --declaration --declarationMap --sourceMap --rootDir ./dist
+npx tsc --declaration --declarationMap --sourceMap --rootDir ./dist
 
 echo "Delete temporary files"
-find ./dist -name 'index.ts' -type f -delete
+find ./dist -name '*.ts' ! -name '*.d.ts' -type f -delete
 
 echo "Process finished"
\ No newline at end of file