Skip to content

Commit 3c4e87f

Browse files
committed
Upgrade mirage
1 parent 9f6fa26 commit 3c4e87f

File tree

2 files changed

+108
-66
lines changed

2 files changed

+108
-66
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"ember-cli-deploy-git-ci": "^1.0.1",
9898
"ember-cli-eslint": "^4.2.3",
9999
"ember-cli-inject-live-reload": "^1.8.2",
100-
"ember-cli-mirage": "^0.4.9",
100+
"ember-cli-mirage": "^0.4.14",
101101
"ember-cli-qunit": "^4.3.2",
102102
"ember-cli-sri": "^2.1.1",
103103
"ember-cli-template-lint": "^1.0.0-beta.2",

yarn.lock

Lines changed: 107 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,16 @@
493493
dependencies:
494494
regenerator-transform "^0.13.3"
495495

496+
"@babel/plugin-transform-runtime@^7.2.0":
497+
version "7.2.0"
498+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea"
499+
integrity sha512-jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw==
500+
dependencies:
501+
"@babel/helper-module-imports" "^7.0.0"
502+
"@babel/helper-plugin-utils" "^7.0.0"
503+
resolve "^1.8.1"
504+
semver "^5.5.1"
505+
496506
"@babel/plugin-transform-shorthand-properties@^7.0.0":
497507
version "7.0.0"
498508
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz#85f8af592dcc07647541a0350e8c95c7bf419d15"
@@ -594,6 +604,13 @@
594604
js-levenshtein "^1.1.3"
595605
semver "^5.3.0"
596606

607+
"@babel/runtime@^7.2.0":
608+
version "7.3.1"
609+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
610+
integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA==
611+
dependencies:
612+
regenerator-runtime "^0.12.0"
613+
597614
"@babel/template@^7.1.0", "@babel/template@^7.1.2":
598615
version "7.1.2"
599616
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@@ -761,6 +778,11 @@
761778
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.32.tgz#1b64134f630b30c9cda4810aa4a94fc2d4141dbd"
762779
integrity sha512-5+L3wQ+FHoQ589EaH6rYICleuj8gnunq+1CJkM9fxklirErIOv+kxm3s/vecYnpJOYnFowE5uUizcb3hgjHUug==
763780

781+
"@xg-wang/whatwg-fetch@^3.0.0":
782+
version "3.0.0"
783+
resolved "https://registry.yarnpkg.com/@xg-wang/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#f7b222c012a238e7d6e89ed3d72a1e0edb58453d"
784+
integrity sha512-ULtqA6L75RLzTNW68IiOja0XYv4Ebc3OGMzfia1xxSEMpD0mk/pMvkQX0vbCFyQmKc5xGp80Ms2WiSlXLh8hbA==
785+
764786
abab@^1.0.0:
765787
version "1.0.4"
766788
resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
@@ -2283,7 +2305,7 @@ broccoli-funnel-reducer@^1.0.0:
22832305
resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
22842306
integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
22852307

2286-
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.1.0:
2308+
broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
22872309
version "1.2.0"
22882310
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
22892311
integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
@@ -2608,6 +2630,26 @@ broccoli-stew@^2.0.0:
26082630
symlink-or-copy "^1.2.0"
26092631
walk-sync "^0.3.0"
26102632

2633+
broccoli-stew@^2.0.1:
2634+
version "2.0.1"
2635+
resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.0.1.tgz#d0a507b79bf5fea9ff84032ae837dc48670ab1dc"
2636+
integrity sha512-EUzgkbYF4m8YVD2bkEa7OfYJ11V3dQ+yPuxdz/nFh8eMEn6dhOujtuSBnOWsvGDgsS9oqNZgx/MHJxI6Rr3AqQ==
2637+
dependencies:
2638+
broccoli-debug "^0.6.5"
2639+
broccoli-funnel "^2.0.0"
2640+
broccoli-merge-trees "^3.0.1"
2641+
broccoli-persistent-filter "^2.1.1"
2642+
broccoli-plugin "^1.3.1"
2643+
chalk "^2.4.1"
2644+
debug "^3.1.0"
2645+
ensure-posix-path "^1.0.1"
2646+
fs-extra "^6.0.1"
2647+
minimatch "^3.0.4"
2648+
resolve "^1.8.1"
2649+
rsvp "^4.8.4"
2650+
symlink-or-copy "^1.2.0"
2651+
walk-sync "^0.3.3"
2652+
26112653
broccoli-string-replace@^0.1.1, broccoli-string-replace@^0.1.2:
26122654
version "0.1.2"
26132655
resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.2.tgz#1ed92f85680af8d503023925e754e4e33676b91f"
@@ -2677,13 +2719,6 @@ broccoli-uglify-sourcemap@^2.1.1:
26772719
walk-sync "^0.3.2"
26782720
workerpool "^2.3.0"
26792721

