diff --git a/Makefile b/Makefile index b9d135f1..d4b0a541 100644 --- a/Makefile +++ b/Makefile @@ -90,4 +90,3 @@ clean: rm -rf $(AKASH_DEVCACHE) rm -rf $(AKASH_TS_ROOT)/node_modules rm -rf $(AKASH_TS_ROOT)/dist - rm -rf $(AKASH_TS_ROOT)/src/generated diff --git a/script/protocgen-legacy.sh b/script/protocgen-legacy.sh index 0cb9e116..9f0b77ad 100755 --- a/script/protocgen-legacy.sh +++ b/script/protocgen-legacy.sh @@ -150,4 +150,4 @@ cp -rv github.com/akash-network/akash-api/* ./ script/ts-patches.sh restore -(cd "$AKASH_TS_ROOT" && npm run format) +npm run format --prefix $AKASH_TS_ROOT diff --git a/script/ts-patches.sh b/script/ts-patches.sh index 84da7b2a..4f7231e4 100755 --- a/script/ts-patches.sh +++ b/script/ts-patches.sh @@ -3,7 +3,7 @@ set -eo pipefail generated_dir="$AKASH_TS_ROOT/src/generated" -tmp_dir="$AKASH_DEVCACHE_BASE/tmp/ts" +tmp_dir="$AKASH_DEVCACHE_TS_TMP/ts/patches" if [ ! -d "$generated_dir" ]; then echo "Directory $generated_dir does not exist. Skipping..." diff --git a/ts/package.json b/ts/package.json index b833d25f..565f94f3 100644 --- a/ts/package.json +++ b/ts/package.json @@ -15,7 +15,7 @@ "scripts": { "build": "rimraf dist && tsc -p tsconfig.build.json && npm run format", "postbuild": "script/generate-exports.js", - "format": "prettier --write './**/*.{js,jsx,ts,tsx,css,json}' --config ./.prettierrc", + "format": "prettier --write \"$AKASH_TS_ROOT/**/*.{js,jsx,ts,tsx,css,json}\" --config ./.prettierrc --log-level silent", "lint": "eslint src", "lint:fix": "npm run lint -- --fix", "test": "jest --selectProjects unit functional",