Update ember core (#1441)

Co-authored-by: Renovate Bot <renovatebot@gmail.com>
TryGhost · Jan 6, 2020 · 9c7d69e · 9c7d69e
1 parent d9f6434
commit 9c7d69e
Show file tree

Hide file tree

Showing 4 changed files with 300 additions and 103 deletions.
diff --git a/app/app.js b/app/app.js
@@ -1,7 +1,7 @@
 import 'ghost-admin/utils/link-component';
 import 'ghost-admin/utils/route';
 import Application from '@ember/application';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import config from './config/environment';
 import loadInitializers from 'ember-load-initializers';
 import {registerWarnHandler} from '@ember/debug';

diff --git a/app/resolver.js b/app/resolver.js
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "ember-ajax": "5.0.0",
     "ember-assign-helper": "0.2.0",
     "ember-auto-import": "1.5.3",
-    "ember-cli": "3.14.0",
+    "ember-cli": "3.15.1",
     "ember-cli-app-version": "3.2.0",
     "ember-cli-babel": "7.13.2",
     "ember-cli-chai": "0.5.0",
@@ -73,7 +73,7 @@
     "ember-cli-uglify": "3.0.0",
     "ember-composable-helpers": "3.0.3",
     "ember-concurrency": "1.1.3",
-    "ember-data": "3.14.1",
+    "ember-data": "3.15.0",
     "ember-drag-drop": "0.4.8",
     "ember-exam": "4.0.9",
     "ember-export-application-global": "2.0.1",