2680-
broccoli-unwatched-tree@^0.1.1:
2681-
version "0.1.3"
2682-
resolved "https://registry.yarnpkg.com/broccoli-unwatched-tree/-/broccoli-unwatched-tree-0.1.3.tgz#ab0fb820f613845bf67a803baad820f68b1e3aae"
2683-
integrity sha1-qw+4IPYThFv2eoA7qtgg9oseOq4=
2684-
dependencies:
2685-
broccoli-source "^1.1.0"
2686-
26872722
broccoli-writer@^0.1.1:
26882723
version "0.1.1"
26892724
resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d"
@@ -3908,7 +3943,7 @@ ember-cli-babel-plugin-helpers@^1.0.0:
39083943
resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.0.0.tgz#19f3142a2272adb1cc61dfe0dce360e2909a0b07"
39093944
integrity sha512-x7Nh9/ATLk0pArFDW9y0HJRiE1i8myoiQ+Xlq5aZKJX1uWNcOWMwfCZN5r1uRpcnbBXPwUjBmhR14YKN5qIzxg==
39103945

3911-
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
3946+
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
39123947
version "6.17.2"
39133948
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.17.2.tgz#f0d53d2fb95e70c15d8db84760d045f88f458f69"
39143949
integrity sha512-9KcCvF1PcelEFTSiJ/Ld20tfuW9acMkwHC/xINLsmwqJVDbm3oEqWtiFDZ5ebaC278O5I0GqNJWJLYNoWMNZ8g==
@@ -3927,6 +3962,30 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be
39273962
ember-cli-version-checker "^2.1.2"
39283963
semver "^5.5.0"
39293964

3965+
ember-cli-babel@^7.0.0:
3966+
version "7.4.1"
3967+
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.4.1.tgz#9892f5883f5a6b1f0f86fb1331fc491338f372ad"
3968+
integrity sha512-h6qZKHyULm5SYhvjNOeXvLl3kHaBdh37g5QqTTiC/vMiWP/xnyNp2bMoq52qq+SLm/bE8+5UcVTKjrNl0+IqXA==
3969+
dependencies:
3970+
"@babel/core" "^7.0.0"
3971+
"@babel/plugin-transform-modules-amd" "^7.0.0"
3972+
"@babel/plugin-transform-runtime" "^7.2.0"
3973+
"@babel/polyfill" "^7.0.0"
3974+
"@babel/preset-env" "^7.0.0"
3975+
"@babel/runtime" "^7.2.0"
3976+
amd-name-resolver "^1.2.1"
3977+
babel-plugin-debug-macros "^0.2.0-beta.6"
3978+
babel-plugin-ember-modules-api-polyfill "^2.6.0"
3979+
babel-plugin-module-resolver "^3.1.1"
3980+
broccoli-babel-transpiler "^7.1.0"
3981+
broccoli-debug "^0.6.4"
3982+
broccoli-funnel "^2.0.1"
3983+
broccoli-source "^1.1.0"
3984+
clone "^2.1.2"
3985+
ember-cli-version-checker "^2.1.2"
3986+
ensure-posix-path "^1.0.2"
3987+
semver "^5.5.0"
3988+
39303989
ember-cli-babel@^7.1.0:
39313990
version "7.1.2"
39323991
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.1.2.tgz#543c64368d6138d12656db1143c02df1f2b0ee9c"
@@ -4140,38 +4199,27 @@ ember-cli-lodash-subset@^2.0.1:
41404199
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
41414200
integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
41424201

