Skip to content

Commit

Permalink
Bump ember-resolver from 4.5.6 to 5.0.1 (#349)
Browse files Browse the repository at this point in the history
Bumps [ember-resolver](https://github.com/ember-cli/ember-resolver) from 4.5.6 to 5.0.1.
<details>
<summary>Changelog</summary>

*Sourced from [ember-resolver's changelog](https://github.com/ember-cli/ember-resolver/blob/master/CHANGELOG.md).*

> # Change Log
</details>
<details>
<summary>Commits</summary>

- [`6303c48`](ember-cli/ember-resolver@6303c48) release v5.0.1 🎉
- [`0ffc530`](ember-cli/ember-resolver@0ffc530) Merge pull request [#243](https://github-redirect.dependabot.com/ember-cli/ember-resolver/issues/243) from ember-cli/remove-default-resolver
- [`51f92e8`](ember-cli/ember-resolver@51f92e8) release v5.0.0 🎉
- [`df3ef4e`](ember-cli/ember-resolver@df3ef4e) Merge pull request [#244](https://github-redirect.dependabot.com/ember-cli/ember-resolver/issues/244) from ember-cli/chores
- [`1c40ceb`](ember-cli/ember-resolver@1c40ceb) Fix linting
- [`340f2ca`](ember-cli/ember-resolver@340f2ca) upgrade eslint + qunit-dom
- [`793ed30`](ember-cli/ember-resolver@793ed30) Disable not super important test for 3.3 test combat:
- [`777bdf1`](ember-cli/ember-resolver@777bdf1) upgrade CLI
- [`fa0302e`](ember-cli/ember-resolver@fa0302e) upgrades
- [`d63ac09`](ember-cli/ember-resolver@d63ac09) update lockfile (fix node 10 issue)
- Additional commits viewable in [compare view](ember-cli/ember-resolver@v4.5.6...v5.0.1)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=ember-resolver&package-manager=npm_and_yarn&previous-version=4.5.6&new-version=5.0.1)](https://dependabot.com/compatibility-score.html?dependency-name=ember-resolver&package-manager=npm_and_yarn&previous-version=4.5.6&new-version=5.0.1)

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 will **not** automatically merge this PR because it includes an out-of-range update to a development dependency.

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<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 cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major 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 use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@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 your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
  • Loading branch information
dependabot[bot] authored and Turbo87 committed Oct 13, 2018
1 parent 6f2d975 commit 377615a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"ember-data": "2.16.2",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-resolver": "^5.0.1",
"ember-source": "~2.18.0",
"ember-source-channel-url": "^1.0.1",
"ember-try": "^0.2.23",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1179,7 +1179,7 @@ broccoli-funnel-reducer@^1.0.0:
resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=

broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0:
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.6, broccoli-funnel@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
Expand Down Expand Up @@ -1261,7 +1261,7 @@ broccoli-merge-trees@^2.0.0:
broccoli-plugin "^1.3.0"
merge-trees "^1.0.1"

broccoli-merge-trees@^3.0.1:
broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.1.tgz#545dfe9f695cec43372b3ee7e63c7203713ea554"
integrity sha512-EFPBLbCoyCLdjJx0lxn+acWXK/GAZesXokS4OsF7HuB+WdnV76HVJPdfwp9TaXaUkrtb7eU+ymh9tY9wOGQjMQ==
Expand Down Expand Up @@ -2545,15 +2545,15 @@ ember-load-initializers@^1.0.0:
dependencies:
ember-cli-babel "^6.6.0"

ember-resolver@^4.0.0:
version "4.5.6"
resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.6.tgz#61cecc683fbe3464d759e6d0c2bab97b3914ee4b"
integrity sha512-v+VfQKkYCzdI49cGhPAWlvkjnyYEk1x7/CBKH9xakd8qyByNh6996/EgN0Wzew7B2Gj+cFXii0cEGI8iFAxj6g==
ember-resolver@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-5.0.1.tgz#21740b92e1e4a65f94018de22aa1c73434dc3b2f"
integrity sha512-Svhs/eseIVQ6Yik+4mFpixT639FREZW2UkIYo7197bRuSL63tofKDMfE+gOXUSSudQlQSaFHFeKDr9oD+0C2GQ==
dependencies:
"@glimmer/resolver" "^0.4.1"
babel-plugin-debug-macros "^0.1.10"
broccoli-funnel "^1.1.0"
broccoli-merge-trees "^2.0.0"
broccoli-funnel "^2.0.1"
broccoli-merge-trees "^3.0.0"
ember-cli-babel "^6.8.1"
ember-cli-version-checker "^2.0.0"
resolve "^1.3.3"
Expand Down

0 comments on commit 377615a

Please sign in to comment.