Skip to content

Commit 1298c30

Browse files
committed
Auto merge of #4668 - rust-lang:renovate/prettier-2.x, r=Turbo87
Update dependency prettier to v2.6.2 [![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.6.0` -> `2.6.2`](https://renovatebot.com/diffs/npm/prettier/2.6.0/2.6.2) | [![age](https://badges.renovateapi.com/packages/npm/prettier/2.6.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/prettier/2.6.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/prettier/2.6.2/compatibility-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/prettier/2.6.2/confidence-slim/2.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>prettier/prettier</summary> ### [`v2.6.2`](https://togithub.com/prettier/prettier/blob/HEAD/CHANGELOG.md#&#8203;262) [Compare Source](https://togithub.com/prettier/prettier/compare/2.6.1...2.6.2) [diff](https://togithub.com/prettier/prettier/compare/2.6.1...2.6.2) ##### Fix LESS/SCSS format error ([#&#8203;12536](https://togithub.com/prettier/prettier/pull/12536) by [`@&#8203;fisker](https://togithub.com/fisker))` <!-- prettier-ignore --> ```less // Input .background-gradient(`@&#8203;cut)` { background: linear-gradient( to right, `@&#8203;white` 0%, `@&#8203;white` (`@&#8203;cut` - 0.01%), `@&#8203;portal-background` `@&#8203;cut,` `@&#8203;portal-background` 100% ); } // Prettier 2.6.1 TypeError: Cannot read properties of undefined (reading 'endOffset') // Prettier 2.6.2 .background-gradient(`@&#8203;cut)` { background: linear-gradient( to right, `@&#8203;white` 0%, `@&#8203;white` (`@&#8203;cut` - 0.01%), `@&#8203;portal-background` `@&#8203;cut,` `@&#8203;portal-background` 100% ); } ``` ##### Update `meriyah` to fix several bugs ([#&#8203;12567](https://togithub.com/prettier/prettier/pull/12567) by [`@&#8203;fisker](https://togithub.com/fisker),` fixes in [`meriyah`](https://togithub.com/meriyah/meriyah/) by [`@&#8203;3cp](https://togithub.com/3cp))` Fixes bugs when parsing following valid code: ```js foo(await bar()); ``` ```js const regex = /.*/ms; ``` ```js const element = <p>{/w/.test(s)}</p>; ``` ```js class A extends B { #privateMethod() { super.method(); } } ``` ### [`v2.6.1`](https://togithub.com/prettier/prettier/blob/HEAD/CHANGELOG.md#&#8203;261) [Compare Source](https://togithub.com/prettier/prettier/compare/2.6.0...2.6.1) [diff](https://togithub.com/prettier/prettier/compare/2.6.0...2.6.1) ##### Ignore `loglevel` when printing information ([#&#8203;12477](https://togithub.com/prettier/prettier/pull/12477) by [`@&#8203;fisker](https://togithub.com/fisker))` <!-- prettier-ignore --> ```bash ``` </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 04ac63c + 1d7a9f3 commit 1298c30

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
@@ -125,7 +125,7 @@
125125
"nyc": "15.1.0",
126126
"postcss-custom-media": "8.0.0",
127127
"postcss-nested": "5.0.6",
128-
"prettier": "2.6.0",
128+
"prettier": "2.6.2",
129129
"qunit": "2.18.0",
130130
"qunit-console-grouper": "0.3.0",
131131
"qunit-dom": "2.0.0",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11929,10 +11929,10 @@ prettier-linter-helpers@^1.0.0:
1192911929
dependencies:
1193011930
fast-diff "^1.1.2"
1193111931

11932-
11933-
version "2.6.0"
11934-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
11935-
integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
11932+
11933+
version "2.6.2"
11934+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
11935+
integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
1193611936

1193711937
1193811938
version "6.0.0"

0 commit comments

Comments
 (0)