4143-
ember-cli-mirage@^0.4.9:
4144-
version "0.4.9"
4145-
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.9.tgz#c49bfe875d0cdf88c85a6ee55103d1980175b914"
4146-
integrity sha512-uBZwRrnLmIWXkiMNxrtwkzg+rA+J/lojfb4JWLARfp8LqB+eBK/K+uPyb6sYO8TS6FXrCdumqFHnDlfVy+4azQ==
4202+
ember-cli-mirage@^0.4.14:
4203+
version "0.4.14"
4204+
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.14.tgz#95bf2966c05646be998fb042860a54a0340c7fe1"
4205+
integrity sha512-1eieAC9hHPT0x3wSsIYenIgyOlCp6uWofhCSDt9xnvwh/xqf/bQB2Cx3f+wbU5TaqLrSio6lYmRqswCZYTLNzw==
41474206
dependencies:
4148-
broccoli-funnel "^1.0.2"
4149-
broccoli-merge-trees "^1.1.0"
4150-
broccoli-stew "^1.5.0"
4207+
"@xg-wang/whatwg-fetch" "^3.0.0"
4208+
broccoli-file-creator "^2.1.1"
4209+
broccoli-funnel "^2.0.1"
4210+
broccoli-merge-trees "^3.0.2"
4211+
broccoli-stew "^2.0.1"
41514212
broccoli-string-replace "^0.1.2"
41524213
chalk "^1.1.1"
4153-
ember-cli-babel "^6.8.2"
4154-
ember-cli-node-assets "^0.1.4"
4214+
ember-cli-babel "^6.16.0"
4215+
ember-cli-node-assets "^0.2.2"
41554216
ember-get-config "^0.2.2"
4156-
ember-inflector "^2.0.0"
4157-
ember-lodash "^4.17.3"
4158-
fake-xml-http-request "^1.4.0"
4217+
ember-inflector "^2.0.0 || ^3.0.0"
4218+
ember-lodash "^4.19.4"
4219+
fake-xml-http-request "^2.0.0"
41594220
faker "^3.0.0"
4160-
jsdom "^11.12.0"
4161-
pretender "^1.6.1"
4162-
route-recognizer "^0.2.3"
4163-
4164-
ember-cli-node-assets@^0.1.4:
4165-
version "0.1.6"
4166-
resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.1.6.tgz#6488a2949048c801ad6d9e33753c7bce32fc1146"
4167-
integrity sha1-ZIiilJBIyAGtbZ4zdTx7zjL8EUY=
4168-
dependencies:
4169-
broccoli-funnel "^1.0.1"
4170-
broccoli-merge-trees "^1.1.1"
4171-
broccoli-unwatched-tree "^0.1.1"
4172-
debug "^2.2.0"
4173-
lodash "^4.5.1"
4174-
resolve "^1.1.7"
4221+
pretender "2.1.1"
4222+
route-recognizer "^0.3.4"
41754223

41764224
ember-cli-node-assets@^0.2.2:
41774225
version "0.2.2"
@@ -4614,14 +4662,7 @@ ember-ignore-children-helper@^1.0.0:
46144662
dependencies:
46154663
ember-cli-babel "^6.8.2"
46164664

4617-
ember-inflector@^2.0.0:
4618-
version "2.3.0"
4619-
resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.3.0.tgz#94797eba0eea98d902aa1e5da0f0aeef6053317f"
4620-
integrity sha1-lHl+ug7qmNkCqh5doPCu72BTMX8=
4621-
dependencies:
4622-
ember-cli-babel "^6.0.0"
4623-
4624-
ember-inflector@^3.0.0:
4665+
"ember-inflector@^2.0.0 || ^3.0.0", ember-inflector@^3.0.0:
46254666
version "3.0.0"
46264667
resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-3.0.0.tgz#7e1ee8aaa0fa773ba0905d8b7c0786354d890ee1"
46274668
integrity sha512-tLWfYolZAkLnkTvvBkjizy4Wmj8yI8wqHZFK+leh0iScHiC3r1Yh5C4qO+OMGiBTMLwfTy+YqVoE/Nu3hGNkcA==
@@ -4643,16 +4684,16 @@ ember-load-initializers@^1.1.0:
46434684
dependencies:
46444685
ember-cli-babel "^6.6.0"
46454686

