From 0b6a2eda80583c4b1fba1ec2f9b0d5043cf5e1b7 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Mon, 3 Aug 2020 09:21:42 +0100
Subject: [PATCH] Updated core files to match ember-cli new output

---
 ghost/admin/app/app.js                |  2 +-
 ghost/admin/app/router.js             |  2 +-
 ghost/admin/ember-cli-update.json     | 18 ++++++++++++++++++
 ghost/admin/tests/helpers/resolver.js |  2 +-
 ghost/admin/tests/test-helper.js      |  4 ++--
 5 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 ghost/admin/ember-cli-update.json

diff --git a/ghost/admin/app/app.js b/ghost/admin/app/app.js
index b1377d6efe..f1e0bd609b 100755
--- a/ghost/admin/app/app.js
+++ b/ghost/admin/app/app.js
@@ -2,7 +2,7 @@ import 'ghost-admin/utils/link-component';
 import 'ghost-admin/utils/route';
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
-import config from './config/environment';
+import config from 'ghost-admin/config/environment';
 import loadInitializers from 'ember-load-initializers';
 import {registerWarnHandler} from '@ember/debug';
 
diff --git a/ghost/admin/app/router.js b/ghost/admin/app/router.js
index 4698992320..236fe0cb6a 100644
--- a/ghost/admin/app/router.js
+++ b/ghost/admin/app/router.js
@@ -1,5 +1,5 @@
 import EmberRouter from '@ember/routing/router';
-import config from './config/environment';
+import config from 'ghost-admin/config/environment';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
 const Router = EmberRouter.extend({
diff --git a/ghost/admin/ember-cli-update.json b/ghost/admin/ember-cli-update.json
new file mode 100644
index 0000000000..bbc5987165
--- /dev/null
+++ b/ghost/admin/ember-cli-update.json
@@ -0,0 +1,18 @@
+{
+    "schemaVersion": "1.0.0",
+    "packages": [
+        {
+            "name": "ember-cli",
+            "version": "3.20.0",
+            "blueprints": [
+                {
+                    "name": "app",
+                    "outputRepo": "https://github.com/ember-cli/ember-new-output",
+                    "codemodsSource": "ember-app-codemods-manifest@1",
+                    "isBaseBlueprint": true,
+                    "options": []
+                }
+            ]
+        }
+    ]
+}
diff --git a/ghost/admin/tests/helpers/resolver.js b/ghost/admin/tests/helpers/resolver.js
index 50e9179f54..236c98af6c 100644
--- a/ghost/admin/tests/helpers/resolver.js
+++ b/ghost/admin/tests/helpers/resolver.js
@@ -1,5 +1,5 @@
 import Resolver from '../../resolver';
-import config from '../../config/environment';
+import config from 'ghost-admin/config/environment';
 
 const resolver = Resolver.create();
 
diff --git a/ghost/admin/tests/test-helper.js b/ghost/admin/tests/test-helper.js
index 5ab168837f..756802bcd0 100644
--- a/ghost/admin/tests/test-helper.js
+++ b/ghost/admin/tests/test-helper.js
@@ -1,5 +1,5 @@
-import Application from '../app';
-import config from '../config/environment';
+import Application from 'ghost-admin/app';
+import config from 'ghost-admin/config/environment';
 import registerWaiter from 'ember-raf-scheduler/test-support/register-waiter';
 import start from 'ember-exam/test-support/start';
 import {setApplication} from '@ember/test-helpers';