Skip to content

Commit 11f3e6d

Browse files
committed
Auto merge of #2462 - rust-lang:dependabot/npm_and_yarn/eslint-config-prettier-6.11.0, r=Turbo87
Bump eslint-config-prettier from 6.10.1 to 6.11.0 Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.10.1 to 6.11.0. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md">eslint-config-prettier's changelog</a>.</em></p> <blockquote> <h3>Version 6.11.0 (2020-04-21)</h3> <ul> <li>Added: [@typescript-eslint/keyword-spacing]. Thanks to Hans Bergren (<a href="https://github.com/hbergren">@hbergren</a>)!</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/prettier/eslint-config-prettier/commit/97b4997c54494a1b47e0dd30207f005b7eb86162"><code>97b4997</code></a> eslint-config-prettier v6.11.0</li> <li><a href="https://github.com/prettier/eslint-config-prettier/commit/574876ed09ebbf46887db561d2841dcb8f700286"><code>574876e</code></a> Add @typescript-eslint/keyword-spacing</li> <li><a href="https://github.com/prettier/eslint-config-prettier/commit/3f7a3b87bfbe755cb152e6108404d6206bc5c740"><code>3f7a3b8</code></a> Update npm packages</li> <li><a href="https://github.com/prettier/eslint-config-prettier/commit/35fb6a12f4cb32ac5c9bf98a92f46f3b24490567"><code>35fb6a1</code></a> Run CI on PRs</li> <li>See full diff in <a href="https://github.com/prettier/eslint-config-prettier/compare/v6.10.1...v6.11.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=eslint-config-prettier&package-manager=npm_and_yarn&previous-version=6.10.1&new-version=6.11.0)](https://dependabot.com/compatibility-score/?dependency-name=eslint-config-prettier&package-manager=npm_and_yarn&previous-version=6.10.1&new-version=6.11.0) 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 3a43dea + 8d346fb commit 11f3e6d

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
@@ -93,7 +93,7 @@
9393
"ember-web-app": "^4.0.0",
9494
"ember-window-mock": "^0.6.0",
9595
"eslint": "^6.8.0",
96-
"eslint-config-prettier": "^6.10.1",
96+
"eslint-config-prettier": "^6.11.0",
9797
"eslint-plugin-ember": "^8.4.0",
9898
"eslint-plugin-import-helpers": "^1.0.2",
9999
"eslint-plugin-prettier": "^3.1.3",

0 commit comments

Comments
 (0)