Skip to content

Commit 9354f16

Browse files
committed
Auto merge of #2422 - rust-lang:dependabot/npm_and_yarn/eslint-plugin-prettier-3.1.3, r=Turbo87
Bump eslint-plugin-prettier from 3.1.2 to 3.1.3 Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.2 to 3.1.3. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md">eslint-plugin-prettier's changelog</a>.</em></p> <blockquote> <h2>v3.1.3 (2020-04-13)</h2> <ul> <li>Fix: Set <code>meta.type</code> to &quot;layout&quot; (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/issues/283">#283</a>) (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/97152e2787bf9bb27f053d6a91ccf826dc96a505">97152e2</a>)</li> <li>build(deps-dev): bump eslint-config-prettier from 6.10.0 to 6.10.1 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/185b1064d3dd674538456fb2fad97fbfcde49e0d">185b106</a>)</li> <li>build(deps): [security] bump acorn from 6.1.0 to 6.4.1 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/%5Bbba5881%5D([email protected]:prettier/eslint-plugin-prettier/commit/bba588151e860b1a644096441b31a0f3144db611)">https://github.com/prettier/eslint-plugin-prettier/blob/master/[bba5881]([email protected]:prettier/eslint-plugin-prettier/commit/bba588151e860b1a644096441b31a0f3144db611)</a>)</li> <li>build(deps-dev): bump eslint-config-prettier from 6.9.0 to 6.10.0 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/9a47a6feab691cf228d184c103d4cab99b464d0b">9a47a6f</a>)</li> <li>build(deps-dev): bump eslint-plugin-eslint-plugin from 2.2.0 to 2.2.1 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/aad671d5123a2fd20e4396d591e25335d7219950">aad671d</a>)</li> <li>build(deps-dev): bump eslint-plugin-eslint-plugin from 2.1.0 to 2.2.0 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/e2458c2d41825f94441dc7d552da37aede95ffe7">e2458c2</a>)</li> <li>build(deps-dev): bump eslint-config-prettier from 6.8.0 to 6.9.0 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/05ef06ffdda2bb485a2175243e6a8a167a01466c">05ef06f</a>)</li> <li>build(deps-dev): bump eslint-config-prettier from 6.7.0 to 6.8.0 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/ab80b3c5d30ea605aa363f13078aef9e0b697b6e">ab80b3c</a>)</li> <li>build(deps-dev): bump eslint from 6.7.2 to 6.8.0 (<a href="https://github.com/prettier/eslint-plugin-prettier/blob/master/[email protected]:prettier/eslint-plugin-prettier/commit/dea1b30361921d7160aaf44d5302c5cc6490f87a">dea1b30</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li>See full diff in <a href="https://github.com/prettier/eslint-plugin-prettier/commits">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=eslint-plugin-prettier&package-manager=npm_and_yarn&previous-version=3.1.2&new-version=3.1.3)](https://dependabot.com/compatibility-score/?dependency-name=eslint-plugin-prettier&package-manager=npm_and_yarn&previous-version=3.1.2&new-version=3.1.3) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme Additionally, you can set the following in the `.dependabot/config.yml` file in this repo: - Update frequency - Automerge options (never/patch/minor, and dev/runtime dependencies) - Out-of-range updates (receive only lockfile updates, if desired) - Security updates (receive only security updates, if desired) </details>
2 parents 5cccd6e + 52cdf11 commit 9354f16

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"eslint-config-prettier": "^6.10.1",
9797
"eslint-plugin-ember": "^8.1.1",
9898
"eslint-plugin-import-helpers": "^1.0.2",
99-
"eslint-plugin-prettier": "^3.1.2",
99+
"eslint-plugin-prettier": "^3.1.3",
100100
"loader.js": "^4.7.0",
101101
"normalize.css": "^8.0.1",
102102
"nyc": "^15.0.1",

0 commit comments

Comments
 (0)