Skip to content

Commit f810605

Browse files
committed
Auto merge of #4232 - rust-lang:renovate/prettier-2.x, r=Turbo87
Update dependency prettier to v2.5.1 [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [prettier](https://prettier.io) ([source](https://togithub.com/prettier/prettier)) | [`2.5.0` -> `2.5.1`](https://renovatebot.com/diffs/npm/prettier/2.5.0/2.5.1) | [![age](https://badges.renovateapi.com/packages/npm/prettier/2.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/prettier/2.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/prettier/2.5.1/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/prettier/2.5.1/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>prettier/prettier</summary> ### [`v2.5.1`](https://togithub.com/prettier/prettier/blob/master/CHANGELOG.md#&#8203;251) [Compare Source](https://togithub.com/prettier/prettier/compare/2.5.0...2.5.1) [diff](https://togithub.com/prettier/prettier/compare/2.5.0...2.5.1) ##### Improve formatting for empty tuple types ([#&#8203;11884](https://togithub.com/prettier/prettier/pull/11884) by [`@&#8203;sosukesuzuki](https://togithub.com/sosukesuzuki))` <!-- prettier-ignore --> ```tsx // Input type Foo = Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends [] ? Foo3 : Foo4; // Prettier 2.5.0 type Foo = Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends [ ] ? Foo3 : Foo4; // Prettier 2.5.0 (tailingCommma = all) // Invalid TypeScript code type Foo = Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends [ , ] ? Foo3 : Foo4; // Prettier 2.5.1 type Foo = Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends [] ? Foo3 : Foo4; ``` ##### Fix compatibility with Jest inline snapshot test ([#&#8203;11892](https://togithub.com/prettier/prettier/pull/11892) by [`@&#8203;fisker](https://togithub.com/fisker))` A internal change in Prettier@v2.5.0 accidentally breaks the Jest inline snapshot test. ##### Support Glimmer's named blocks ([#&#8203;11899](https://togithub.com/prettier/prettier/pull/11899) by [`@&#8203;duailibe](https://togithub.com/duailibe))` Prettier already supported this feature, but it converted empty named blocks to self-closing, which is not supported by the Glimmer compiler. See: [Glimmer's named blocks](https://emberjs.github.io/rfcs/0460-yieldable-named-blocks.html). <!-- prettier-ignore --> ```hbs // Input <Component> <:named></:named> </Component> // Prettier 2.5.0 <Component> <:named /> </Component> // Prettier 2.5.1 <Component> <:named></:named> </Component> ``` </details> --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/rust-lang/crates.io).
2 parents 8b04cc9 + 352bc87 commit f810605

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"normalize.css": "8.0.1",
123123
"nyc": "15.1.0",
124124
"postcss-nested": "5.0.6",
125-
"prettier": "2.5.0",
125+
"prettier": "2.5.1",
126126
"qunit": "2.17.2",
127127
"qunit-console-grouper": "0.3.0",
128128
"qunit-dom": "2.0.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12095,10 +12095,10 @@ prettier-linter-helpers@^1.0.0:
1209512095
dependencies:
1209612096
fast-diff "^1.1.2"
1209712097

12098-
prettier@2.5.0:
12099-
version "2.5.0"
12100-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893"
12101-
integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==
12098+
prettier@2.5.1:
12099+
version "2.5.1"
12100+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
12101+
integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
1210212102

1210312103
pretty-bytes@5.6.0:
1210412104
version "5.6.0"

0 commit comments

Comments
 (0)