rust-lang · bors · Jan 13, 2022 · Jan 13, 2022 · Jan 13, 2022 · Jan 13, 2022
diff --git a/mirage/factories/api-token.js b/mirage/factories/api-token.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   createdAt: '2017-11-19T17:59:22',

diff --git a/mirage/factories/category.js b/mirage/factories/category.js
@@ -1,6 +1,6 @@
 import { dasherize } from '@ember/string';
 
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   category: i => `Category ${i}`,

diff --git a/mirage/factories/crate-owner-invitation.js b/mirage/factories/crate-owner-invitation.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   createdAt: '2016-12-24T12:34:56Z',

diff --git a/mirage/factories/crate-ownership.js b/mirage/factories/crate-ownership.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   emailNotifications: true,

diff --git a/mirage/factories/crate.js b/mirage/factories/crate.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   name: i => `crate-${i}`,

diff --git a/mirage/factories/dependency.js b/mirage/factories/dependency.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 const REQS = ['^0.1.0', '^2.1.3', '0.3.7', '~5.2.12'];
 

diff --git a/mirage/factories/keyword.js b/mirage/factories/keyword.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   keyword: i => `keyword-${i + 1}`,

diff --git a/mirage/factories/mirage-session.js b/mirage/factories/mirage-session.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   afterCreate(session) {

diff --git a/mirage/factories/team.js b/mirage/factories/team.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 const ORGS = ['rust-lang', 'emberjs', 'rust-random', 'georust', 'actix'];
 

diff --git a/mirage/factories/user.js b/mirage/factories/user.js
@@ -1,6 +1,6 @@
 import { dasherize } from '@ember/string';
 
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   name: i => `User ${i + 1}`,

diff --git a/mirage/factories/version-download.js b/mirage/factories/version-download.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 export default Factory.extend({
   date: '2019-05-21',

diff --git a/mirage/factories/version.js b/mirage/factories/version.js
@@ -1,4 +1,4 @@
-import { Factory } from 'ember-cli-mirage';
+import { Factory } from 'miragejs';
 
 const LICENSES = ['MIT/Apache-2.0', 'MIT', 'Apache-2.0'];
 

diff --git a/mirage/models/api-token.js b/mirage/models/api-token.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 export default Model.extend({
   user: belongsTo(),

diff --git a/mirage/models/category-slug.js b/mirage/models/category-slug.js
@@ -1,3 +1,3 @@
-import { Model } from 'ember-cli-mirage';
+import { Model } from 'miragejs';
 
 export default Model.extend({});
diff --git a/mirage/models/category.js b/mirage/models/category.js
@@ -1,3 +1,3 @@
-import { Model } from 'ember-cli-mirage';
+import { Model } from 'miragejs';
 
 export default Model.extend({});
diff --git a/mirage/models/crate-owner-invitation.js b/mirage/models/crate-owner-invitation.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 export default Model.extend({
   crate: belongsTo(),

diff --git a/mirage/models/crate-ownership.js b/mirage/models/crate-ownership.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 export default Model.extend({
   crate: belongsTo(),

diff --git a/mirage/models/crate.js b/mirage/models/crate.js
@@ -1,4 +1,4 @@
-import { hasMany, Model } from 'ember-cli-mirage';
+import { hasMany, Model } from 'miragejs';
 
 export default Model.extend({
   categories: hasMany(),

diff --git a/mirage/models/dependency.js b/mirage/models/dependency.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 export default Model.extend({
   crate: belongsTo(),

diff --git a/mirage/models/keyword.js b/mirage/models/keyword.js
@@ -1,3 +1,3 @@
-import { Model } from 'ember-cli-mirage';
+import { Model } from 'miragejs';
 
 export default Model.extend({});
diff --git a/mirage/models/mirage-session.js b/mirage/models/mirage-session.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 /**
  * This is a mirage-only model, that is used to keep track of the current

diff --git a/mirage/models/owned-crate.js b/mirage/models/owned-crate.js
@@ -1,3 +1,3 @@
-import { Model } from 'ember-cli-mirage';
+import { Model } from 'miragejs';
 
 export default Model.extend({});
diff --git a/mirage/models/team.js b/mirage/models/team.js
@@ -1,3 +1,3 @@
-import { Model } from 'ember-cli-mirage';
+import { Model } from 'miragejs';
 
 export default Model.extend({});
diff --git a/mirage/models/user.js b/mirage/models/user.js
@@ -1,4 +1,4 @@
-import { hasMany, Model } from 'ember-cli-mirage';
+import { hasMany, Model } from 'miragejs';
 
 export default Model.extend({
   followedCrates: hasMany('crate'),

diff --git a/mirage/models/version-download.js b/mirage/models/version-download.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 export default Model.extend({
   version: belongsTo(),

diff --git a/mirage/models/version.js b/mirage/models/version.js
@@ -1,4 +1,4 @@
-import { belongsTo, Model } from 'ember-cli-mirage';
+import { belongsTo, Model } from 'miragejs';
 
 export default Model.extend({
   crate: belongsTo(),

diff --git a/mirage/route-handlers/-utils.js b/mirage/route-handlers/-utils.js
@@ -1,4 +1,4 @@
-import Response from 'ember-cli-mirage/response';
+import { Response } from 'miragejs';
 
 export function notFound() {
   return new Response(

diff --git a/mirage/route-handlers/crates.js b/mirage/route-handlers/crates.js
@@ -1,4 +1,4 @@
-import { Response } from 'ember-cli-mirage';
+import { Response } from 'miragejs';
 
 import { getSession } from '../utils/session';
 import { compareIsoDates, compareStrings, notFound, pageParams } from './-utils';

diff --git a/mirage/route-handlers/invites.js b/mirage/route-handlers/invites.js
@@ -1,4 +1,4 @@
-import { Response } from 'ember-cli-mirage';
+import { Response } from 'miragejs';
 
 import { getSession } from '../utils/session';
 import { notFound } from './-utils';

diff --git a/mirage/route-handlers/me.js b/mirage/route-handlers/me.js
@@ -1,4 +1,4 @@
-import { Response } from 'ember-cli-mirage';
+import { Response } from 'miragejs';
 
 import { getSession } from '../utils/session';
 

diff --git a/mirage/route-handlers/users.js b/mirage/route-handlers/users.js
@@ -1,4 +1,4 @@
-import { Response } from 'ember-cli-mirage';
+import { Response } from 'miragejs';
 
 import { getSession } from '../utils/session';
 import { notFound } from './-utils';

diff --git a/mirage/serializers/application.js b/mirage/serializers/application.js
@@ -1,4 +1,4 @@
-import { ActiveModelSerializer } from 'ember-cli-mirage';
+import { ActiveModelSerializer } from 'miragejs';
 
 export default ActiveModelSerializer.extend({
   getHashForResource(resource) {

diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "ember-cli-head": "2.0.0",
     "ember-cli-htmlbars": "6.0.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.2.0",
+    "ember-cli-mirage": "2.3.0",
     "ember-cli-notifications": "7.0.0",
     "ember-cli-terser": "4.0.2",
     "ember-click-outside": "2.0.0",
@@ -120,6 +120,7 @@
     "eslint-plugin-unicorn": "40.0.0",
     "loader.js": "4.7.0",
     "match-json": "1.3.3",
+    "miragejs": "0.1.43",
     "normalize.css": "8.0.1",
     "nyc": "15.1.0",
     "postcss-custom-media": "8.0.0",
@@ -133,7 +134,8 @@
   "resolutions": {
     "ember-css-modules/postcss": "8.4.5",
     "ember-inflector": "4.0.2",
-    "ember-modifier": "3.0.0"
+    "ember-modifier": "3.0.0",
+    "miragejs": "0.1.43"
   },
   "engines": {
     "node": "16.13.2",

diff --git a/tests/acceptance/api-token-test.js b/tests/acceptance/api-token-test.js
@@ -2,7 +2,7 @@ import { click, currentURL, fillIn, findAll } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
 import percySnapshot from '@percy/ember';
-import { Response } from 'ember-cli-mirage';
+import { Response } from 'miragejs';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 

diff --git a/tests/acceptance/invites-test.js b/tests/acceptance/invites-test.js
@@ -2,7 +2,7 @@ import { click, currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
 import percySnapshot from '@percy/ember';
-import Response from 'ember-cli-mirage/response';
+import { Response } from 'miragejs';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 

diff --git a/tests/helpers/setup-mirage.js b/tests/helpers/setup-mirage.js
@@ -1,4 +1,4 @@
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import window from 'ember-window-mock';
 import { setupWindowMock } from 'ember-window-mock/test-support';
 

diff --git a/tests/models/crate-test.js b/tests/models/crate-test.js
@@ -2,7 +2,7 @@ import { module, test } from 'qunit';
 
 import AdapterError from '@ember-data/adapter/error';
 
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 
 import { setupTest } from 'cargo/tests/helpers';
 

diff --git a/tests/models/version-test.js b/tests/models/version-test.js
@@ -1,7 +1,7 @@
 import { setupTest } from 'ember-qunit';
 import { module, test } from 'qunit';
 
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 
 import { setupFakeTimers } from '../helpers/fake-timers';
 

diff --git a/yarn.lock b/yarn.lock
@@ -1362,12 +1362,12 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/macros@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.40.0.tgz#f58763b4cfb9b4089679b478a28627595341bc5a"
-  integrity sha512-ygChvFoebSi/N8b+A+XFncd454gLYBYHancrtY0AE/h6Y1HouoqQvji/IfaLisGoeuwUWuI9rCBv97COweu/rA==
+"@embroider/macros@^0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.41.0.tgz#3e78b6f388d7229906abf4c75edfff8bb0208aca"
+  integrity sha512-QISzwEEfLsskZeL0jyZDs1RoQSotwBWj+4upTogNHuxQP5j/9H3IMG/3QB1gh8GEpbudATb/cS4NDYK3UBxufw==
   dependencies:
-    "@embroider/shared-internals" "0.40.0"
+    "@embroider/shared-internals" "0.41.0"
     assert-never "^1.1.0"
     ember-cli-babel "^7.23.0"
     lodash "^4.17.10"
@@ -1387,10 +1387,10 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/shared-internals@0.40.0", "@embroider/shared-internals@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
-  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+"@embroider/shared-internals@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.41.0.tgz#2553f026d4f48ea1fd11235501feb63bf49fa306"
+  integrity sha512-fiqUVB6cfh2UBEFE4yhT5EzagkZ1Q26+OhBV0nJszFEJZx4DqVIb3pxSSZ8P+HhpxuJsQ2XpMA/j02ZPFZfbdQ==
   dependencies:
     ember-rfc176-data "^0.3.17"
     fs-extra "^7.0.1"
@@ -1426,6 +1426,19 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
+"@embroider/shared-internals@^0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
+  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^7.0.1"
+    lodash "^4.17.10"
+    pkg-up "^3.1.0"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    typescript-memoize "^1.0.0-alpha.3"
+
 "@embroider/[email protected]":
   version "0.50.1"
   resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.50.1.tgz#3cb82bcda02dbd18d3b7835f37e2757f947fa883"
@@ -6127,7 +6140,7 @@ [email protected], ember-auto-import@^2.2.3, ember-auto-import@^2.2.4:
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^0.3.3"
 
-ember-auto-import@^1.10.1, ember-auto-import@^1.11.3, ember-auto-import@^1.2.19:
+ember-auto-import@^1.10.1, ember-auto-import@^1.11.3, ember-auto-import@^1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.0.tgz#52246b04891090e2608244e65c4c6af7710df12b"
   integrity sha512-fzMGnyHGfUNFHchpLbJ98Vs/c5H2wZBMR9r/XwW+WOWPisZDGLUPPyhJQsSREPoUQ+o8GvyLaD/rkrKqW8bmgw==
@@ -6195,7 +6208,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-[email protected], ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3:
+[email protected], ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -6404,21 +6417,22 @@ [email protected], ember-cli-lodash-subset@^2.0.1:
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
   integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
 
-ember-cli-mirage@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.2.0.tgz#38f4ec02536dd50ecdb265da2abbf7986d66b091"
-  integrity sha512-w+DrFEGuuLyHzJwOVkG0yOLvgwYezaMBNvvZJQzQkv1W3CsdhllkY1ZauYgL0dhrmYJwRFtp8DnaPQwBTDCSfA==
+ember-cli-mirage@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-2.3.0.tgz#02f08d5b5ca406607ca1b60ee2cd798488a14be1"
+  integrity sha512-Fj0EVFMIrL4J07f9lEwuX/qjV+m/5D0QUEngmvn7YHIUtfVJtqWkrNaOddhas6waBJMwAz0fvf+/CPbLGGzt5A==
   dependencies:
-    "@embroider/macros" "^0.40.0"
+    "@embroider/macros" "^0.41.0"
     broccoli-file-creator "^2.1.1"
     broccoli-funnel "^3.0.3"
     broccoli-merge-trees "^4.2.0"
-    ember-auto-import "^1.2.19"
-    ember-cli-babel "^7.5.0"
-    ember-get-config "^0.2.4 || ^0.3.0"
-    ember-inflector "^2.0.0 || ^3.0.0 || ^4.0.0"
+    ember-auto-import "^1.12.0"
+    ember-cli-babel "^7.26.6"
+    ember-destroyable-polyfill "^2.0.3"
+    ember-get-config "0.2.4 - 0.5.0"
+    ember-inflector "^2.0.0 || ^3.0.0 || ^4.0.2"
     lodash-es "^4.17.11"
-    miragejs "^0.1.31"
+    miragejs "^0.1.43"
 
 ember-cli-normalize-entity-name@^1.0.0:
   version "1.0.0"
@@ -6830,7 +6844,7 @@ [email protected]:
     node-fetch "^2.6.1"
     whatwg-fetch "^3.6.2"
 
-"ember-get-config@^0.2.4 || ^0.3.0":
+"ember-get-config@0.2.4 - 0.5.0", "ember-get-config@^0.2.4 || ^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.3.0.tgz#a73a1a87b48d9dde4c66a0e52ed5260b8a48cfbd"
   integrity sha512-0e2pKzwW5lBZ4oJnvu9qHOht4sP1MWz/m3hyz8kpSoMdrlZVf62LDKZ6qfKgy8drcv5YhCMYE6QV7MhnqlrzEQ==
@@ -6848,7 +6862,7 @@ ember-in-element-polyfill@^1.0.0, ember-in-element-polyfill@^1.0.1:
     ember-cli-htmlbars "^5.3.1"
     ember-cli-version-checker "^5.1.2"
 
-[email protected], "ember-inflector@^2.0.0 || ^3.0.0 || ^4.0.0", ember-inflector@^4.0.1:
+[email protected], "ember-inflector@^2.0.0 || ^3.0.0 || ^4.0.2", ember-inflector@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-4.0.2.tgz#4494f1a5f61c1aca7702d59d54024cc92211d8ec"
   integrity sha512-+oRstEa52mm0jAFzhr51/xtEWpCEykB3SEBr7vUg8YnXUZJ5hKNBppP938q8Zzr9XfJEbzrtDSGjhKwJCJv6FQ==
@@ -10630,7 +10644,7 @@ minipass@^2.2.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-miragejs@^0.1.31:
+miragejs@0.1.43, miragejs@^0.1.43:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/miragejs/-/miragejs-0.1.43.tgz#47a8546b9e3489f806073e681f380ccfe13d757d"
   integrity sha512-BhkyxssOZ2i4JqRjWpRnUQu9AFAKHyft8dJbqsg/N64+gCn2vw6vRteMpTKXllLjCPOA9Os8PhGRVXlXs4Ojhw==