From 7ff613a28b556b6679be963804437c914a402821 Mon Sep 17 00:00:00 2001 From: Murderlon Date: Wed, 31 Jan 2024 12:24:38 +0100 Subject: [PATCH] meta: put experimental ternaries in .prettierrc.js --- .prettierrc.js | 2 ++ package.json | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.prettierrc.js b/.prettierrc.js index df02f7bc1f..19eaba906f 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,8 +1,10 @@ +/** @type {import("prettier").Config} */ module.exports = { proseWrap: 'always', singleQuote: true, trailingComma: 'all', semi: false, + experimentalTernaries: true, overrides: [ { files: 'packages/@uppy/angular/**', diff --git a/package.json b/package.json index 283f3f5b88..07e4a962af 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,10 @@ "*.{js,mjs,cjs,jsx}": "eslint --fix", "*.{ts,mts,cts,tsx}": [ "eslint --fix", - "prettier --experimental-ternaries -w", + "prettier -w", "eslint" ], - "*.{css,html,json,scss,vue,yaml,yml}": "prettier --experimental-ternaries -w", + "*.{css,html,json,scss,vue,yaml,yml}": "prettier -w", "*.md": [ "remark --silently-ignore -i .remarkignore -foq", "eslint --fix" @@ -135,10 +135,10 @@ "lint:css": "stylelint ./packages/**/*.scss", "lint:css:fix": "stylelint ./packages/**/*.scss --fix", "lint": "eslint . --cache", - "format:show-diff": "git diff --quiet || (echo 'Unable to show a diff because there are unstaged changes'; false) && (prettier . --experimental-ternaries -w --loglevel silent && git --no-pager diff; git restore .)", - "format:check": "prettier --experimental-ternaries -c .", + "format:show-diff": "git diff --quiet || (echo 'Unable to show a diff because there are unstaged changes'; false) && (prettier . -w --loglevel silent && git --no-pager diff; git restore .)", + "format:check": "prettier -c .", "format:check-diff": "yarn format:check || (yarn format:show-diff && false)", - "format": "prettier --experimental-ternaries -w .", + "format": "prettier -w .", "release": "PACKAGES=$(yarn workspaces list --json) yarn workspace @uppy-dev/release interactive", "size": "echo 'JS Bundle mingz:' && cat ./packages/uppy/dist/uppy.min.js | gzip | wc -c && echo 'CSS Bundle mingz:' && cat ./packages/uppy/dist/uppy.min.css | gzip | wc -c", "e2e": "yarn build:clean && yarn build && yarn e2e:skip-build",