From 220cf70e8478835096ab05f9c7bf82ca2b49d1e8 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Nov 2020 18:45:10 -0500 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=F0=9F=A4=96=20fresh=20yarn=20inst?= =?UTF-8?q?all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yarn.lock | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index da2d17406..333e8118d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7510,7 +7510,7 @@ debug@~4.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12157,7 +12157,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -13854,11 +13854,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -13867,16 +13862,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -13886,19 +13876,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14111,7 +14094,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= From 7141163475fb05e8c478aecac6ed93f4d819bcba Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 18 Nov 2020 19:18:34 -0500 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20move=20public=20?= =?UTF-8?q?assets=20to=20core=20addon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core}/public/app-icons/action-session.svg | 0 .../core}/public/app-icons/auth-method.svg | 0 .../core}/public/app-icons/gear.svg | 0 .../core}/public/app-icons/global.svg | 0 .../core}/public/app-icons/group.svg | 0 .../core}/public/app-icons/host-catalogs.svg | 0 .../core}/public/app-icons/org.svg | 0 .../core}/public/app-icons/project.svg | 0 .../core}/public/app-icons/roles.svg | 0 .../core}/public/app-icons/target.svg | 0 .../core}/public/app-icons/user-profile.svg | 0 .../core}/public/app-icons/users.svg | 0 {ui/admin => addons/core}/public/logo-app.svg | 0 .../core}/public/logo-company.svg | 0 ui/admin/ember-cli-build.js | 5 ++++ ui/admin/package.json | 2 +- ui/desktop/ember-cli-build.js | 5 ++++ yarn.lock | 27 +++++++++++++++---- 18 files changed, 33 insertions(+), 6 deletions(-) rename {ui/admin => addons/core}/public/app-icons/action-session.svg (100%) rename {ui/admin => addons/core}/public/app-icons/auth-method.svg (100%) rename {ui/admin => addons/core}/public/app-icons/gear.svg (100%) rename {ui/admin => addons/core}/public/app-icons/global.svg (100%) rename {ui/admin => addons/core}/public/app-icons/group.svg (100%) rename {ui/admin => addons/core}/public/app-icons/host-catalogs.svg (100%) rename {ui/admin => addons/core}/public/app-icons/org.svg (100%) rename {ui/admin => addons/core}/public/app-icons/project.svg (100%) rename {ui/admin => addons/core}/public/app-icons/roles.svg (100%) rename {ui/admin => addons/core}/public/app-icons/target.svg (100%) rename {ui/admin => addons/core}/public/app-icons/user-profile.svg (100%) rename {ui/admin => addons/core}/public/app-icons/users.svg (100%) rename {ui/admin => addons/core}/public/logo-app.svg (100%) rename {ui/admin => addons/core}/public/logo-company.svg (100%) diff --git a/ui/admin/public/app-icons/action-session.svg b/addons/core/public/app-icons/action-session.svg similarity index 100% rename from ui/admin/public/app-icons/action-session.svg rename to addons/core/public/app-icons/action-session.svg diff --git a/ui/admin/public/app-icons/auth-method.svg b/addons/core/public/app-icons/auth-method.svg similarity index 100% rename from ui/admin/public/app-icons/auth-method.svg rename to addons/core/public/app-icons/auth-method.svg diff --git a/ui/admin/public/app-icons/gear.svg b/addons/core/public/app-icons/gear.svg similarity index 100% rename from ui/admin/public/app-icons/gear.svg rename to addons/core/public/app-icons/gear.svg diff --git a/ui/admin/public/app-icons/global.svg b/addons/core/public/app-icons/global.svg similarity index 100% rename from ui/admin/public/app-icons/global.svg rename to addons/core/public/app-icons/global.svg diff --git a/ui/admin/public/app-icons/group.svg b/addons/core/public/app-icons/group.svg similarity index 100% rename from ui/admin/public/app-icons/group.svg rename to addons/core/public/app-icons/group.svg diff --git a/ui/admin/public/app-icons/host-catalogs.svg b/addons/core/public/app-icons/host-catalogs.svg similarity index 100% rename from ui/admin/public/app-icons/host-catalogs.svg rename to addons/core/public/app-icons/host-catalogs.svg diff --git a/ui/admin/public/app-icons/org.svg b/addons/core/public/app-icons/org.svg similarity index 100% rename from ui/admin/public/app-icons/org.svg rename to addons/core/public/app-icons/org.svg diff --git a/ui/admin/public/app-icons/project.svg b/addons/core/public/app-icons/project.svg similarity index 100% rename from ui/admin/public/app-icons/project.svg rename to addons/core/public/app-icons/project.svg diff --git a/ui/admin/public/app-icons/roles.svg b/addons/core/public/app-icons/roles.svg similarity index 100% rename from ui/admin/public/app-icons/roles.svg rename to addons/core/public/app-icons/roles.svg diff --git a/ui/admin/public/app-icons/target.svg b/addons/core/public/app-icons/target.svg similarity index 100% rename from ui/admin/public/app-icons/target.svg rename to addons/core/public/app-icons/target.svg diff --git a/ui/admin/public/app-icons/user-profile.svg b/addons/core/public/app-icons/user-profile.svg similarity index 100% rename from ui/admin/public/app-icons/user-profile.svg rename to addons/core/public/app-icons/user-profile.svg diff --git a/ui/admin/public/app-icons/users.svg b/addons/core/public/app-icons/users.svg similarity index 100% rename from ui/admin/public/app-icons/users.svg rename to addons/core/public/app-icons/users.svg diff --git a/ui/admin/public/logo-app.svg b/addons/core/public/logo-app.svg similarity index 100% rename from ui/admin/public/logo-app.svg rename to addons/core/public/logo-app.svg diff --git a/ui/admin/public/logo-company.svg b/addons/core/public/logo-company.svg similarity index 100% rename from ui/admin/public/logo-company.svg rename to addons/core/public/logo-company.svg diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js index 8d6513cf5..c089df924 100644 --- a/ui/admin/ember-cli-build.js +++ b/ui/admin/ember-cli-build.js @@ -18,6 +18,11 @@ module.exports = function (defaults) { emberNotify: { importCss: false, }, + svg: { + paths: [ + '../../addons/core/public' + ] + } }); // Only import when in development or test mode diff --git a/ui/admin/package.json b/ui/admin/package.json index eb3340116..5879140d7 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -35,11 +35,11 @@ "@glimmer/tracking": "^1.0.0", "api": "*", "auth": "*", - "core": "*", "babel-eslint": "^10.1.0", "babel-loader": "^8.1.0", "broccoli-asset-rev": "^3.0.0", "clipboard": "^2.0.6", + "core": "*", "doctoc": "^1.4.0", "ember-a11y-testing": "^3.0.0", "ember-auto-import": "^1.6.0", diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js index cc31a1b6c..b3af84373 100644 --- a/ui/desktop/ember-cli-build.js +++ b/ui/desktop/ember-cli-build.js @@ -18,6 +18,11 @@ module.exports = function (defaults) { emberNotify: { importCss: false, }, + svg: { + paths: [ + '../../addons/core/public' + ] + } }); // Use `app.import` to add additional libraries to the generated diff --git a/yarn.lock b/yarn.lock index 333e8118d..da2d17406 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7510,7 +7510,7 @@ debug@~4.1.0: dependencies: ms "^2.1.1" -debuglog@^1.0.1: +debuglog@*, debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12157,7 +12157,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= -imurmurhash@^0.1.4: +imurmurhash@*, imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -13854,6 +13854,11 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash._baseindexof@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" + integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= + lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -13862,11 +13867,16 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@^3.0.0: +lodash._bindcallback@*, lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= +lodash._cacheindexof@*: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" + integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= + lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -13876,12 +13886,19 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" +lodash._createcache@*: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" + integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= + dependencies: + lodash._getnative "^3.0.0" + lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@^3.0.0: +lodash._getnative@*, lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14094,7 +14111,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@^3.0.0: +lodash.restparam@*, lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=