diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 9c43b2c107..92c4936ead 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -88,7 +88,7 @@ "ember-power-calendar-moment": "0.1.7", "ember-power-datepicker": "0.6.2", "ember-power-select": "2.3.5", - "ember-resolver": "5.3.0", + "ember-resolver": "7.0.0", "ember-route-action-helper": "2.0.7", "ember-simple-auth": "1.9.2", "ember-sinon": "4.1.1", diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index cb68089076..050d333d3d 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -1016,23 +1016,11 @@ resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280" integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA= -"@glimmer/di@^0.2.0": - version "0.2.1" - resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.1.tgz#5286b6b32040232b751138f6d006130c728d4b3d" - integrity sha512-0D53YVuEgGdHfTl9LGWDZqVzGhn4cT0CXqyAuOYkKFLvqboJXz6SnkRhQNPhhA2hLVrPnvUz3+choQmPhHLGGQ== - "@glimmer/env@^0.1.7": version "0.1.7" resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07" integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc= -"@glimmer/resolver@^0.4.1": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@glimmer/resolver/-/resolver-0.4.3.tgz#b1baae5c3291b4621002ccf8d7870466097e841d" - integrity sha512-UhX6vlZbWRMq6pCquSC3wfWLM9kO0PhQPD1dZ3XnyZkmsvEE94Cq+EncA9JalUuevKoJrfUFRvrZ0xaz+yar3g== - dependencies: - "@glimmer/di" "^0.2.0" - "@glimmer/util@^0.44.0": version "0.44.0" resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9" @@ -1959,13 +1947,6 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-debug-macros@^0.1.10: - version "0.1.11" - resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.11.tgz#6c562bf561fccd406ce14ab04f42c218cf956605" - integrity sha512-hZw5qNNGAR02Y+yBUrtsnJHh8OXavkayPRqKGAXnIm4t5rWVpj3ArwsC7TWdpZsBguQvHAeyTxZ7s23yY60HHg== - dependencies: - semver "^5.3.0" - babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6: version "0.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a" @@ -5734,18 +5715,17 @@ ember-raf-scheduler@0.1.0: dependencies: ember-cli-babel "^6.6.0" -ember-resolver@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-5.3.0.tgz#9fbeedfa63c094b588ac7647ba62f1305374f1d8" - integrity sha512-NWin+WzmsRnZxFvDlx9B3rb3kxwK0MNblJemoRvNbbxLK6z5lGxVoBfpU4/nqItWfwmpVb9ZK8bqXYs5q8HT4A== +ember-resolver@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-7.0.0.tgz#07ca86b3bae373395b44bba784b8c133f75d61c2" + integrity sha512-tqyWk9E1P5LL42x7AnVoE25a/YWe0WcwAr8LXasm5V7Az3vFR/zbFtwN0oI3tpoSP/nCoGWDct6dRYlXrQjqBQ== dependencies: - "@glimmer/resolver" "^0.4.1" - babel-plugin-debug-macros "^0.1.10" + babel-plugin-debug-macros "^0.3.3" broccoli-funnel "^2.0.2" broccoli-merge-trees "^3.0.0" - ember-cli-babel "^6.16.0" + ember-cli-babel "^7.13.2" ember-cli-version-checker "^3.1.3" - resolve "^1.12.0" + resolve "^1.14.0" ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.12: version "0.3.12" @@ -11350,6 +11330,13 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12. dependencies: path-parse "^1.0.6" +resolve@^1.14.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.1.tgz#9e018c540fcf0c427d678b9931cbf45e984bcaff" + integrity sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg== + dependencies: + path-parse "^1.0.6" + resolve@~1.1.0: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"