Skip to content

Commit 0267afd

Browse files
committed
Auto merge of #3109 - rust-lang:renovate/ember-cli-mirage-2.x, r=Turbo87
Update dependency ember-cli-mirage to v2 [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [ember-cli-mirage](https://togithub.com/miragejs/ember-cli-mirage) | [`1.1.8` -> `2.0.1`](https://renovatebot.com/diffs/npm/ember-cli-mirage/1.1.8/2.0.1) | [![age](https://badges.renovateapi.com/packages/npm/ember-cli-mirage/2.0.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/npm/ember-cli-mirage/2.0.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/npm/ember-cli-mirage/2.0.1/compatibility-slim/1.1.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/npm/ember-cli-mirage/2.0.1/confidence-slim/1.1.8)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>miragejs/ember-cli-mirage</summary> ### [`v2.0.1`](https://togithub.com/miragejs/ember-cli-mirage/releases/v2.0.1) [Compare Source](https://togithub.com/miragejs/ember-cli-mirage/compare/v2.0.0...v2.0.1) ##### 🚀 Enhancement - [#&#8203;2101](https://togithub.com/miragejs/ember-cli-mirage/pull/2101) Widen `ember-get-config` dependency requirement ([`@&#8203;Turbo87](https://togithub.com/Turbo87))` ### [`v2.0.0`](https://togithub.com/miragejs/ember-cli-mirage/releases/v2.0.0) [Compare Source](https://togithub.com/miragejs/ember-cli-mirage/compare/v1.1.8...v2.0.0) ##### 💥 Breaking Change - [#&#8203;2057](https://togithub.com/miragejs/ember-cli-mirage/pull/2057) Bump node ([`@&#8203;samselikoff](https://togithub.com/samselikoff))` ##### 🚀 Enhancement - [#&#8203;2093](https://togithub.com/miragejs/ember-cli-mirage/pull/2093) Update mirage logging option to work with qunit5 ([`@&#8203;cah-briangantzler](https://togithub.com/cah-briangantzler))` - [#&#8203;2054](https://togithub.com/miragejs/ember-cli-mirage/pull/2054) Serializer2 docs ([`@&#8203;cah-briangantzler](https://togithub.com/cah-briangantzler))` - [#&#8203;2038](https://togithub.com/miragejs/ember-cli-mirage/pull/2038) Allow for Mirage to generate Serializers ([`@&#8203;cah-briangantzler](https://togithub.com/cah-briangantzler))` - [#&#8203;1994](https://togithub.com/miragejs/ember-cli-mirage/pull/1994) Provided a makeServer function on config.js to allow more access to the mirageJS configurations ([`@&#8203;cah-briangantzler](https://togithub.com/cah-briangantzler))` ##### 🐛 Bug Fix - [#&#8203;2073](https://togithub.com/miragejs/ember-cli-mirage/pull/2073) Fix invalid use of ES modules ([`@&#8203;ef4](https://togithub.com/ef4))` </details> --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- 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 587a0ce + adfa5e3 commit 0267afd

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"ember-cli-htmlbars": "5.3.1",
7272
"ember-cli-inject-live-reload": "2.0.2",
7373
"ember-cli-meta-tags": "6.1.2",
74-
"ember-cli-mirage": "1.1.8",
74+
"ember-cli-mirage": "2.0.1",
7575
"ember-cli-moment-shim": "3.8.0",
7676
"ember-cli-notifications": "6.3.2",
7777
"ember-cli-sri": "2.1.1",

yarn.lock

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@
12821282
resolve "^1.8.1"
12831283
semver "^7.3.2"
12841284

1285-
"@embroider/[email protected]":
1285+
"@embroider/[email protected]", "@embroider/macros@^0.33.0":
12861286
version "0.33.0"
12871287
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
12881288
integrity sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==
@@ -6347,17 +6347,18 @@ [email protected]:
63476347
ember-cli-htmlbars "^4.2.2"
63486348
ember-compatibility-helpers "^1.1.2"
63496349

6350-
ember-cli-mirage@1.1.8:
6351-
version "1.1.8"
6352-
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-1.1.8.tgz#b3874a0f2eb83d8f341416d3a691ff82735c629c"
6353-
integrity sha512-i0/CNwdyza+o+0RW92i/dEhAqTcyoAJ9jGKKiOLK74RwDG0Bgt5w/CdqKfIFBf/lIGPXHPveneWsyckeSiVr4A==
6350+
ember-cli-mirage@2.0.1:
6351+
version "2.0.1"
6352+
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.0.1.tgz#3851c3691f66769ab55c13a2557e69c85ad66b23"
6353+
integrity sha512-zOepXLwuV4G+DZHQE3h62QQGARtwvgG+Glry+fySQ8VbCo3v/jh8l1JJIluUpPkEVyEyuGHIbjKqi/yQsSjm4Q==
63546354
dependencies:
6355+
"@embroider/macros" "^0.33.0"
63556356
broccoli-file-creator "^2.1.1"
6356-
broccoli-funnel "^2.0.2"
6357-
broccoli-merge-trees "^3.0.2"
6357+
broccoli-funnel "^3.0.3"
6358+
broccoli-merge-trees "^4.2.0"
63586359
ember-auto-import "^1.2.19"
63596360
ember-cli-babel "^7.5.0"
6360-
ember-get-config "^0.2.2"
6361+
ember-get-config "^0.2.4 || ^0.3.0"
63616362
ember-inflector "^2.0.0 || ^3.0.0"
63626363
lodash-es "^4.17.11"
63636364
miragejs "^0.1.31"
@@ -6803,7 +6804,7 @@ [email protected]:
68036804
node-fetch "^2.6.0"
68046805
whatwg-fetch "^3.4.0"
68056806

6806-
ember-get-config@, [email protected], ember-get-config@^0.2.2, ember-get-config@^0.2.4:
6807+
ember-get-config@, [email protected], ember-get-config@^0.2.4, "ember-get-config@^0.2.4 || ^0.3.0":
68076808
version "0.2.4"
68086809
resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd"
68096810
integrity sha1-EYSSoqA9c+RgBO13eSiUICH+Hs0=

0 commit comments

Comments
 (0)