4646-
ember-lodash@^4.17.3:
4647-
version "4.18.0"
4648-
resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.18.0.tgz#45de700d6a4f68f1cd62888d90b50aa6477b9a83"
4649-
integrity sha1-Rd5wDWpPaPHNYoiNkLUKpkd7moM=
4687+
ember-lodash@^4.19.4:
4688+
version "4.19.4"
4689+
resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.19.4.tgz#3e76e6cb04c9312c2158180bf16d7983aae05774"
4690+
integrity sha512-4O1YjFfFA1EL53XXxyjRwRRl1f1MahxON7dbPhe5Ex3f8lmuvB0fEc1U+kJ1IwefmUqeSyOBsYXG6L9ushOKQQ==
46504691
dependencies:
46514692
broccoli-debug "^0.6.1"
46524693
broccoli-funnel "^2.0.1"
4653-
broccoli-merge-trees "^2.0.0"
4694+
broccoli-merge-trees "^3.0.0"
46544695
broccoli-string-replace "^0.1.1"
4655-
ember-cli-babel "^6.10.0"
4696+
ember-cli-babel "^7.0.0"
46564697
lodash-es "^4.17.4"
46574698

46584699
ember-maybe-import-regenerator-for-testing@^1.0.0:
@@ -5423,10 +5464,10 @@ extsprintf@^1.2.0:
54235464
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
54245465
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
54255466

5426-
fake-xml-http-request@^1.4.0, fake-xml-http-request@^1.6.0:
5427-
version "1.6.0"
5428-
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-1.6.0.tgz#bd0ac79ae3e2660098282048a12c730a6f64d550"
5429-
integrity sha512-99XPwwSg89BfzPuv4XCpZxn3EbauMCgAQCxq9MzrvS6DFD73OON6AnUTicL4A0HZtYMBwCZBWVnRqGjZDgQkTg==
5467+
fake-xml-http-request@^2.0.0:
5468+
version "2.0.0"
5469+
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.0.0.tgz#41a92f0ca539477700cb1dafd2df251d55dac8ff"
5470+
integrity sha512-UjNnynb6eLAB0lyh2PlTEkjRJORnNsVF1hbzU+PQv89/cyBV9GDRCy7JAcLQgeCLYT+3kaumWWZKEJvbaK74eQ==
54305471

54315472
faker@^3.0.0:
54325473
version "3.1.0"
@@ -9139,12 +9180,13 @@ preserve@^0.2.0:
91399180
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
91409181
integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
91419182

9142-
pretender@^1.6.1:
9143-
version "1.6.1"
9144-
resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c"
9145-
integrity sha1-d9HkKsjGspj1zUNTSodkXfA124w=
9183+
pretender@2.1.1:
9184+
version "2.1.1"
9185+
resolved "https://registry.yarnpkg.com/pretender/-/pretender-2.1.1.tgz#5085f0a1272c31d5b57c488386f69e6ca207cb35"
9186+
integrity sha512-IkidsJzaroAanw3I43tKCFm2xCpurkQr9aPXv5/jpN+LfCwDaeI8rngVWtQZTx4qqbhc5zJspnLHJ4N/25KvDQ==
91469187
dependencies:
9147-
fake-xml-http-request "^1.6.0"
9188+
"@xg-wang/whatwg-fetch" "^3.0.0"
9189+
fake-xml-http-request "^2.0.0"
91489190
route-recognizer "^0.3.3"
91499191

91509192
pretty-ms@^3.1.0:
@@ -9445,6 +9487,11 @@ regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1:
94459487
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
94469488
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
94479489

9490+
regenerator-runtime@^0.12.0:
9491+
version "0.12.1"
9492+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
9493+
integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
9494+
94489495
regenerator-runtime@^0.9.5:
94499496
version "0.9.6"
94509497
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
@@ -9819,12 +9866,7 @@ rollup@^0.57.1:
98199866
signal-exit "^3.0.2"
98209867
sourcemap-codec "^1.4.1"
98219868

9822-
route-recognizer@^0.2.3:
9823-
version "0.2.10"
9824-
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df"
9825-
integrity sha1-Aksig8LmjROnx/UXOlkkZF6JAt8=
9826-
9827-
route-recognizer@^0.3.3:
9869+
route-recognizer@^0.3.3, route-recognizer@^0.3.4:
98289870
version "0.3.4"
98299871
resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
98309872
integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==

0 commit comments

Comments
 (0)