From 09bd207b1db1748ff4478ae45323341df975d346 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 7 Dec 2020 15:24:46 +1100 Subject: [PATCH] prettier ignore js files under test/ts --- .github/workflows/pull-request.yml | 2 +- .prettierignore | 1 + package.json | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 58b3b0cd3..53828fa02 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -65,7 +65,7 @@ jobs: - name: Lint Files if: runner.os != 'Windows' run: | - yarn format-full-check + yarn format-full yarn eslint yarn tslint diff --git a/.prettierignore b/.prettierignore index dbdc281c0..8e5246ba3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -13,6 +13,7 @@ libtextsecure/components.js libtextsecure/test/test.js stylesheets/*.css test/test.js +test/ts/**/*.js ts/**/*.js ts/protobuf/*.d.ts ts/protobuf/*.js diff --git a/package.json b/package.json index bfc47a889..5c0a901f8 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "tslint": "tslint --format stylish --project .", "format": "prettier --list-different --write `git ls-files --modified *.{css,js,json,scss,ts,tsx}` `git ls-files --modified ./**/*.{css,js,json,scss,ts,tsx}`", "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"", - "format-full-check": "prettier --check \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"", "transpile": "tsc --incremental", "clean-transpile": "rimraf ts/**/*.js && rimraf ts/*.js", "pow-metrics": "node metrics_app.js localhost 9000",