From 77e8f1166015b7d22a27e814b41b8562cf85d62e Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Thu, 19 Nov 2020 14:42:23 -0500
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20port=20error/message?=
 =?UTF-8?q?=20component=20to=20core=20addon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/addon/components/error/message/index.hbs |  0
 .../core/addon/components/error/message/index.js  |  0
 addons/core/app/components/error/message.js       |  1 +
 addons/core/package.json                          |  1 +
 .../tests/dummy/app/templates/application.hbs     |  2 +-
 addons/core/tests/dummy/config/ember-intl.js      |  4 ++--
 .../integration/components/error/message-test.js  |  0
 yarn.lock                                         | 15 +++++++++++----
 8 files changed, 16 insertions(+), 7 deletions(-)
 rename ui/admin/app/components/error/message.hbs => addons/core/addon/components/error/message/index.hbs (100%)
 rename ui/admin/app/components/error/message.js => addons/core/addon/components/error/message/index.js (100%)
 create mode 100644 addons/core/app/components/error/message.js
 rename {ui/admin => addons/core}/tests/integration/components/error/message-test.js (100%)

diff --git a/ui/admin/app/components/error/message.hbs b/addons/core/addon/components/error/message/index.hbs
similarity index 100%
rename from ui/admin/app/components/error/message.hbs
rename to addons/core/addon/components/error/message/index.hbs
diff --git a/ui/admin/app/components/error/message.js b/addons/core/addon/components/error/message/index.js
similarity index 100%
rename from ui/admin/app/components/error/message.js
rename to addons/core/addon/components/error/message/index.js
diff --git a/addons/core/app/components/error/message.js b/addons/core/app/components/error/message.js
new file mode 100644
index 000000000..055e64811
--- /dev/null
+++ b/addons/core/app/components/error/message.js
@@ -0,0 +1 @@
+export { default } from 'core/components/error/message';
\ No newline at end of file
diff --git a/addons/core/package.json b/addons/core/package.json
index f6961fa16..b6cc606c0 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -44,6 +44,7 @@
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-get-config": "^0.3.0",
+    "ember-inline-svg": "^1.0.0",
     "ember-intl": "^5.5.0",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
diff --git a/addons/core/tests/dummy/app/templates/application.hbs b/addons/core/tests/dummy/app/templates/application.hbs
index 5230580f8..9c8163e59 100644
--- a/addons/core/tests/dummy/app/templates/application.hbs
+++ b/addons/core/tests/dummy/app/templates/application.hbs
@@ -1,3 +1,3 @@
 <h2 id="title">Welcome to Ember</h2>
 
-{{outlet}}
\ No newline at end of file
+{{t "errors.401.title"}}
diff --git a/addons/core/tests/dummy/config/ember-intl.js b/addons/core/tests/dummy/config/ember-intl.js
index 2cb1c38c1..a5a3a93d5 100644
--- a/addons/core/tests/dummy/config/ember-intl.js
+++ b/addons/core/tests/dummy/config/ember-intl.js
@@ -25,7 +25,7 @@ module.exports = function (/* environment */) {
      * @type {String}
      * @default "'translations'"
      */
-    inputPath: "translations",
+    inputPath: "../../translations",
 
     /**
      * Prevents the translations from being bundled with the application code.
@@ -47,7 +47,7 @@ module.exports = function (/* environment */) {
      * @type {Boolean}
      * @default "false"
      */
-    wrapTranslationsWithNamespace: false,
+    wrapTranslationsWithNamespace: true,
 
     /**
      * Cause a build error if ICU argument mismatches are detected between translations
diff --git a/ui/admin/tests/integration/components/error/message-test.js b/addons/core/tests/integration/components/error/message-test.js
similarity index 100%
rename from ui/admin/tests/integration/components/error/message-test.js
rename to addons/core/tests/integration/components/error/message-test.js
diff --git a/yarn.lock b/yarn.lock
index da2d17406..f16a1bd39 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7489,10 +7489,10 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+debug@4:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
@@ -7503,6 +7503,13 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+  dependencies:
+    ms "2.1.2"
+
 debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"