From f03b61e5c5c4a593b4b0175b11fe6b32ba03a07c Mon Sep 17 00:00:00 2001 From: Core Date: Fri, 16 Sep 2022 18:05:06 +0100 Subject: [PATCH] prettier update --- .github/workflows/cider-chores.yml | 4 +--- .prettierignore | 2 +- .prettierrc | 12 ++++++++++-- package.json | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cider-chores.yml b/.github/workflows/cider-chores.yml index ed891362..740b265c 100644 --- a/.github/workflows/cider-chores.yml +++ b/.github/workflows/cider-chores.yml @@ -61,9 +61,7 @@ jobs: ref: ${{ github.head_ref }} - name: Prettify code - uses: creyD/prettier_action@v4.2 - with: - prettier_options: --write src/**/*.{js,json,ts,css,less} + run: npm run format:write - name: Commit Prettier Code uses: stefanzweifel/git-auto-commit-action@v4.14.1 diff --git a/.prettierignore b/.prettierignore index c8c940fc..ee6ef80d 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,4 @@ -src/renderer/apple-hls* +src/renderer/*hls*.js build/* src/renderer/lib/* *.min.* diff --git a/.prettierrc b/.prettierrc index 2980127b..13322606 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,13 @@ { - "printWidth": 300, + "printWidth": 600, "singleAttributePerLine": true, - "bracketSameLine": true + "bracketSameLine": true, + "overrides": [ + { + "files": "src/renderer/main/**/*.js", + "options": { + "bracketSameLine": false + } + } + ] } diff --git a/package.json b/package.json index 083c0106..208b2d5c 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "msft": "npm run build && electron-builder -c msft-package.json", "mstest": "npm run build && electron-builder -c msft-test.json", "postinstall": "electron-builder install-app-deps", - "format:check": "prettier --check \"src/**/*.{js,json,ts,css,less}\"", - "format:write": "prettier --write \"src/**/*.{js,json,ts,css,less}\"" + "format:check": "npx prettier --check \"src/**/*.{js,json,ts,less}\"", + "format:write": "npx prettier --write \"src/**/*.{js,json,ts,less}\"" }, "dependencies": { "@sentry/electron": "^4.0.2",