diff --git a/.editorconfig b/.editorconfig
index 47c543840..5506714b0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,6 @@
 
 root = true
 
-
 [*]
 end_of_line = lf
 charset = utf-8
diff --git a/.eslintrc.js b/.eslintrc.js
index c66dbe576..7cee5b48a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const propertyOrder = [
   'service',
   'controller',
@@ -31,7 +33,8 @@ module.exports = {
   parserOptions: {
     ecmaVersion:                 2018,
     sourceType:                  'module',
-    allowImportExportEverywhere: true
+    allowImportExportEverywhere: true,
+    ecmaFeatures:                { legacyDecorators: true }
   },
   extends: [
     'eslint:recommended',
@@ -57,57 +60,64 @@ module.exports = {
   },
   rules: {
     // Overrides
-    'curly':                                      'error',
-    'dot-notation':                               'off',
-    'ember/alias-model-in-controller':            'off',
-    'ember/avoid-leaking-state-in-ember-objects': 'off',
-    'ember/closure-actions':                      'off',
-    'ember/jquery-ember-run':                     'off',
-    'ember/named-functions-in-promises':          'off',
-    'ember/no-capital-letters-in-routes':         'off',
-    'ember/no-function-prototype-extensions':     'off',
-    'ember/no-observers':                         'off',
-    'ember/no-on-calls-in-components':            'off',
-    'ember/no-side-effects':                      'off',
-    'ember/no-old-shims':                         'error',
-    'ember/order-in-components':                  ['error', { order: propertyOrder }],
-    'ember/order-in-controllers':                 ['error', { order: propertyOrder }],
-    'ember/order-in-models':                      ['error', { order: propertyOrder }],
-    'ember/order-in-routes':                      ['error', { order: propertyOrder }],
-    'ember/use-brace-expansion':                  'off',
-    'ember/use-ember-get-and-set':                'off',
-    'ember/new-module-imports':                   'error',
-    'eqeqeq':                                     'error',
-    'generator-star-spacing':                     'off',
-    'guard-for-in':                               'off',
-    'linebreak-style':                            'off',
-    'new-cap':                                    'off',
-    'no-caller':                                  'error',
-    'no-cond-assign':                             ['error', 'except-parens'],
-    'no-console':                                 'off',
-    'no-debugger':                                'warn',
-    'no-empty':                                   'off',
-    'no-eq-null':                                 'error',
-    'no-eval':                                    'error',
-    'no-extra-boolean-cast':                      'off',
-    'no-new':                                     'off',
-    'no-plusplus':                                'off',
-    'no-undef':                                   'error',
-    'no-unused-vars':                             'warn',
-    'no-useless-escape':                          'off',
-    'no-self-assign':                             'off',
-    'strict':                                     'off',
-    'wrap-iife':                                  'off',
+    'curly':                                       'error',
+    'dot-notation':                                'off',
+    'ember/alias-model-in-controller':             'off',
+    'ember/avoid-leaking-state-in-ember-objects':  'off',
+    'ember/closure-actions':                       'off',
+    'ember/jquery-ember-run':                      'off',
+    'ember/named-functions-in-promises':           'off',
+    'ember/no-capital-letters-in-routes':          'off',
+    'ember/no-function-prototype-extensions':      'off',
+    'ember/no-observers':                          'off',
+    'ember/no-on-calls-in-components':             'off',
+    'ember/no-side-effects':                       'off',
+    'ember/no-old-shims':                          'error',
+    'ember/order-in-components':                   ['error', { order: propertyOrder }],
+    'ember/order-in-controllers':                  ['error', { order: propertyOrder }],
+    'ember/order-in-models':                       ['error', { order: propertyOrder }],
+    'ember/order-in-routes':                       ['error', { order: propertyOrder }],
+    'ember/use-brace-expansion':                   'off',
+    'ember/use-ember-get-and-set':                 'off',
+    'ember/new-module-imports':                    'error',
+    // >3.12
+    'ember/no-new-mixins':                         'off', // https://discuss.emberjs.com/t/best-way-to-replace-mixins/17395/2
+    'ember/no-arrow-function-computed-properties': ['error', { onlyThisContexts: true }],
+    'ember/no-get':                                'off',
+    'ember/no-jquery':                             'off',
+    'ember/no-mixins':                             'off',
+    'no-prototype-builtins':                       'off',
+    'eqeqeq':                                      'error',
+    'generator-star-spacing':                      'off',
+    'guard-for-in':                                'off',
+    'linebreak-style':                             'off',
+    'new-cap':                                     'off',
+    'no-caller':                                   'error',
+    'no-cond-assign':                              ['error', 'except-parens'],
+    'no-console':                                  'off',
+    'no-debugger':                                 'warn',
+    'no-empty':                                    'off',
+    'no-eq-null':                                  'error',
+    'no-eval':                                     'error',
+    'no-extra-boolean-cast':                       'off',
+    'no-new':                                      'off',
+    'no-plusplus':                                 'off',
+    'no-undef':                                    'error',
+    'no-unused-vars':                              'warn',
+    'no-useless-escape':                           'off',
+    'no-self-assign':                              'off',
+    'strict':                                      'off',
+    'wrap-iife':                                   'off',
     // stylistic
-    'array-bracket-spacing':                      'error',
-    'padded-blocks':                              ['error', 'never'],
-    'block-spacing':                              ['error', 'always'],
-    'brace-style':                                ['error', '1tbs'],
-    'comma-spacing':                              'error',
-    'func-call-spacing':                          ['error', 'never'],
-    'implicit-arrow-linebreak':                   'error',
-    'indent':                                     ['error', 2],
-    'key-spacing':                                ['error', {
+    'array-bracket-spacing':                       'error',
+    'padded-blocks':                               ['error', 'never'],
+    'block-spacing':                               ['error', 'always'],
+    'brace-style':                                 ['error', '1tbs'],
+    'comma-spacing':                               'error',
+    'func-call-spacing':                           ['error', 'never'],
+    'implicit-arrow-linebreak':                    'error',
+    'indent':                                      ['error', 2],
+    'key-spacing':                                 ['error', {
       'align': {
         'beforeColon': false,
         'afterColon':  true,
diff --git a/.template-lintrc.js b/.template-lintrc.js
index a6a27add3..cd22203cf 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -1,15 +1,16 @@
 'use strict';
 
 module.exports = {
-  extends: 'recommended',
+  extends: 'recommended', // octane???
 
   rules: {
     'attribute-indentation':      false,
     'block-indentation':          false,
     'deprecated-render-helper':   false,
-    'img-alt-attributes':         false,
+    'require-valid-alt-text':     false,
     'linebreak-style':            false,
     'link-rel-noopener':          false,
+    'link-href-attributes':       false,
     'no-attrs-in-components':     false,
     'no-bare-strings':            false,
     'no-debugger':                false,
@@ -19,6 +20,8 @@ module.exports = {
     'no-input-block':             false,
     'no-input-tagname':           false,
     'no-invalid-interactive':     false,
+    'no-invalid-role':            false,
+    'no-positive-tabindex':       false,
     'no-log':                     false,
     'no-nested-interactive':      false,
     'no-outlet-outside-routes':   false,
diff --git a/app/app.js b/app/app.js
index 9d432f70e..f49a02171 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,13 +1,16 @@
 import Application from '@ember/application';
-import Resolver from './resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const App = Application.extend({
-  modulePrefix:    config.modulePrefix,
-  podModulePrefix: config.podModulePrefix,
-  Resolver,
-  engines:         {
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+
+  podModulePrefix = config.podModulePrefix;
+
+  Resolver = Resolver;
+
+  engines = {
     login: {
       dependencies: {
         services: [
@@ -232,9 +235,7 @@ const App = Application.extend({
         externalRoutes: { 'authenticated.cluster.istio.cluster-setting': 'authenticated.cluster.istio.cluster-setting', }
       }
     },
-  }
-});
+  };
+}
 
 loadInitializers(App, config.modulePrefix);
-
-export default App;
diff --git a/app/application/controller.js b/app/application/controller.js
index 08db89feb..114cf782a 100644
--- a/app/application/controller.js
+++ b/app/application/controller.js
@@ -12,7 +12,7 @@ export default Controller.extend({
   router:            service(),
 
   // GitHub auth params
-  queryParams:       ['isPopup', 'fromAuthProvider'],
+  queryParams: ['isPopup', 'fromAuthProvider'],
 
   error:             null,
   error_description: null,
diff --git a/app/apps-tab/index/controller.js b/app/apps-tab/index/controller.js
index 8ad3ee7f5..a3e78cdb7 100644
--- a/app/apps-tab/index/controller.js
+++ b/app/apps-tab/index/controller.js
@@ -16,7 +16,7 @@ export default Controller.extend({
 
   tags:              alias('projectController.tags'),
   templatesObsvr: observer('model.apps.[]', function() {
-    once(() => this.get('catalog').fetchAppTemplates(get(this, 'model.apps')));
+    once(this, 'fetchCatalogResources');
   }),
 
   filteredApps: computed('model.apps.@each.{type,isFromCatalog,tags,state}', 'tags', 'searchText', function() {
@@ -47,4 +47,9 @@ export default Controller.extend({
 
     return group;
   }),
+
+  fetchCatalogResources() {
+    this.catalog.fetchAppTemplates(get(this, 'model.apps'));
+  },
+
 });
diff --git a/app/authenticated/apikeys/template.hbs b/app/authenticated/apikeys/template.hbs
index 6c4d88650..99fa3f487 100644
--- a/app/authenticated/apikeys/template.hbs
+++ b/app/authenticated/apikeys/template.hbs
@@ -1,6 +1,6 @@
 <section class="header clearfix">
   <div class="right-buttons">
-    <button class="btn btn-sm bg-primary" {{action "newApikey" "account"}}>{{t 'apiPage.actionButton'}}</button>
+    <button class="btn btn-sm bg-primary" type="button" {{action "newApikey" "account"}}>{{t 'apiPage.actionButton'}}</button>
   </div>
 
   <h1>{{t 'apiPage.header'}}</h1>
diff --git a/app/authenticated/cluster/backups/template.hbs b/app/authenticated/cluster/backups/template.hbs
index f07dfff54..9252275dc 100644
--- a/app/authenticated/cluster/backups/template.hbs
+++ b/app/authenticated/cluster/backups/template.hbs
@@ -41,7 +41,7 @@
         {{error-sub-row fullColspan=sortable.fullColspan model=backup}}
       {{/if}}
     {{else if (eq kind "right-actions")}}
-      <button style="margin-left: -5px;" class="btn btn-sm bg-primary pl-40 pr-40" {{action "snapshotNow"}}>
+      <button style="margin-left: -5px;" class="btn btn-sm bg-primary pl-40 pr-40" type="button" {{action "snapshotNow"}}>
         {{t 'action.backupEtcd'}}
       </button>
     {{else if (eq kind "norows")}}
diff --git a/app/authenticated/cluster/cis/scan/controller.js b/app/authenticated/cluster/cis/scan/controller.js
index 07825b9f7..5fdf98abe 100644
--- a/app/authenticated/cluster/cis/scan/controller.js
+++ b/app/authenticated/cluster/cis/scan/controller.js
@@ -94,7 +94,7 @@ export default Controller.extend({
       }
     };
   }),
-  clusterScans: computed('model.clusterScans.@each', function() {
+  clusterScans: computed('model.clusterScans.[]', 'scope.currentCluster.id', function() {
     return get(this, 'model.clusterScans').filterBy('clusterId', get(this, 'scope.currentCluster.id'));
   }),
 });
diff --git a/app/authenticated/cluster/cis/scan/detail/controller.js b/app/authenticated/cluster/cis/scan/detail/controller.js
index 3b1bd58ae..014953e43 100644
--- a/app/authenticated/cluster/cis/scan/detail/controller.js
+++ b/app/authenticated/cluster/cis/scan/detail/controller.js
@@ -57,7 +57,7 @@ export default Controller.extend({
     }
   },
 
-  tests: computed('model.scan.report', 'securityScanConfig.skipList', function() {
+  tests: computed('model.nodes', 'model.scan.report.results', 'securityScanConfig.skipList', function() {
     const results = get(this, 'model.scan.report.results');
 
     if (!results) {
@@ -100,7 +100,7 @@ export default Controller.extend({
 
 
 
-  clusterScans: computed('model.clusterScans.@each', function() {
+  clusterScans: computed('model.clusterScans.[]', 'scope.currentCluster.id', function() {
     return get(this, 'model.clusterScans').filterBy('clusterId', get(this, 'scope.currentCluster.id'));
   }),
 
diff --git a/app/authenticated/cluster/cis/scan/detail/template.hbs b/app/authenticated/cluster/cis/scan/detail/template.hbs
index ea7ae32aa..5171b3fa5 100644
--- a/app/authenticated/cluster/cis/scan/detail/template.hbs
+++ b/app/authenticated/cluster/cis/scan/detail/template.hbs
@@ -27,12 +27,12 @@
           />
           {{#if searchText}}
             <span class="input-group-btn">
-              <button class="btn bg-transparent text-info pl-10 pr-10" {{action "clearSearchText"}}><i class="icon icon-close"></i></button>
+              <button class="btn bg-transparent text-info pl-10 pr-10" type="button" {{action "clearSearchText"}}><i class="icon icon-close"></i></button>
             </span>
           {{/if}}
         </div>
       </div>  
-      <button class="btn btn-sm bg-primary pl-40 pr-40 ml-20" {{action "runScan"}} disabled={{scope.currentCluster.isClusterScanDisabled}}>
+      <button class="btn btn-sm bg-primary pl-40 pr-40 ml-20" disabled={{scope.currentCluster.isClusterScanDisabled}} type="button" {{action "runScan"}}>
         {{t 'cis.scan.actions.runScan'}}
       </button>      
   </div>
diff --git a/app/authenticated/cluster/cis/scan/template.hbs b/app/authenticated/cluster/cis/scan/template.hbs
index f76bad106..81996ce53 100644
--- a/app/authenticated/cluster/cis/scan/template.hbs
+++ b/app/authenticated/cluster/cis/scan/template.hbs
@@ -29,13 +29,13 @@
           <td colspan="{{sortable.fullColspan}}" class="text-center text-muted pt-20 pb-20">{{t 'cis.scan.table.empty'}}</td>
         </tr>
       {{else if (eq kind "right-actions")}}
-        <button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" {{action "setSchedule"}} disabled={{scope.currentCluster.isAddClusterScanScheduleDisabled}}>
+        <button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" disabled={{scope.currentCluster.isAddClusterScanScheduleDisabled}} type="button" {{action "setSchedule"}}>
           {{t 'cis.scan.actions.addSchedule'}}
         </button>
-        <button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" {{action "setAlert"}} disabled={{scope.currentCluster.isClusterScanDown}}>
+        <button style="margin-left: -5px;" class="btn btn-sm bg-secondary pl-40 pr-40 mr-5" disabled={{scope.currentCluster.isClusterScanDown}} type="button" {{action "setAlert"}}>
           {{t 'cis.scan.actions.addAlert'}}
         </button>
-        <button style="margin-left: -5px;" class="btn btn-sm bg-primary pl-40 pr-40" {{action "runScan"}} disabled={{scope.currentCluster.isClusterScanDisabled}}>
+        <button style="margin-left: -5px;" class="btn btn-sm bg-primary pl-40 pr-40" disabled={{scope.currentCluster.isClusterScanDisabled}} type="button" {{action "runScan"}}>
           {{t 'cis.scan.actions.runScan'}}
         </button>
       {{/if}}
diff --git a/app/authenticated/cluster/cluster-catalogs/controller.js b/app/authenticated/cluster/cluster-catalogs/controller.js
index c90d829bd..91bbc3b0b 100644
--- a/app/authenticated/cluster/cluster-catalogs/controller.js
+++ b/app/authenticated/cluster/cluster-catalogs/controller.js
@@ -25,7 +25,7 @@ export default Controller.extend({
     },
   },
 
-  clusterCatalogs: computed('model.clusterCatalogs.@each.{clusterId,state,id}', function() {
+  clusterCatalogs: computed('model.clusterCatalogs.@each.{clusterId,id,state}', 'scope.currentCluster.id', function() {
     return get(this, 'model.clusterCatalogs').filterBy('clusterId', get(this, 'scope.currentCluster.id'));
   }),
 
diff --git a/app/authenticated/cluster/cluster-catalogs/template.hbs b/app/authenticated/cluster/cluster-catalogs/template.hbs
index f287c33b7..29593d069 100644
--- a/app/authenticated/cluster/cluster-catalogs/template.hbs
+++ b/app/authenticated/cluster/cluster-catalogs/template.hbs
@@ -1,6 +1,6 @@
 <section class="header clearfix">
   <div class="right-buttons">
-    <button class="btn bg-primary btn-sm" {{action "add"}}>
+    <button class="btn bg-primary btn-sm" type="button" {{action "add"}}>
       {{t 'catalogSettings.more.addActionLabel'}}
     </button>
   </div>
diff --git a/app/authenticated/cluster/edit/route.js b/app/authenticated/cluster/edit/route.js
index e4fe2b382..144875391 100644
--- a/app/authenticated/cluster/edit/route.js
+++ b/app/authenticated/cluster/edit/route.js
@@ -148,9 +148,7 @@ export default Route.extend({
   activate() {
     this._super(...arguments);
 
-    scheduleOnce('afterRender', this, function() {
-      set(this, 'controller.model.activated', true);
-    });
+    scheduleOnce('afterRender', this, 'activateModel');
   },
 
   actions: {
@@ -163,4 +161,8 @@ export default Route.extend({
     provider:                { refreshModel: true },
     clusterTemplateRevision: { refreshModel: true }
   },
+
+  activateModel() {
+    set(this, 'controller.model.activated', true);
+  },
 });
diff --git a/app/authenticated/cluster/nodes/index/controller.js b/app/authenticated/cluster/nodes/index/controller.js
index 002a2dbb9..90068ea07 100644
--- a/app/authenticated/cluster/nodes/index/controller.js
+++ b/app/authenticated/cluster/nodes/index/controller.js
@@ -41,7 +41,7 @@ export default Controller.extend({
     return null;
   }),
 
-  rows: computed('model.nodes.@each.clusterId', function() {
+  rows: computed('model.cluster.id', 'model.nodes.@each.clusterId', function() {
     return get(this, 'model.nodes').filterBy('clusterId', get(this, 'model.cluster.id'));
   }),
 });
diff --git a/app/authenticated/cluster/nodes/index/template.hbs b/app/authenticated/cluster/nodes/index/template.hbs
index cf05c7125..cf916c9cb 100644
--- a/app/authenticated/cluster/nodes/index/template.hbs
+++ b/app/authenticated/cluster/nodes/index/template.hbs
@@ -1,7 +1,7 @@
 <section class="header clearfix">
   <h1 class="pull-left">{{t "nodesPage.header"}}</h1>
   <div class="right-buttons">
-    <button class="btn bg-primary btn-sm ml-10" {{action "editCluster"}}>
+    <button class="btn bg-primary btn-sm ml-10" type="button" {{action "editCluster"}}>
       <span>{{t "nodesPage.editCluster"}}</span>
     </button>
   </div>
@@ -47,13 +47,11 @@
           {{#if capabilities.nodePoolsCanScale}}
             <p class="m-0">
               <button
-                class="btn btn-xs bg-primary"
-                {{action "scaleDownPool" node.ref.id}}
-                disabled={{lte node.ref.quantity 1}}
+                class="btn btn-xs bg-primary" disabled={{lte node.ref.quantity 1}} type="button" {{action "scaleDownPool" node.ref.id}}
               >
                 <i class="icon icon-minus icon-fw"/>
               </button>
-              <button style="margin-left: -5px;" class="btn btn-xs bg-primary" {{action "scaleUpPool" node.ref.id}}>
+              <button style="margin-left: -5px;" class="btn btn-xs bg-primary" type="button" {{action "scaleUpPool" node.ref.id}}>
                 <i class="icon icon-plus icon-fw"/>
               </button>
             </p>
diff --git a/app/authenticated/cluster/notifier/index/template.hbs b/app/authenticated/cluster/notifier/index/template.hbs
index a328af1a4..7a707753e 100644
--- a/app/authenticated/cluster/notifier/index/template.hbs
+++ b/app/authenticated/cluster/notifier/index/template.hbs
@@ -7,7 +7,7 @@
 <section class="header clearfix">
   <div class="pull-left pt-10"><h1>{{t 'notifierPage.notifiers'}}</h1></div>
   <div class="right-buttons">
-    <button class="btn btn-sm bg-primary" {{action "showNewEditModal"}}>{{t 'notifierPage.index.addActionLabel'}}</button>
+    <button class="btn btn-sm bg-primary" type="button" {{action "showNewEditModal"}}>{{t 'notifierPage.index.addActionLabel'}}</button>
   </div>
 </section>
 
diff --git a/app/authenticated/cluster/projects/index/route.js b/app/authenticated/cluster/projects/index/route.js
index 6e8ee18f6..0e395e699 100644
--- a/app/authenticated/cluster/projects/index/route.js
+++ b/app/authenticated/cluster/projects/index/route.js
@@ -11,7 +11,7 @@ export default Route.extend({
   clusterStore:  service(),
   scope:        service(),
 
-  shortcuts:       { 'g': 'toggleGrouping', },
+  shortcuts: { 'g': 'toggleGrouping', },
   model() {
     let cluster = this.modelFor('authenticated.cluster');
 
diff --git a/app/authenticated/cluster/projects/new-ns/controller.js b/app/authenticated/cluster/projects/new-ns/controller.js
index 729ceadfa..691e72c9a 100644
--- a/app/authenticated/cluster/projects/new-ns/controller.js
+++ b/app/authenticated/cluster/projects/new-ns/controller.js
@@ -71,28 +71,28 @@ export default Controller.extend(NewOrEdit, {
     return get(this, 'model.allProjects').filterBy('clusterId', get(this, 'scope.currentCluster.id'))
   }),
 
-  projectLimit: computed('primaryResource.resourceQuota.{limit}', 'primaryResource.projectId', function() {
+  projectLimit: computed('allProjects', 'primaryResource.projectId', 'primaryResource.resourceQuota.limit', function() {
     const projectId = get(this, 'primaryResource.projectId');
     const project   = get(this, 'allProjects').findBy('id', projectId);
 
     return get(project, 'resourceQuota.limit');
   }),
 
-  projectUsedLimit: computed('primaryResource.resourceQuota.{limit}', 'primaryResource.projectId', function() {
+  projectUsedLimit: computed('allProjects', 'primaryResource.projectId', 'primaryResource.resourceQuota.limit', function() {
     const projectId = get(this, 'primaryResource.projectId');
     const project   = get(this, 'allProjects').findBy('id', projectId);
 
     return get(project, 'resourceQuota.usedLimit');
   }),
 
-  nsDefaultQuota: computed('primaryResource.resourceQuota.{limit}', 'primaryResource.projectId', function() {
+  nsDefaultQuota: computed('allProjects', 'primaryResource.projectId', 'primaryResource.resourceQuota.limit', function() {
     const projectId = get(this, 'primaryResource.projectId');
     const project   = get(this, 'allProjects').findBy('id', projectId);
 
     return get(project, 'namespaceDefaultResourceQuota.limit');
   }),
 
-  nameExists: computed('primaryResource.name', 'model.namespaces.@each.name', function() {
+  nameExists: computed('model.namespaces.@each.name', 'primaryResource.{id,name}', function() {
     const name = get(this, 'primaryResource.name');
 
     if ( name ) {
diff --git a/app/authenticated/cluster/storage/classes/index/template.hbs b/app/authenticated/cluster/storage/classes/index/template.hbs
index 97a5d67b9..5a9917e65 100644
--- a/app/authenticated/cluster/storage/classes/index/template.hbs
+++ b/app/authenticated/cluster/storage/classes/index/template.hbs
@@ -1,9 +1,8 @@
 <section class="header clearfix">
   <div class="right-buttons">
     <button
-      {{action "importYaml"}}
       class="btn btn-sm bg-default mr-10"
-      disabled={{rbac-prevents resource="storageclass" scope="cluster" permission="create"}}
+      disabled={{rbac-prevents resource="storageclass" scope="cluster" permission="create"}} type="button" {{action "importYaml"}}
     >
       {{t "nav.containers.importCompose"}}
     </button>
diff --git a/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs b/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs
index a0c1dff23..dee293baf 100644
--- a/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs
+++ b/app/authenticated/cluster/storage/persistent-volumes/index/template.hbs
@@ -1,9 +1,8 @@
 <section class="header clearfix">
   <div class="right-buttons">
     <button
-      {{action "importYaml"}}
       class="btn btn-sm bg-default mr-10"
-      disabled={{rbac-prevents resource="persistentvolume" scope="cluster" permission="create"}}
+      disabled={{rbac-prevents resource="persistentvolume" scope="cluster" permission="create"}} type="button" {{action "importYaml"}}
     >
       {{t "nav.containers.importCompose"}}
     </button>
diff --git a/app/authenticated/controller.js b/app/authenticated/controller.js
index 356fe3e22..72a2fcf58 100644
--- a/app/authenticated/controller.js
+++ b/app/authenticated/controller.js
@@ -16,6 +16,8 @@ export default Controller.extend({
   isPopup:     alias('application.isPopup'),
   pageScope:   alias('scope.currentPageScope'),
 
+  hasHosts: computed.gt('model.hosts.length', 0),
+
   bootstrap: on('init', function() {
     schedule('afterRender', this, () => {
       this.get('application').setProperties({
@@ -32,8 +34,4 @@ export default Controller.extend({
     });
   }),
 
-  hasHosts: computed('model.hosts.length', function() {
-    return (this.get('model.hosts.length') > 0);
-  }),
-
 });
diff --git a/app/authenticated/prefs/controller.js b/app/authenticated/prefs/controller.js
index 8f3d9fcae..cf3969447 100644
--- a/app/authenticated/prefs/controller.js
+++ b/app/authenticated/prefs/controller.js
@@ -3,7 +3,7 @@ import { get } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Controller.extend({
-  modal:       service(),
+  modal: service(),
 
   newPassword: null,
 
diff --git a/app/authenticated/prefs/template.hbs b/app/authenticated/prefs/template.hbs
index e5246e2ca..b595d9b32 100644
--- a/app/authenticated/prefs/template.hbs
+++ b/app/authenticated/prefs/template.hbs
@@ -40,7 +40,7 @@
       </div>
       <div class="row mt-20">
         <div class="col span-12 text-center">
-          <button class="btn bg-primary" {{action "editPassword"}}>
+          <button class="btn bg-primary" type="button" {{action "editPassword"}}>
             {{t "userPreferencesPage.generalInfo.password.text"}}
           </button>
         </div>
diff --git a/app/authenticated/project/config-maps/index/controller.js b/app/authenticated/project/config-maps/index/controller.js
index 509357ad9..8df31b7b5 100644
--- a/app/authenticated/project/config-maps/index/controller.js
+++ b/app/authenticated/project/config-maps/index/controller.js
@@ -51,7 +51,7 @@ export default Controller.extend({
   group:        alias('projectController.group'),
   groupTableBy: alias('projectController.groupTableBy'),
 
-  rows: computed('model.configMaps.[].type', function() {
+  rows: computed('model.configMaps.@each.type', function() {
     return get(this, 'model.configMaps').filterBy('type', 'configMap');
   }),
 });
diff --git a/app/authenticated/project/config-maps/index/template.hbs b/app/authenticated/project/config-maps/index/template.hbs
index c7df56092..66eb45b5d 100644
--- a/app/authenticated/project/config-maps/index/template.hbs
+++ b/app/authenticated/project/config-maps/index/template.hbs
@@ -10,7 +10,7 @@
       {{/tooltip-element}}
     </div>
 
-    <button {{action 'importYaml'}} class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="configmap" scope="project" permission="create"}}>{{t 'nav.containers.importCompose'}}</button>
+    <button class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="configmap" scope="project" permission="create"}} type="button" {{action 'importYaml'}}>{{t 'nav.containers.importCompose'}}</button>
 
     {{#link-to "authenticated.project.config-maps.new" classNames="btn btn-sm bg-primary" disabled=(rbac-prevents resource=resource scope="project" permission="create")}}{{t 'configMapsPage.index.linkTo'}}{{/link-to}}
   </div>
diff --git a/app/authenticated/project/console/route.js b/app/authenticated/project/console/route.js
index 35475339c..13b7aed7e 100644
--- a/app/authenticated/project/console/route.js
+++ b/app/authenticated/project/console/route.js
@@ -29,7 +29,7 @@ export default Route.extend({
     set(controller, 'containerName', model.containerName);
 
     if (controller.get('kubernetes')) {
-      defineProperty(controller, 'command', computed('model.pod.labels', function() {
+      defineProperty(controller, 'command', computed('cookies', 'model.pod.labels', function() {
         var labels = get(this, 'model.pod.labels') || {};
 
         if ( `${ labels[C.LABEL.K8S_TOKEN] }` === 'true' ) {
diff --git a/app/authenticated/project/controller.js b/app/authenticated/project/controller.js
index 265a9ddb8..50789f35b 100644
--- a/app/authenticated/project/controller.js
+++ b/app/authenticated/project/controller.js
@@ -20,7 +20,7 @@ export default Controller.extend({
   nodes:             null,
   expandedInstances: null,
 
-  namespaces:         alias('scope.currentProject.namespaces'),
+  namespaces: alias('scope.currentProject.namespaces'),
   init() {
     this._super(...arguments);
     this.set('nodes', this.get('store').all('node'));
diff --git a/app/authenticated/project/dns/index/controller.js b/app/authenticated/project/dns/index/controller.js
index 4bbbd4adb..3361cbde8 100644
--- a/app/authenticated/project/dns/index/controller.js
+++ b/app/authenticated/project/dns/index/controller.js
@@ -3,7 +3,7 @@ import { inject as service } from '@ember/service';
 import Controller, { inject as controller } from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
   projectController: controller('authenticated.project'),
   queryParams:       ['sortBy'],
diff --git a/app/authenticated/project/dns/index/template.hbs b/app/authenticated/project/dns/index/template.hbs
index 03c86b29c..593f04ecb 100644
--- a/app/authenticated/project/dns/index/template.hbs
+++ b/app/authenticated/project/dns/index/template.hbs
@@ -1,5 +1,5 @@
 {{#containers-header showGroup=false}}
-  <button {{action 'importYaml'}} class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="service" scope="project" permission="create"}}>{{t 'nav.containers.importCompose'}}</button>
+  <button class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="service" scope="project" permission="create"}} type="button" {{action 'importYaml'}}>{{t 'nav.containers.importCompose'}}</button>
   {{#link-to "authenticated.project.dns.new" scope.currentProject.id class="btn btn-sm bg-primary" disabled=(rbac-prevents resource="service" scope="project" permission="create")}}{{t 'nav.containers.addDns'}}{{/link-to}}
 {{/containers-header}}
 
diff --git a/app/authenticated/project/help/controller.js b/app/authenticated/project/help/controller.js
index f63cf6d28..69e22aad4 100644
--- a/app/authenticated/project/help/controller.js
+++ b/app/authenticated/project/help/controller.js
@@ -24,17 +24,25 @@ export default Controller.extend({
     }
   }),
 
-  latestAnnouncement: computed('model.announcements', function() {
+  latestAnnouncement: computed('forumsLink', 'model.announcements.topics', function() {
+    let out = {
+      title:   '',
+      link:    '',
+      created: '',
+    };
+
     if (this.get('model.announcements.topics')) {
       let sorted = this.get('model.announcements.topics').sortBy('id');
       var announcement = sorted[sorted.length - 1];
 
-      return {
+      out = {
         title:   announcement.title,
         link:    `${ this.get('forumsLink') }/t/${ announcement.slug }`,
         created: announcement.created_at
       };
     }
+
+    return out;
   }),
 
   forumsLink:  C.EXT_REFERENCES.FORUM,
diff --git a/app/authenticated/project/help/template.hbs b/app/authenticated/project/help/template.hbs
index c316f28e8..a8e3502b4 100644
--- a/app/authenticated/project/help/template.hbs
+++ b/app/authenticated/project/help/template.hbs
@@ -29,7 +29,7 @@
         <h3>{{t 'helpPage.host.header'}}</h3>
         <hr/>
         <p>{{t 'helpPage.host.content' appName=settings.appName minVersion=settings.minDockerVersion}} <a href="{{docsLink}}/hosts/" target="_blank">{{t 'helpPage.host.contentLink'}}</a></p>
-        {{#link-to "authenticated.host-templates" class="btn bg-primary"}}{{t 'helpPage.host.addHostLink'}}{{/link-to}}
+        {{!-- {{#link-to "authenticated.host-templates" class="btn bg-primary"}}{{t 'helpPage.host.addHostLink'}}{{/link-to}} --}}
     </div>
 
     <div class="col span-4">
diff --git a/app/authenticated/project/hpa/detail/edit/route.js b/app/authenticated/project/hpa/detail/edit/route.js
index 1e618de9f..6ba9c6e4a 100644
--- a/app/authenticated/project/hpa/detail/edit/route.js
+++ b/app/authenticated/project/hpa/detail/edit/route.js
@@ -4,7 +4,7 @@ import { hash } from 'rsvp';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  clusterStore:  service(),
+  clusterStore: service(),
 
   model() {
     const store = get(this, 'store');
diff --git a/app/authenticated/project/hpa/index/controller.js b/app/authenticated/project/hpa/index/controller.js
index f3d611556..e08070683 100644
--- a/app/authenticated/project/hpa/index/controller.js
+++ b/app/authenticated/project/hpa/index/controller.js
@@ -3,9 +3,9 @@ import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
-  sortBy:            'name',
+  sortBy: 'name',
 
   headers: [
     {
diff --git a/app/authenticated/project/hpa/index/template.hbs b/app/authenticated/project/hpa/index/template.hbs
index 08aa7a89f..2f675f356 100644
--- a/app/authenticated/project/hpa/index/template.hbs
+++ b/app/authenticated/project/hpa/index/template.hbs
@@ -1,9 +1,8 @@
 <section class="header clearfix">
   <div class="right-buttons">
     <button
-      {{action "importYaml"}}
       class="btn btn-sm bg-default mr-10"
-      disabled={{rbac-prevents resource="horizontalpodautoscaler" scope="project" permission="create"}}
+      disabled={{rbac-prevents resource="horizontalpodautoscaler" scope="project" permission="create"}} type="button" {{action "importYaml"}}
     >
       {{t "nav.containers.importCompose"}}
     </button>
diff --git a/app/authenticated/project/hpa/new/route.js b/app/authenticated/project/hpa/new/route.js
index dce1465a5..00a11389c 100644
--- a/app/authenticated/project/hpa/new/route.js
+++ b/app/authenticated/project/hpa/new/route.js
@@ -4,7 +4,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  clusterStore:  service(),
+  clusterStore: service(),
 
   model(params) {
     const store = get(this, 'store');
diff --git a/app/authenticated/project/ns/index/controller.js b/app/authenticated/project/ns/index/controller.js
index d9dace9c6..769a11e54 100644
--- a/app/authenticated/project/ns/index/controller.js
+++ b/app/authenticated/project/ns/index/controller.js
@@ -51,14 +51,14 @@ export default Controller.extend({
     },
   },
 
-  allNamespace: computed('model.namespaces.[]', function() {
+  allNamespace: computed('model.namespaces.[]', 'scope.currentProject.id', function() {
     let ns = get(this, 'model.namespaces');
     let pId = get(this, 'scope.currentProject.id');
 
     return ns.filter( (n) => get(n, 'projectId') === pId || isEmpty(get(n, 'projectId')));
   }),
 
-  projectNamespaces: computed('model.namespaces', function() {
+  projectNamespaces: computed('model.namespaces', 'scope.currentProject.id', function() {
     return get(this, 'model.namespaces').filter( (ns) => get(ns, 'projectId') === get(this, 'scope.currentProject.id'));
   }),
 
diff --git a/app/authenticated/project/project-catalogs/controller.js b/app/authenticated/project/project-catalogs/controller.js
index 75bb5f1b3..45dee9997 100644
--- a/app/authenticated/project/project-catalogs/controller.js
+++ b/app/authenticated/project/project-catalogs/controller.js
@@ -36,11 +36,11 @@ export default Controller.extend({
     }
   },
 
-  clusterCatalogs: computed('model.clusterCatalogs.@each.{clusterId,state,id}', function() {
+  clusterCatalogs: computed('model.clusterCatalogs.@each.{clusterId,id,state}', 'scope.currentCluster.id', function() {
     return get(this, 'model.clusterCatalogs').filterBy('clusterId', get(this, 'scope.currentCluster.id'));
   }),
 
-  projectCatalogs: computed('model.projectCatalogs.@each.{clusterId,state,id}', function() {
+  projectCatalogs: computed('model.projectCatalogs.@each.{clusterId,id,state}', 'scope.currentProject.id', function() {
     return get(this, 'model.projectCatalogs').filterBy('projectId', get(this, 'scope.currentProject.id'));
   }),
 });
diff --git a/app/authenticated/project/project-catalogs/template.hbs b/app/authenticated/project/project-catalogs/template.hbs
index b151a8e73..85798d96c 100644
--- a/app/authenticated/project/project-catalogs/template.hbs
+++ b/app/authenticated/project/project-catalogs/template.hbs
@@ -1,6 +1,6 @@
 <section class="header clearfix">
   <div class="right-buttons">
-    <button class="btn bg-primary btn-sm" {{action "add"}}>
+    <button class="btn bg-primary btn-sm" type="button" {{action "add"}}>
       {{t 'catalogSettings.more.addActionLabel'}}
     </button>
   </div>
@@ -27,5 +27,5 @@
 
 
 <div class="footer-actions mt-20">
-  <button {{action "goBack"}} class="btn bg-transparent">{{t 'generic.back'}}</button>
+  <button class="btn bg-transparent" type="button" {{action "goBack"}}>{{t 'generic.back'}}</button>
 </div>
diff --git a/app/authenticated/project/secrets/index/controller.js b/app/authenticated/project/secrets/index/controller.js
index 51e9bb165..e127fb4d2 100644
--- a/app/authenticated/project/secrets/index/controller.js
+++ b/app/authenticated/project/secrets/index/controller.js
@@ -54,7 +54,7 @@ export default Controller.extend({
   group:        alias('projectController.group'),
   groupTableBy: alias('projectController.groupTableBy'),
 
-  rows: computed('model.projectSecrets.[].type', 'model.namespacedSecrets.[].type', function() {
+  rows: computed('model.projectSecrets.@each.type', 'model.namespacedSecrets.@each.type', function() {
     const proj = get(this, 'model.projectSecrets').filterBy('type', 'secret');
     const ns = get(this, 'model.namespacedSecrets').filterBy('type', 'namespacedSecret');
     const out = proj.concat(ns);
diff --git a/app/authenticated/route.js b/app/authenticated/route.js
index 41c98ead9..95f73e133 100644
--- a/app/authenticated/route.js
+++ b/app/authenticated/route.js
@@ -25,7 +25,7 @@ export default Route.extend(Preload, {
   growl:        service(),
   userTheme:    service('user-theme'),
 
-  testTimer:    null,
+  testTimer: null,
 
   shortcuts: {
     // Global
@@ -157,21 +157,16 @@ export default Route.extend(Preload, {
       const version = get(this, 'settings.rancherVersion');
       const isDev = isDevBuild(version);
 
+
       if ( get(this, 'access.admin') && (!telemetry || telemetry === 'prompt') ) {
         // Show the telemetry opt-in if not set
-        scheduleOnce('afterRender', this, function() {
-          get(this, 'modalService').toggleModal('modal-telemetry');
-        });
+        scheduleOnce('afterRender', this.modalService, 'toggleModal', 'modal-telemetry');
       } else if ( form && !get(this, `prefs.${ C.PREFS.FEEDBACK }`) ) {
         // Try.rancher feedback
-        scheduleOnce('afterRender', this, function() {
-          get(this, 'modalService').toggleModal('modal-feedback');
-        });
+        scheduleOnce('afterRender', this.modalService, 'toggleModal', 'modal-feedback');
       } else if ( !isDev && (!seenWhatsNew || compare(seenWhatsNew, C.WHATS_NEW_VERSION) < 0) ) {
         // What's new
-        scheduleOnce('afterRender', this, function() {
-          get(this, 'modalService').toggleModal('modal-whats-new');
-        });
+        scheduleOnce('afterRender', this.modalService, 'toggleModal', 'modal-whats-new');
       }
     }
   },
diff --git a/app/catalog-tab/launch/route.js b/app/catalog-tab/launch/route.js
index 13b63699c..4513b791d 100644
--- a/app/catalog-tab/launch/route.js
+++ b/app/catalog-tab/launch/route.js
@@ -16,7 +16,7 @@ export default Route.extend({
   growl:        service(),
   intl:         service(),
 
-  parentRoute:  'catalog-tab',
+  parentRoute: 'catalog-tab',
 
   model(params, transition) {
     const { store, clusterStore } = this;
diff --git a/app/components/basic-dropdown/content-element.js b/app/components/basic-dropdown/content-element.js
deleted file mode 100644
index ffc4fb9db..000000000
--- a/app/components/basic-dropdown/content-element.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import ContentElement from 'ember-basic-dropdown/components/basic-dropdown/content-element';
-import { get } from '@ember/object';
-import { next } from '@ember/runloop';
-
-const CE =  ContentElement.extend({
-  click() {
-    this.closeDD();
-
-    return true;
-  },
-  closeDD() {
-    let dd = get(this, 'parentView.dropdown');
-
-    if (get(dd, 'actions')) {
-      next(() => {
-        dd.actions.close();
-      });
-    }
-  },
-});
-
-
-export default CE;
diff --git a/app/components/cluster/cis/scan/detail/nodes-table/table-row/component.js b/app/components/cluster/cis/scan/detail/nodes-table/table-row/component.js
index 5ceb70b8f..1bbd18267 100644
--- a/app/components/cluster/cis/scan/detail/nodes-table/table-row/component.js
+++ b/app/components/cluster/cis/scan/detail/nodes-table/table-row/component.js
@@ -7,7 +7,7 @@ export default Component.extend({
   scope: service(),
 
   layout,
-  tagName:    '',
+  tagName: '',
 
   badgeState: computed('model.state', function() {
     const state = get(this, 'model.state');
diff --git a/app/components/cluster/cis/scan/detail/table-row/component.js b/app/components/cluster/cis/scan/detail/table-row/component.js
index d1dbe8b2f..0110b091b 100644
--- a/app/components/cluster/cis/scan/detail/table-row/component.js
+++ b/app/components/cluster/cis/scan/detail/table-row/component.js
@@ -15,7 +15,7 @@ export default Component.extend({
       get(this, 'model.toggleSkip')()
     },
   },
-  isInSkipList: computed('model.skipList.@each', function() {
+  isInSkipList: computed('model.id', 'model.skipList.[]', function() {
     return get(this, 'model.skipList').indexOf(get(this, 'model.id')) !== -1;
   }),
   showSkipButton: computed('model.state', 'isInSkipList', function() {
diff --git a/app/components/cluster/cis/scan/table-row/component.js b/app/components/cluster/cis/scan/table-row/component.js
index 2b737fbc1..7d885150f 100644
--- a/app/components/cluster/cis/scan/table-row/component.js
+++ b/app/components/cluster/cis/scan/table-row/component.js
@@ -4,11 +4,9 @@ import { computed } from '@ember/object'
 
 export default Component.extend({
   layout,
-  tagName:    '',
-  error:   computed('model.status.conditions.@each', function() {
+  tagName:      '',
+  errorMessage: computed.reads('error.message'),
+  error:        computed('model.status.conditions.[]', function() {
     return this.model.status.conditions.find((condition) => condition.type === 'Failed')
   }),
-  errorMessage: computed('error.message', function() {
-    return this.error.message;
-  })
 });
diff --git a/app/components/container-default-limit/component.js b/app/components/container-default-limit/component.js
index da8136171..716218548 100644
--- a/app/components/container-default-limit/component.js
+++ b/app/components/container-default-limit/component.js
@@ -7,7 +7,7 @@ import layout from './template';
 export default Component.extend({
   layout,
 
-  limit:          null,
+  limit: null,
 
   init() {
     this._super(...arguments);
diff --git a/app/components/container-logs/template.hbs b/app/components/container-logs/template.hbs
index 05a7df22f..8e2e8de4a 100644
--- a/app/components/container-logs/template.hbs
+++ b/app/components/container-logs/template.hbs
@@ -37,9 +37,9 @@
       {{t 'containerLogs.previous'}}
     </label>
   </div>
-  <button {{action "scrollToTop"}} class="btn bg-default">{{t 'containerLogs.scrollTop'}}</button>
-  <button {{action "followLog"}} class="btn bg-default scroll-bottom">{{t 'containerLogs.scrollBottom'}}</button>
-  <button {{action "download"}} class="btn bg-default">{{t 'containerLogs.download'}}</button>
-  <button {{action "clear"}} class="btn bg-default">{{t 'containerLogs.clear'}}</button>
-  <button {{action "cancel"}} class="btn bg-primary">{{t 'generic.closeModal'}}</button>
+  <button class="btn bg-default" type="button" {{action "scrollToTop"}}>{{t 'containerLogs.scrollTop'}}</button>
+  <button class="btn bg-default scroll-bottom" type="button" {{action "followLog"}}>{{t 'containerLogs.scrollBottom'}}</button>
+  <button class="btn bg-default" type="button" {{action "download"}}>{{t 'containerLogs.download'}}</button>
+  <button class="btn bg-default" type="button" {{action "clear"}}>{{t 'containerLogs.clear'}}</button>
+  <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t 'generic.closeModal'}}</button>
 </div>
diff --git a/app/components/container-metrics/component.js b/app/components/container-metrics/component.js
index 2d17a74de..cc1ce81cf 100644
--- a/app/components/container-metrics/component.js
+++ b/app/components/container-metrics/component.js
@@ -8,7 +8,7 @@ export default Component.extend(Metrics, {
 
   filters: { resourceType: 'container' },
 
-  projectScope:  true,
+  projectScope: true,
 
   init() {
     this._super(...arguments);
diff --git a/app/components/container-table/component.js b/app/components/container-table/component.js
index 12cdcadf6..54fa85543 100644
--- a/app/components/container-table/component.js
+++ b/app/components/container-table/component.js
@@ -44,7 +44,7 @@ export default Component.extend({
 
   extraSearchFields: ['displayIp', 'primaryHost.displayName'],
 
-  headers: computed(function() {
+  headers: computed('showNode', 'showStats', function() {
     if ( this.get('showStats') ) {
       return headersWithStats;
     } else if ( this.get('showNode') ) {
diff --git a/app/components/container/form-custom-metrics/component.js b/app/components/container/form-custom-metrics/component.js
index 4c75e9b92..950462718 100644
--- a/app/components/container/form-custom-metrics/component.js
+++ b/app/components/container/form-custom-metrics/component.js
@@ -18,7 +18,7 @@ const OPTIONS = [
 ];
 
 export default Component.extend({
-  scope:    service(),
+  scope: service(),
 
   layout,
 
diff --git a/app/components/container/form-custom-metrics/template.hbs b/app/components/container/form-custom-metrics/template.hbs
index 4ff18a539..0d999d47a 100644
--- a/app/components/container/form-custom-metrics/template.hbs
+++ b/app/components/container/form-custom-metrics/template.hbs
@@ -49,7 +49,7 @@
 
             <td>
               {{#if editing}}
-                <button class="btn bg-primary btn-sm" {{action "remove" metric}}>
+                <button class="btn bg-primary btn-sm" type="button" {{action "remove" metric}}>
                   <i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span>
                 </button>
               {{/if}}
@@ -67,7 +67,7 @@
 
 <div>
   {{#if editing}}
-    <button class="btn bg-link icon-btn p-0" {{action "add"}}>
+    <button class="btn bg-link icon-btn p-0" type="button" {{action "add"}}>
       <span class="darken"><i class="icon icon-plus text-small"/></span>
       <span>{{t 'formCustomMetrics.addActionLabel'}}</span>
     </button>
diff --git a/app/components/container/form-image/component.js b/app/components/container/form-image/component.js
index d1ac0a925..1988e59b4 100644
--- a/app/components/container/form-image/component.js
+++ b/app/components/container/form-image/component.js
@@ -35,10 +35,7 @@ export default Component.extend({
       initial = lastContainer;
     }
 
-    scheduleOnce('afterRender', () => {
-      this.send('setInput', initial);
-      this.userInputDidChange();
-    });
+    scheduleOnce('afterRender', this, 'setupComponent', initial);
   },
 
   actions: {
@@ -92,4 +89,9 @@ export default Component.extend({
     set(this, 'errors', errors);
   },
 
+  setupComponent(initial) {
+    this.send('setInput', initial);
+    this.userInputDidChange();
+  }
+
 });
diff --git a/app/components/container/form-job-config/component.js b/app/components/container/form-job-config/component.js
index 4e3980f6e..6510c2645 100644
--- a/app/components/container/form-job-config/component.js
+++ b/app/components/container/form-job-config/component.js
@@ -17,7 +17,7 @@ export default Component.extend({
       });
     }
   },
-  jobConfig: computed('scaleMode', function() {
+  jobConfig: computed('scaleMode', 'workload.cronJobConfig.jobConfig', 'workload.jobConfig', function() {
     const scaleMode = get(this, 'scaleMode');
     let config;
 
diff --git a/app/components/container/form-ports/template.hbs b/app/components/container/form-ports/template.hbs
index 78d64eda4..e0befefff 100644
--- a/app/components/container/form-ports/template.hbs
+++ b/app/components/container/form-ports/template.hbs
@@ -191,7 +191,7 @@
 
 <div>
   {{#if editing}}
-    <button class="btn bg-link icon-btn p-0" {{action "addPort"}}>
+    <button class="btn bg-link icon-btn p-0" type="button" {{action "addPort"}}>
       <span class="darken">
         <i class="icon icon-plus text-small"/>
       </span>
diff --git a/app/components/container/form-scale/component.js b/app/components/container/form-scale/component.js
index 39fe92f1e..d788fc903 100644
--- a/app/components/container/form-scale/component.js
+++ b/app/components/container/form-scale/component.js
@@ -53,7 +53,7 @@ export default Component.extend({
   scaleMode:        null,
   editing:          true,
 
-  userInput:        null,
+  userInput: null,
 
   canChangeScaleMode: not('isUpgrade'),
 
diff --git a/app/components/container/form-scheduling/component.js b/app/components/container/form-scheduling/component.js
index 58f129bec..aca02fa24 100644
--- a/app/components/container/form-scheduling/component.js
+++ b/app/components/container/form-scheduling/component.js
@@ -76,11 +76,11 @@ export default Component.extend({
     }
   }),
 
-  selectedChoice: computed('_allNodes.@each.{id,clusterId,name,state}', function() {
+  selectedChoice: computed('_allNodes.@each.{clusterId,id,name,state}', 'hostChoices', 'initialHostId', function() {
     return get(this, 'hostChoices').findBy('id', get(this, 'initialHostId'));
   }),
 
-  hostChoices: computed('_allNodes.@each.{id,clusterId,name,state}', function() {
+  hostChoices: computed('_allNodes.@each.{clusterId,id,name,state}', 'scope.currentCluster.id', function() {
     const list = get(this, '_allNodes').filter((node) => !get(node, 'isUnschedulable'))
       .filterBy('clusterId', get(this, 'scope.currentCluster.id'))
       .map((host) => {
diff --git a/app/components/container/form-upgrade-deployment/component.js b/app/components/container/form-upgrade-deployment/component.js
index 65176bfb6..503752060 100644
--- a/app/components/container/form-upgrade-deployment/component.js
+++ b/app/components/container/form-upgrade-deployment/component.js
@@ -87,7 +87,7 @@ export default Component.extend({
       });
     } else if ( _strategy === 'custom' ) {
       setProperties(config, {
-        strategy:       'RollingUpdate',
+        strategy: 'RollingUpdate',
         maxSurge,
         maxUnavailable
       });
diff --git a/app/components/container/form-volume-row/template.hbs b/app/components/container/form-volume-row/template.hbs
index 1e87a6215..413548307 100644
--- a/app/components/container/form-volume-row/template.hbs
+++ b/app/components/container/form-volume-row/template.hbs
@@ -6,7 +6,7 @@
       </div>
       {{#if editing}}
         <div class="col span-2 text-right mt-0">
-          <button class="btn bg-link icon-btn" {{action "remove"}}>
+          <button class="btn bg-link icon-btn" type="button" {{action "remove"}}>
             <span class="darken"><i class="icon icon-minus text-small"/></span>
             <span>{{t "formVolumeRow.remove"}}</span>
           </button>
@@ -55,17 +55,17 @@
           {{t (concat "formVolumeRow.mode." model.mode)}}
           {{#if editing}}
             {{#if (eq model.mode "newPvc")}}
-              <button class="btn bg-transparent" {{action "defineNewPvc"}}>
+              <button class="btn bg-transparent" type="button" {{action "defineNewPvc"}}>
                 <i class="icon icon-edit"/>
                 {{t "generic.edit"}}
               </button>
             {{else if (eq model.mode "newVolumeClaimTemplate")}}
-              <button class="btn bg-transparent" {{action "defineNewVct"}}>
+              <button class="btn bg-transparent" type="button" {{action "defineNewVct"}}>
                 <i class="icon icon-edit"/>
                 {{t "generic.edit"}}
               </button>
             {{else if (or (eq model.mode "existingVolume") (eq model.mode "newVolume"))}}
-              <button class="btn bg-transparent" {{action "defineNewVolume"}}>
+              <button class="btn bg-transparent" type="button" {{action "defineNewVolume"}}>
                 <i class="icon icon-edit"/>
                 {{t "generic.edit"}}
               </button>
@@ -75,7 +75,7 @@
       </div>
       {{#if editing}}
         <div class="col span-2 text-right mt-0">
-          <button class="btn bg-link icon-btn" {{action "remove"}}>
+          <button class="btn bg-link icon-btn" type="button" {{action "remove"}}>
             <span class="darken"><i class="icon icon-minus text-small"/></span>
             <span>{{t "formVolumeRow.remove"}}</span>
           </button>
@@ -185,7 +185,7 @@
                   </td>
                   <td>
                     {{#if editing}}
-                      <button class="btn bg-primary btn-sm" {{action "removeMount" mnt}}>
+                      <button class="btn bg-primary btn-sm" type="button" {{action "removeMount" mnt}}>
                         <i class="icon icon-minus"/>
                         <span class="sr-only">{{t "generic.remove"}}</span>
                       </button>
@@ -200,7 +200,7 @@
         {{/if}}
         {{#if editing}}
           <div class="mt-20">
-            <button class="btn bg-link icon-btn" {{action "addMount"}}>
+            <button class="btn bg-link icon-btn" type="button" {{action "addMount"}}>
               <span class="darken"><i class="icon icon-plus text-small"/></span>
               <span>{{t "formVolumeRow.addMount"}}</span>
             </button>
diff --git a/app/components/container/form-volumes/component.js b/app/components/container/form-volumes/component.js
index e9830dfbf..f714fe177 100644
--- a/app/components/container/form-volumes/component.js
+++ b/app/components/container/form-volumes/component.js
@@ -31,7 +31,7 @@ export default Component.extend({
   editing:       true,
   scaleMode:     null,
 
-  volumesArray:  null,
+  volumesArray: null,
 
   nextNum:       1,
   cluster:       alias('scope.currentCluster'),
diff --git a/app/components/container/form-volumes/template.hbs b/app/components/container/form-volumes/template.hbs
index 89bd1dfed..bf40bc503 100644
--- a/app/components/container/form-volumes/template.hbs
+++ b/app/components/container/form-volumes/template.hbs
@@ -26,39 +26,33 @@
       {{t "generic.na"}}
     </div>
   {{/if}}
-
   {{#if editing}}
-    {{#basic-dropdown
-         horizontalPosition="left"
-         as |dd|}}
-      {{#dd.trigger
-           class="btn bg-link p-0 icon-btn pl-10"
-      }}
+    <BasicDropdown @horizontalPosition="left" as |dd|>
+      <dd.Trigger class="btn bg-link p-0 icon-btn pl-10">
         <span>
           {{t "formVolumes.add.label"}}
         </span>
         <span class="darken">
           <i class="icon icon-chevron-down"></i>
         </span>
-      {{/dd.trigger}}
-
-      {{#dd.content}}
-        <li>
+      </dd.Trigger>
+      <dd.Content>
+        <li {{action dd.actions.close}}>
           <a {{action "addVolume"}}>
             {{t "formVolumes.add.newVolume"}}
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a {{action "addNewPvc"}}>
             {{t "formVolumes.add.newPvc"}}
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a {{action "addPvc"}}>
             {{t "formVolumes.add.existingPvc"}}
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a {{action "addBindMount"}}>
             {{t "formVolumes.add.bindMount"}}
           </a>
@@ -68,37 +62,36 @@
             {{t "formVolumes.add.tmpfs"}}
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a {{action "addSecret"}}>
             {{t "formVolumes.add.secret"}}
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a {{action "addConfigMap"}}>
             {{t "formVolumes.add.configMap"}}
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a {{action "addCertificate"}}>
             {{t "formVolumes.add.certificate"}}
           </a>
         </li>
         {{#if (and loggingEnabled (not isWindows))}}
-          <li>
+          <li {{action dd.actions.close}}>
             <a {{action "addCustomLogPath"}}>
               {{t "formVolumes.add.customLogPath"}}
             </a>
           </li>
         {{/if}}
         {{#if isStatefulSet}}
-          <li>
+          <li {{action dd.actions.close}}>
             <a {{action "addVolumeClaimTemplate"}}>
               {{t "formVolumes.add.vct"}}
             </a>
           </li>
         {{/if}}
-      {{/dd.content}}
-    {{/basic-dropdown}}
+      </dd.Content>
+    </BasicDropdown>
   {{/if}}
-
-{{/accordion-list-item}}
+{{/accordion-list-item}}
\ No newline at end of file
diff --git a/app/components/container/new-edit/component.js b/app/components/container/new-edit/component.js
index f6efda73d..b5f5e9c2a 100644
--- a/app/components/container/new-edit/component.js
+++ b/app/components/container/new-edit/component.js
@@ -62,7 +62,7 @@ export default Component.extend(NewOrEdit, ChildHook, {
   header:        '',
   showTargetOS: false,
 
-  isSidekick:    equal('scaleMode', 'sidekick'),
+  isSidekick: equal('scaleMode', 'sidekick'),
   init() {
     window.nec = this;
     this._super(...arguments);
diff --git a/app/components/container/new-edit/template.hbs b/app/components/container/new-edit/template.hbs
index 115cf7355..a97872d00 100644
--- a/app/components/container/new-edit/template.hbs
+++ b/app/components/container/new-edit/template.hbs
@@ -74,21 +74,18 @@
     <div class="row">
       <div class="btn-group no-inline-space mt-5">
         <button
-          class="btn btn-link btn-sm bg-{{if (eq targetOs "all") "primary" "default" }}"
-          {{action "setTargetOs" "all"}}
+          class="btn btn-link btn-sm bg-{{if (eq targetOs "all") "primary" "default" }}" type="button" {{action "setTargetOs" "all"}}
         >
           {{t "newContainer.all"}}
         </button>
         <button
-          class="btn btn-link btn-sm bg-{{if (eq targetOs "linux") "primary" "default" }}"
-          {{action "setTargetOs" "linux"}}
+          class="btn btn-link btn-sm bg-{{if (eq targetOs "linux") "primary" "default" }}" type="button" {{action "setTargetOs" "linux"}}
         >
           <i class="icon icon-fw icon-linux"></i>
           {{t "newContainer.linux"}}
         </button>
         <button
-          class="btn btn-link btn-sm bg-{{if (eq targetOs "windows") "primary" "default" }}"
-          {{action "setTargetOs" "windows"}}
+          class="btn btn-link btn-sm bg-{{if (eq targetOs "windows") "primary" "default" }}" type="button" {{action "setTargetOs" "windows"}}
         >
           <i class="icon icon-fw icon-windows"></i>
           {{t "newContainer.windows"}}
@@ -198,11 +195,11 @@
             {{t "formHealthCheck.liveness"}}
           </label>
           <div class="pull-right text-small">
-            <button class="btn bg-transparent p-0" {{action "toggleSeparateLivenessCheck"}}>{{t "formHealthCheck.combinedLivenessCheck"}}</button>
+            <button class="btn bg-transparent p-0" type="button" {{action "toggleSeparateLivenessCheck"}}>{{t "formHealthCheck.combinedLivenessCheck"}}</button>
           </div>
         {{else}}
           <div class="pull-right text-small">
-            <button class="btn bg-transparent p-0" {{action "toggleSeparateLivenessCheck"}}>{{t "formHealthCheck.separateLivenessCheck"}}</button>
+            <button class="btn bg-transparent p-0" type="button" {{action "toggleSeparateLivenessCheck"}}>{{t "formHealthCheck.separateLivenessCheck"}}</button>
           </div>
         {{/if}}
       </div>
diff --git a/app/components/cru-dns/component.js b/app/components/cru-dns/component.js
index 142572e97..16bcbd8cf 100644
--- a/app/components/cru-dns/component.js
+++ b/app/components/cru-dns/component.js
@@ -48,7 +48,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
   timeoutSeconds: null,
   kindChoices:    null,
 
-  namespace:       alias('model.namespace'),
+  namespace: alias('model.namespace'),
   init() {
     this._super(...arguments);
 
@@ -139,7 +139,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
     }
   }),
 
-  showSessionAffinity: computed('isHeadless', 'showMoreOptions', function() {
+  showSessionAffinity: computed('isHeadless', 'kind', 'showMoreOptions', function() {
     return get(this, 'showMoreOptions') && get(this, 'kind') !== HEADLESS;
   }),
 
diff --git a/app/components/cru-hpa/template.hbs b/app/components/cru-hpa/template.hbs
index 5e50f6d42..52a485a78 100644
--- a/app/components/cru-hpa/template.hbs
+++ b/app/components/cru-hpa/template.hbs
@@ -219,7 +219,7 @@
 
   {{#if editing}}
     <div class="row">
-      <button class="btn bg-link icon-btn pull-right" {{action "addMetric"}}>
+      <button class="btn bg-link icon-btn pull-right" type="button" {{action "addMetric"}}>
         <span class="darken">
           <i class="icon icon-plus text-small"></i>
         </span>
diff --git a/app/components/cru-persistent-volume/component.js b/app/components/cru-persistent-volume/component.js
index 7bed90f8b..53bd0109d 100644
--- a/app/components/cru-persistent-volume/component.js
+++ b/app/components/cru-persistent-volume/component.js
@@ -109,6 +109,8 @@ export default Component.extend(ViewNewEdit, {
     if (entry) {
       return `volume-source/source-${ name }`;
     }
+
+    return null;
   }),
 
   willSave() {
diff --git a/app/components/cru-registry/component.js b/app/components/cru-registry/component.js
index 11b8dce54..72c1f7d92 100644
--- a/app/components/cru-registry/component.js
+++ b/app/components/cru-registry/component.js
@@ -82,7 +82,7 @@ export default Component.extend(ViewNewEdit, OptionallyNamespaced, {
     return this._super(...arguments);
   }),
 
-  hostname:  window.location.host,
+  hostname: window.location.host,
 
   willSave() {
     const { primaryResource: pr } = this;
diff --git a/app/components/cru-volume/component.js b/app/components/cru-volume/component.js
index 907e71d36..46fd69eb4 100644
--- a/app/components/cru-volume/component.js
+++ b/app/components/cru-volume/component.js
@@ -14,7 +14,7 @@ export default Component.extend(ViewNewEdit, {
   model:      null,
   sourceName: null,
 
-  titleKey:    'cruVolume.title',
+  titleKey: 'cruVolume.title',
 
   didReceiveAttrs() {
     const selectedSource = (get(this, 'sourceChoices') || []).find((source) => !!get(this, `primaryResource.${ get(source, 'value') }`));
@@ -36,7 +36,7 @@ export default Component.extend(ViewNewEdit, {
     },
   },
 
-  headerToken: computed('scope', function() {
+  headerToken: computed('mode', 'scope', function() {
     let k = 'cruPersistentVolumeClaim.define.';
 
     k += get(this, 'mode');
@@ -88,6 +88,8 @@ export default Component.extend(ViewNewEdit, {
         field:     entry.value,
       }
     }
+
+    return null;
   }),
 
   willSave() {
diff --git a/app/components/form-contextual-key-value/component.js b/app/components/form-contextual-key-value/component.js
index 822273486..c5059aadf 100644
--- a/app/components/form-contextual-key-value/component.js
+++ b/app/components/form-contextual-key-value/component.js
@@ -54,14 +54,14 @@ export default Component.extend({
       return value;
     }
   }),
-  canAddMore: computed('filteredKeyContent', function() {
+  canAddMore: computed('filteredKeyContent.length', 'keyValuePairs.length', function() {
     return get(this, 'filteredKeyContent.length') > 1
             || get(this, 'filteredKeyContent.length') > 0 && get(this, 'keyValuePairs.length') === 0;
   }),
   lastIndex: computed('keyValuePairs.[]', function() {
     return get(this, 'keyValuePairs.length') - 1;
   }),
-  filteredKeyContent: computed('asyncKeyContent.value', 'keyValuePairs.@each', 'keyValuePairs.[]', 'keyValuePairs', function() {
+  filteredKeyContent: computed('asyncKeyContent.value', 'keyContentFilter', 'keyValuePairs.[]', function() {
     if (!get(this, 'keyContentFilter')) {
       return get(this, 'asyncKeyContent.value') || [];
     }
diff --git a/app/components/form-contextual-key-value/template.hbs b/app/components/form-contextual-key-value/template.hbs
index 344c41eae..5425dd906 100644
--- a/app/components/form-contextual-key-value/template.hbs
+++ b/app/components/form-contextual-key-value/template.hbs
@@ -22,8 +22,7 @@
                 <td>&nbsp;</td>
                 <td class="valign-top text-right">
                     <button
-                        class="btn bg-primary btn-sm"
-                        {{action "onRemove" index}}>
+                        class="btn bg-primary btn-sm" type="button" {{action "onRemove" index}}>
                         <i class="icon icon-minus"/>
                         <span class="sr-only">
                         {{t "generic.remove"}}
@@ -49,8 +48,7 @@
                 <td>&nbsp;</td>
                 <td class="valign-top text-right">
                     <button
-                        class="btn bg-primary btn-sm"
-                        {{action "onRemove" lastIndex}}>
+                        class="btn bg-primary btn-sm" type="button" {{action "onRemove" lastIndex}}>
                         <i class="icon icon-minus"/>
                         <span class="sr-only">
                         {{t "generic.remove"}}
@@ -63,9 +61,7 @@
     </table>
 {{/if}}
 <button
-    class={{addButtonClass}}
-    {{action "onAdd"}}
-    disabled={{not canAddMore}}
+    class={{addButtonClass}} disabled={{not canAddMore}} type="button" {{action "onAdd"}}
 >
     <span class="darken">
         <i class="icon icon-plus text-small"/>
diff --git a/app/components/form-healthcheck/component.js b/app/components/form-healthcheck/component.js
index 447914889..5a5b52580 100644
--- a/app/components/form-healthcheck/component.js
+++ b/app/components/form-healthcheck/component.js
@@ -24,7 +24,7 @@ export default Component.extend({
   successMustBeOne: false,
   isLiveness:       false,
 
-  editing:          true,
+  editing: true,
 
   checkType:        null,
   command:          null,
@@ -99,9 +99,7 @@ export default Component.extend({
     set(this, 'checkType', type);
     this.validate();
 
-    scheduleOnce('afterRender', () => {
-      this.checkChanged()
-    });
+    scheduleOnce('afterRender', this, 'checkChanged');
   },
 
   checkChanged: observer('path', 'host', 'headers', 'checkType', 'command', function() {
diff --git a/app/components/form-key-to-path/template.hbs b/app/components/form-key-to-path/template.hbs
index 41301c3a9..ac9c6ea0a 100644
--- a/app/components/form-key-to-path/template.hbs
+++ b/app/components/form-key-to-path/template.hbs
@@ -44,7 +44,7 @@
           <td>&nbsp;</td>
           <td class="valign-top text-right">
             {{#if editing}}
-              <button class="btn bg-primary btn-sm" {{action "remove" row}}><i class="icon icon-minus"/><span class="sr-only">{{t "generic.remove"}}</span></button>
+              <button class="btn bg-primary btn-sm" type="button" {{action "remove" row}}><i class="icon icon-minus"/><span class="sr-only">{{t "generic.remove"}}</span></button>
             {{/if}}
           </td>
         </tr>
@@ -62,7 +62,7 @@
 
 {{#if editing}}
   <div>
-    <button class="btn bg-link icon-btn p-0" {{action "add"}}>
+    <button class="btn bg-link icon-btn p-0" type="button" {{action "add"}}>
       <span class="darken"><i class="icon icon-plus text-small"/></span>
       <span>{{t "formKeyToPath.addAction"}}</span>
     </button>
diff --git a/app/components/form-node-affinity/template.hbs b/app/components/form-node-affinity/template.hbs
index 3f7b587fa..d5dedb68c 100644
--- a/app/components/form-node-affinity/template.hbs
+++ b/app/components/form-node-affinity/template.hbs
@@ -10,7 +10,7 @@
 
 {{#if editing}}
   <div class="row">
-    <button class="btn bg-link icon-btn pull-left" {{action "addRule"}}>
+    <button class="btn bg-link icon-btn pull-left" type="button" {{action "addRule"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t "formNodeAffinity.addRuleLabel"}}</span>
     </button>
diff --git a/app/components/form-node-requirement/component.js b/app/components/form-node-requirement/component.js
index 8c8745801..35c1590bf 100644
--- a/app/components/form-node-requirement/component.js
+++ b/app/components/form-node-requirement/component.js
@@ -6,7 +6,7 @@ import C from 'shared/utils/constants';
 export default Component.extend({
   layout,
 
-  term:      null,
+  term: null,
 
   ruleArray: null,
   editing:   true,
diff --git a/app/components/form-node-requirement/template.hbs b/app/components/form-node-requirement/template.hbs
index a4db38e9c..630375450 100644
--- a/app/components/form-node-requirement/template.hbs
+++ b/app/components/form-node-requirement/template.hbs
@@ -1,7 +1,7 @@
 <div class="clearfix">
   <label class="acc-label">{{t 'formNodeRequirement.label'}}</label>
   {{#if editing}}
-    <button class="btn bg-link icon-btn" {{action "addRule"}}>
+    <button class="btn bg-link icon-btn" type="button" {{action "addRule"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t 'formNodeRequirement.addRuleLabel'}}</span>
     </button>
@@ -56,7 +56,7 @@
 
           {{#if editing}}
             <td class="text-right">
-              <button class="btn bg-primary btn-sm" {{action "removeRule" rule}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+              <button class="btn bg-primary btn-sm" type="button" {{action "removeRule" rule}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
             </td>
           {{/if}}
         </tr>
diff --git a/app/components/form-node-selector/template.hbs b/app/components/form-node-selector/template.hbs
index a265628df..7782fcced 100644
--- a/app/components/form-node-selector/template.hbs
+++ b/app/components/form-node-selector/template.hbs
@@ -2,7 +2,7 @@
     <div class="row">
       {{#if editing}}
         <div class="pull-right">
-          <button class="btn bg-transparent text-small vertical-middle" {{action "removeRule" rule}}>
+          <button class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeRule" rule}}>
             {{t 'formNodeAffinity.removeRuleLabel'}}
           </button>
         </div>
diff --git a/app/components/form-scoped-roles/component.js b/app/components/form-scoped-roles/component.js
index 78465344d..3c4f9a598 100644
--- a/app/components/form-scoped-roles/component.js
+++ b/app/components/form-scoped-roles/component.js
@@ -131,7 +131,7 @@ export default Component.extend(NewOrEdit, {
 
   },
 
-  showAdmin: computed('model.roles.@each.id', 'mode', function() {
+  showAdmin: computed('mode', 'model.roles.@each.id', 'type', function() {
     const id = `${ get(this, 'type') }-owner`;
     const role = get(this, 'model.roles').findBy('id', id);
 
@@ -146,7 +146,7 @@ export default Component.extend(NewOrEdit, {
     return false;
   }),
 
-  showStdUser: computed('model.roles.@each.id', 'mode', function() {
+  showStdUser: computed('mode', 'model.roles.@each.id', 'type', function() {
     const id = `${ get(this, 'type') }-member`;
     const role = get(this, 'model.roles').findBy('id', id);
 
@@ -177,7 +177,7 @@ export default Component.extend(NewOrEdit, {
   }),
 
 
-  baseRoles: computed(function() {
+  baseRoles: computed('type', function() {
     return [
       `${ get(this, 'type') }-admin`,
       `${ get(this, 'type') }-owner`,
@@ -186,7 +186,7 @@ export default Component.extend(NewOrEdit, {
     ];
   }),
 
-  userRoles: computed('model.roles.[]', function() {
+  userRoles: computed('model.roles.[]', 'type', function() {
     let roles = get(this, 'model.roles');
     let userDef = roles.filter((role) => !get(role, 'builtin')
         && !get(role, 'external')
@@ -201,7 +201,7 @@ export default Component.extend(NewOrEdit, {
     });
   }),
 
-  custom: computed('model.roles.[]', function() {
+  custom: computed('baseRoles', 'model.roles.[]', 'type', function() {
     // built in
     let roles  = get(this, 'model.roles').filterBy('hidden', false);
     let excludes = get(this, 'baseRoles');
@@ -217,7 +217,7 @@ export default Component.extend(NewOrEdit, {
     });
   }),
 
-  mode: computed('editing',  {
+  mode: computed('editing', 'model.roles', 'type', 'userRoles.{firstObject,length}',  {
     get() {
       let mode = null;
 
diff --git a/app/components/form-service-ports/template.hbs b/app/components/form-service-ports/template.hbs
index 9144112d9..daab7c9e3 100644
--- a/app/components/form-service-ports/template.hbs
+++ b/app/components/form-service-ports/template.hbs
@@ -77,7 +77,7 @@
 
             <td>
               {{#if editing}}
-                <button class="btn bg-primary btn-sm" {{action "removePort" port}}>
+                <button class="btn bg-primary btn-sm" type="button" {{action "removePort" port}}>
                   <i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span>
                 </button>
               {{/if}}
@@ -95,7 +95,7 @@
 
 <div>
   {{#if editing}}
-    <button class="btn bg-link icon-btn p-0" {{action "addPort"}}>
+    <button class="btn bg-link icon-btn p-0" type="button" {{action "addPort"}}>
       <span class="darken"><i class="icon icon-plus text-small"/></span>
       <span>{{t 'formServicePorts.addAction'}}</span>
     </button>
diff --git a/app/components/form-sources-row/component.js b/app/components/form-sources-row/component.js
index eae972df0..543f53e44 100644
--- a/app/components/form-sources-row/component.js
+++ b/app/components/form-sources-row/component.js
@@ -32,7 +32,7 @@ export default Component.extend({
   selectedSecret: null,
   sources:        SOURCES,
 
-  prefixOrTarget: computed('source.sourceKey', {
+  prefixOrTarget: computed('source.{prefix,source,sourceKey,targetKey}', {
     get() {
       if ( get(this, 'source.source') !== 'field' && (get(this, 'source.sourceKey') === null || get(this, 'source.sourceKey') === undefined) ) {
         return get(this, 'source.prefix');
@@ -49,7 +49,7 @@ export default Component.extend({
     }
   }),
 
-  prefixOrKeys: computed('source.sourceName', 'selectedSecret', 'selectedConfigMap', function() {
+  prefixOrKeys: computed('selectedConfigMap', 'selectedSecret', 'source.{source,sourceName}', 'specificKeyOnly', function() {
     let prefix = {
       id:    null,
       label: 'All'
diff --git a/app/components/form-sources-row/template.hbs b/app/components/form-sources-row/template.hbs
index ad93c4c8c..78954ab61 100644
--- a/app/components/form-sources-row/template.hbs
+++ b/app/components/form-sources-row/template.hbs
@@ -80,7 +80,7 @@
 </td>
 <td>
   {{#if editing}}
-    <button class="btn bg-primary btn-sm" {{action remove source}}>
+    <button class="btn bg-primary btn-sm" type="button" {{action remove source}}>
       <i class="icon icon-minus"/><span class="sr-only">{{t "generic.remove"}}</span>
     </button>
   {{/if}}
diff --git a/app/components/hpa-metric-row/component.js b/app/components/hpa-metric-row/component.js
index cead83bbe..98700bff0 100644
--- a/app/components/hpa-metric-row/component.js
+++ b/app/components/hpa-metric-row/component.js
@@ -200,6 +200,8 @@ export default Component.extend({
       return [TARGET_TYPES.VALUE, TARGET_TYPES.AVERAGE_VALUE];
     case OBJECT:
       return [TARGET_TYPES.VALUE, TARGET_TYPES.AVERAGE_VALUE];
+    default:
+      return [];
     }
   }),
 
diff --git a/app/components/hpa-metric-row/template.hbs b/app/components/hpa-metric-row/template.hbs
index 20debe685..6e4da6b72 100644
--- a/app/components/hpa-metric-row/template.hbs
+++ b/app/components/hpa-metric-row/template.hbs
@@ -29,11 +29,11 @@
     <div class="row">
       <div class="pull-right">
         {{#if (lte metrics.length 1 )}}
-          <button class="btn btn-disabled-transparent text-small vertical-middle" disabled="true">
+          <button class="btn btn-disabled-transparent text-small vertical-middle" disabled="true" type="button">
             {{t "cruHpa.metrics.removeMetricLabel"}}
           </button>
         {{else}}
-          <button class="btn bg-transparent text-small vertical-middle" {{action "removeMetric" metric}}>
+          <button class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeMetric" metric}}>
             {{t "cruHpa.metrics.removeMetricLabel"}}
           </button>
         {{/if}}
diff --git a/app/components/input-files/component.js b/app/components/input-files/component.js
index 2200b7a67..3bc954fc0 100644
--- a/app/components/input-files/component.js
+++ b/app/components/input-files/component.js
@@ -16,7 +16,7 @@ export default Component.extend({
   namePlaceholder:   'generic.emptyString',
   valuePlaceholder:  'generic.emptyString',
 
-  ary:              null,
+  ary: null,
 
   init() {
     this._super(...arguments);
diff --git a/app/components/input-files/template.hbs b/app/components/input-files/template.hbs
index a2f61c334..3c7644813 100644
--- a/app/components/input-files/template.hbs
+++ b/app/components/input-files/template.hbs
@@ -7,11 +7,11 @@
       {{/if}}
     </div>
   {{/if}}
-  <button class="btn bg-link icon-btn pull-right" style="margin-top: 8px;" {{action "upload"}}>
+  <button class="btn bg-link icon-btn pull-right" style="margin-top: 8px;" type="button" {{action "upload"}}>
     <span class="darken"><i class="icon icon-upload text-small"/></span>
     <span>{{t uploadActionLabel}}</span>
   </button>
-  <button class="btn bg-link icon-btn pull-right mr-10" style="margin-top: 8px;" {{action "add"}}>
+  <button class="btn bg-link icon-btn pull-right mr-10" style="margin-top: 8px;" type="button" {{action "add"}}>
     <span class="darken"><i class="icon icon-plus text-small"/></span>
     <span>{{t addActionLabel}}</span>
   </button>
@@ -31,7 +31,7 @@
        value=file.value
        placeholder=valuePlaceholder
   }}
-    <button class="btn bg-primary" {{action "remove" file}}><i class="icon icon-minus"></i></button>
+    <button class="btn bg-primary" type="button" {{action "remove" file}}><i class="icon icon-minus"></i></button>
   {{/input-text-file}}
 {{/each}}
 
diff --git a/app/components/modal-about/template.hbs b/app/components/modal-about/template.hbs
index 21596ae9f..3d6560a72 100644
--- a/app/components/modal-about/template.hbs
+++ b/app/components/modal-about/template.hbs
@@ -79,7 +79,7 @@
       {{t "modalAboutComponent.linuxImageList"}}
     </td>
     <td data-title="download-linux-imgae-list">
-      <button class="btn bg-transparent p-0" {{action "downloadLinuxImages"}}>
+      <button class="btn bg-transparent p-0" type="button" {{action "downloadLinuxImages"}}>
         {{t "generic.download"}}
       </button>
     </td>
@@ -89,7 +89,7 @@
       {{t "modalAboutComponent.windowsImageList"}}
     </td>
     <td data-title="download-windows-imgae-list">
-      <button class="btn bg-transparent p-0" {{action "downloadWindowsImages"}}>
+      <button class="btn bg-transparent p-0" type="button" {{action "downloadWindowsImages"}}>
         {{t "generic.download"}}
       </button>
     </td>
@@ -97,7 +97,7 @@
 </table>
 
 <div class="footer-actions">
-  <button {{action "cancel"}} class="btn bg-primary">
+  <button class="btn bg-primary" type="button" {{action "cancel"}}>
     {{t "generic.closeModal"}}
   </button>
 </div>
diff --git a/app/components/modal-delete-group-role-bindings/component.js b/app/components/modal-delete-group-role-bindings/component.js
index 19cd445ea..cd6bfe091 100644
--- a/app/components/modal-delete-group-role-bindings/component.js
+++ b/app/components/modal-delete-group-role-bindings/component.js
@@ -11,7 +11,7 @@ export default Component.extend(ModalBase, {
   growl:          service(),
 
   layout,
-  classNames:     ['medium-modal'],
+  classNames: ['medium-modal'],
 
   mappedGroupRoleBindingNamesIds: alias('modalService.modalOpts.model.mappedGroupRoleBindingNamesIds'),
 
diff --git a/app/components/modal-edit-apikey/component.js b/app/components/modal-edit-apikey/component.js
index 63a902d3b..518b3e6b4 100644
--- a/app/components/modal-edit-apikey/component.js
+++ b/app/components/modal-edit-apikey/component.js
@@ -160,7 +160,7 @@ export default Component.extend(ModalBase, NewOrEdit, {
     return ttlUnits.slice(0, indexOfUnit + 1);
   }),
 
-  allClusters: computed('scope.allClusters.@each.{id}', function() {
+  allClusters: computed('scope.allClusters.@each.id', function() {
     const allClusters = get(this, 'scope.allClusters');
 
     return allClusters.map((c) => {
diff --git a/app/components/modal-edit-apikey/template.hbs b/app/components/modal-edit-apikey/template.hbs
index a5e459832..81130ecdc 100644
--- a/app/components/modal-edit-apikey/template.hbs
+++ b/app/components/modal-edit-apikey/template.hbs
@@ -63,8 +63,7 @@
 
     <div class="footer-actions">
       <button
-        {{action "cancel"}}
-        class="bg-primary"
+        class="bg-primary" type="button" {{action "cancel"}}
       >
         {{t "generic.closeModal"}}
       </button>
diff --git a/app/components/modal-edit-host/component.js b/app/components/modal-edit-host/component.js
index c5b5deb4e..b490284bb 100644
--- a/app/components/modal-edit-host/component.js
+++ b/app/components/modal-edit-host/component.js
@@ -8,7 +8,7 @@ import layout from './template';
 import { inject as service } from '@ember/service';
 
 export default Component.extend(ModalBase, NewOrEdit, {
-  scope:  service(),
+  scope: service(),
 
   layout,
   classNames:    ['large-modal'],
diff --git a/app/components/modal-edit-namespace/component.js b/app/components/modal-edit-namespace/component.js
index fcb820c51..8ee2fefbb 100644
--- a/app/components/modal-edit-namespace/component.js
+++ b/app/components/modal-edit-namespace/component.js
@@ -26,7 +26,7 @@ export default Component.extend(ModalBase, NewOrEdit, {
   beforeSaveModel:         null,
   initAutoInjectionStatus: null,
 
-  originalModel:  alias('modalService.modalOpts'),
+  originalModel: alias('modalService.modalOpts'),
   init() {
     this._super(...arguments);
 
@@ -103,25 +103,25 @@ export default Component.extend(ModalBase, NewOrEdit, {
     set(this, 'primaryResource.tags', get(this, 'tags').split(',') || []);
   }),
 
-  canMoveNamespace: computed('primaryResource.actionLinks.{move}', function() {
+  canMoveNamespace: computed('primaryResource.actionLinks.move', function() {
     return !!get(this, 'primaryResource.actionLinks.move');
   }),
 
-  projectLimit: computed('primaryResource.resourceQuota.{limit}', 'primaryResource.projectId', function() {
+  projectLimit: computed('allProjects', 'primaryResource.projectId', 'primaryResource.resourceQuota.limit', function() {
     const projectId = get(this, 'primaryResource.projectId');
     const project   = get(this, 'allProjects').findBy('id', projectId);
 
     return get(project, 'resourceQuota.limit');
   }),
 
-  projectUsedLimit: computed('primaryResource.resourceQuota.{limit}', 'primaryResource.projectId', function() {
+  projectUsedLimit: computed('allProjects', 'primaryResource.projectId', 'primaryResource.resourceQuota.limit', function() {
     const projectId = get(this, 'primaryResource.projectId');
     const project   = get(this, 'allProjects').findBy('id', projectId);
 
     return get(project, 'resourceQuota.usedLimit');
   }),
 
-  nsDefaultQuota: computed('primaryResource.resourceQuota.{limit}', 'primaryResource.projectId', function() {
+  nsDefaultQuota: computed('allProjects', 'primaryResource.projectId', 'primaryResource.resourceQuota.limit', function() {
     const projectId = get(this, 'primaryResource.projectId');
     const project   = get(this, 'allProjects').findBy('id', projectId);
 
diff --git a/app/components/modal-edit-node-pool/component.js b/app/components/modal-edit-node-pool/component.js
index b0ca1af29..e15b82a7f 100644
--- a/app/components/modal-edit-node-pool/component.js
+++ b/app/components/modal-edit-node-pool/component.js
@@ -9,7 +9,7 @@ export default Component.extend(ModalBase, {
   classNames:    ['large-modal'],
   model:         null,
 
-  originalModel:      alias('modalService.modalOpts'),
+  originalModel: alias('modalService.modalOpts'),
   init() {
     this._super(...arguments);
 
diff --git a/app/components/modal-edit-setting/component.js b/app/components/modal-edit-setting/component.js
index e0117404a..aaf7dc8fa 100644
--- a/app/components/modal-edit-setting/component.js
+++ b/app/components/modal-edit-setting/component.js
@@ -33,7 +33,7 @@ export default Component.extend(ModalBase, {
   formattedValue:    null,
   removing:          false,
 
-  model:             alias('modalService.modalOpts'),
+  model: alias('modalService.modalOpts'),
 
   init() {
     this._super(...arguments);
diff --git a/app/components/modal-feedback/component.js b/app/components/modal-feedback/component.js
index 7a2e91a95..05d36399a 100644
--- a/app/components/modal-feedback/component.js
+++ b/app/components/modal-feedback/component.js
@@ -17,33 +17,8 @@ export default Component.extend(ModalBase, {
 
   init() {
     this._super(...arguments);
-    let self = this;
 
-    let opt = JSON.parse(this.get(`settings.${ C.SETTING.FEEDBACK_FORM }`) || '{}');
-
-    scheduleOnce('afterRender', this, () => {
-      loadScript('//js.hsforms.net/forms/v2.js').then(() => {
-        window['hbspt'].forms.create({
-          css:         '',
-          portalId:    opt.portalId, // '468859',
-          formId:      opt.formId, // 'bfca2d1d-ed50-4ed7-a582-3f0440f236ca',
-          target:      '#feedback-form',
-          errorClass:  'form-control',
-          onFormReady() {
-            self.styleForm();
-            $('INPUT[name=rancher_account_id]')[0].value = self.get('access.principal.id');// eslint-disable-line
-            $('INPUT[name=github_username]')[0].value = self.get('access.identity.login');// eslint-disable-line
-            self.set('loading', false);
-          },
-          onFormSubmit() {
-            self.styleForm();
-            later(() =>  {
-              self.send('sent');
-            }, 1000);
-          },
-        });
-      });
-    });
+    scheduleOnce('afterRender', this, 'setupForm', JSON.parse(this.get(`settings.${ C.SETTING.FEEDBACK_FORM }`) || '{}'));
   },
 
   actions: {
@@ -81,4 +56,30 @@ export default Component.extend(ModalBase, {
     });
   },
 
+  setupForm(opt) {
+    const self = this;
+
+    loadScript('//js.hsforms.net/forms/v2.js').then(() => {
+      window['hbspt'].forms.create({
+        css:         '',
+        portalId:    opt.portalId, // '468859',
+        formId:      opt.formId, // 'bfca2d1d-ed50-4ed7-a582-3f0440f236ca',
+        target:      '#feedback-form',
+        errorClass:  'form-control',
+        onFormReady() {
+          self.styleForm();
+          $('INPUT[name=rancher_account_id]')[0].value = self.get('access.principal.id');// eslint-disable-line
+          $('INPUT[name=github_username]')[0].value = self.get('access.identity.login');// eslint-disable-line
+          self.set('loading', false);
+        },
+        onFormSubmit() {
+          self.styleForm();
+          later(() =>  {
+            self.send('sent');
+          }, 1000);
+        },
+      });
+    });
+  },
+
 });
diff --git a/app/components/modal-feedback/template.hbs b/app/components/modal-feedback/template.hbs
index b40828e73..2d61809b5 100644
--- a/app/components/modal-feedback/template.hbs
+++ b/app/components/modal-feedback/template.hbs
@@ -7,6 +7,6 @@
   </div>
 
   <div class="footer-actions pt-20">
-    <button {{action "submit"}} class="btn bg-primary" disabled={{loading}}>{{t 'modalFeedback.send'}}</button>
+    <button class="btn bg-primary" disabled={{loading}} type="button" {{action "submit"}}>{{t 'modalFeedback.send'}}</button>
   </div>
 </div>
diff --git a/app/components/modal-kubeconfig/template.hbs b/app/components/modal-kubeconfig/template.hbs
index c785c819c..760cc8878 100644
--- a/app/components/modal-kubeconfig/template.hbs
+++ b/app/components/modal-kubeconfig/template.hbs
@@ -10,5 +10,5 @@
   {{/if}}
 </section>
 <div class="footer-actions">
-  <button {{action "cancel"}} class="btn bg-primary close-kubeconfig">{{t 'generic.closeModal'}}</button>
+  <button class="btn bg-primary close-kubeconfig" type="button" {{action "cancel"}}>{{t 'generic.closeModal'}}</button>
 </div>
diff --git a/app/components/modal-kubectl/template.hbs b/app/components/modal-kubectl/template.hbs
index 70ff8f6f1..e3f320b23 100644
--- a/app/components/modal-kubectl/template.hbs
+++ b/app/components/modal-kubectl/template.hbs
@@ -7,5 +7,5 @@
 }}
 
 <div class="footer-actions">
-  <button {{action "cancel"}} class="btn bg-primary">{{t 'generic.closeModal'}}</button>
+  <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t 'generic.closeModal'}}</button>
 </div>
diff --git a/app/components/modal-new-vct/component.js b/app/components/modal-new-vct/component.js
index d4020d91d..2850741d5 100644
--- a/app/components/modal-new-vct/component.js
+++ b/app/components/modal-new-vct/component.js
@@ -6,9 +6,9 @@ import layout from './template';
 
 export default Component.extend(ModalBase, {
   layout,
-  classNames:      ['large-modal'],
+  classNames: ['large-modal'],
 
-  editing:         true,
+  editing: true,
 
   callback:        alias('modalService.modalOpts.callback'),
   namespace:       alias('modalService.modalOpts.namespace'),
diff --git a/app/components/modal-restore-backup/component.js b/app/components/modal-restore-backup/component.js
index ee12fb9f4..8ff33c506 100644
--- a/app/components/modal-restore-backup/component.js
+++ b/app/components/modal-restore-backup/component.js
@@ -95,7 +95,7 @@ export default Component.extend(ModalBase, {
     setProperties(this, {
       backupId,
       restoreRkeConfig,
-      errors:   [],
+      errors: [],
     });
   },
 
diff --git a/app/components/modal-restore-backup/template.hbs b/app/components/modal-restore-backup/template.hbs
index 284c6fb4f..25b511a39 100644
--- a/app/components/modal-restore-backup/template.hbs
+++ b/app/components/modal-restore-backup/template.hbs
@@ -39,7 +39,7 @@
         </select>
       {{/if}}
     </div>
-    {{#if (not loadingBackups)}}
+    {{#unless loadingBackups}}
       <div class="col span-5">
         <label
           class="acc-label"
@@ -48,15 +48,15 @@
           {{t "modalRestoreBackup.type.label"}}
         </label>
         <div class="radio {{if restorationTypeDisabled "text-muted"}}">
-          {{radio-button selection=restoreRkeConfig value="etcd" disabled=restorationTypeDisabled}} 
+          {{radio-button selection=restoreRkeConfig value="etcd" disabled=restorationTypeDisabled}}
           {{t "modalRestoreBackup.type.etcd"}}
         </div>
         <div class="radio {{if k8sVersionRadioDisabled "text-muted"}}">
-          {{radio-button selection=restoreRkeConfig value="kubernetesVersion" disabled=k8sVersionRadioDisabled}} 
+          {{radio-button selection=restoreRkeConfig value="kubernetesVersion" disabled=k8sVersionRadioDisabled}}
           {{t "modalRestoreBackup.type.k8sVersion"}}
         </div>
         <div class="radio {{if k8sVersionRadioDisabled "text-muted"}}">
-          {{radio-button selection=restoreRkeConfig value="all" disabled=k8sVersionRadioDisabled}} 
+          {{radio-button selection=restoreRkeConfig value="all" disabled=k8sVersionRadioDisabled}}
           {{t "modalRestoreBackup.type.etcdAndK8sVersion"}}
         </div>
         {{#if k8sVersionDisabled}}
@@ -66,7 +66,7 @@
           }}
         {{/if}}
       </div>
-    {{/if}}
+    {{/unless}}
   </div>
 </section>
 
diff --git a/app/components/modal-rollback-app/component.js b/app/components/modal-rollback-app/component.js
index 2ba6f0247..876093fbd 100644
--- a/app/components/modal-rollback-app/component.js
+++ b/app/components/modal-rollback-app/component.js
@@ -79,7 +79,7 @@ export default Component.extend(ModalBase, {
       });
   }),
 
-  current: computed('choices.[]', function() {
+  current: computed('choices.[]', 'choices.firstObject.data', function() {
     return get(this, 'choices.firstObject.data');
   }),
 
@@ -87,7 +87,7 @@ export default Component.extend(ModalBase, {
     return get(this, 'revisions').findBy('name', get(this, 'revisionId'));
   }),
 
-  diff: computed('current', 'selected', function() {
+  diff: computed('current.status', 'selected.status', function() {
     if (get(this, 'current') && get(this, 'selected')) {
       let left = get(this, 'current.status');
       let right = get(this, 'selected.status');
@@ -97,5 +97,7 @@ export default Component.extend(ModalBase, {
 
       return jsondiffpatch.formatters.html.format(delta, left).htmlSafe();
     }
+
+    return null;
   }),
 });
diff --git a/app/components/modal-rollback-mc-app/component.js b/app/components/modal-rollback-mc-app/component.js
index db79eaca8..7a5cdce0d 100644
--- a/app/components/modal-rollback-mc-app/component.js
+++ b/app/components/modal-rollback-mc-app/component.js
@@ -66,7 +66,7 @@ export default Component.extend(ModalBase, {
   }),
 
 
-  currentMultiClusterAppRevision: computed('choices.[]', 'revisionId', 'selectedMultiClusterAppRevision', function() {
+  currentMultiClusterAppRevision: computed('choices.[]', 'choices.firstObject.data', 'revisionId', 'selectedMultiClusterAppRevision', function() {
     return get(this, 'choices.firstObject.data');
   }),
 
@@ -82,6 +82,8 @@ export default Component.extend(ModalBase, {
 
       return this.generateAnswersJsonDiff(currentMultiClusterAppRevision, selectedMultiClusterAppRevision);
     }
+
+    return null;
   }),
 
   initModelWithClone() {
diff --git a/app/components/modal-rollback-service/component.js b/app/components/modal-rollback-service/component.js
index a283e7b37..08ab20cd9 100644
--- a/app/components/modal-rollback-service/component.js
+++ b/app/components/modal-rollback-service/component.js
@@ -84,7 +84,7 @@ export default Component.extend(ModalBase, {
     },
   },
 
-  choices: computed('revisions.[]', function() {
+  choices: computed('model.workloadAnnotations', 'revisions.[]', function() {
     return (get(this, 'revisions') || [])
       .sortBy('createdTS')
       .reverse()
@@ -102,7 +102,7 @@ export default Component.extend(ModalBase, {
       });
   }),
 
-  current: computed('revisions.@each.workloadAnnotations', function() {
+  current: computed('model.workloadAnnotations', 'revisions.@each.workloadAnnotations', function() {
     const currentRevision = get(this, 'model.workloadAnnotations')[C.LABEL.DEPLOYMENT_REVISION];
 
     return (get(this, 'revisions') || []).find((r) => get(r, 'workloadAnnotations')[C.LABEL.DEPLOYMENT_REVISION] === currentRevision);
@@ -112,7 +112,7 @@ export default Component.extend(ModalBase, {
     return (get(this, 'revisions') || []).findBy('id', get(this, 'revisionId'));
   }),
 
-  diff: computed('current', 'selected', function() {
+  diff: computed('current', 'keys', 'selected', function() {
     if (get(this, 'current') && get(this, 'selected')) {
       let left = sanitize(get(this, 'current'), get(this, 'keys'));
       let right = sanitize(get(this, 'selected'), get(this, 'keys'));
@@ -122,5 +122,7 @@ export default Component.extend(ModalBase, {
 
       return jsondiffpatch.formatters.html.format(delta, left).htmlSafe();
     }
+
+    return null;
   }),
 });
diff --git a/app/components/modal-shortcuts/template.hbs b/app/components/modal-shortcuts/template.hbs
index 4d7942585..f97eae8c1 100644
--- a/app/components/modal-shortcuts/template.hbs
+++ b/app/components/modal-shortcuts/template.hbs
@@ -68,5 +68,5 @@
 </div>
 
 <div class="footer-actions pb-20">
-  <button {{action "cancel"}} class="btn bg-primary">{{t "generic.closeModal"}}</button>
+  <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t "generic.closeModal"}}</button>
 </div>
diff --git a/app/components/modal-telemetry/template.hbs b/app/components/modal-telemetry/template.hbs
index a73f071b7..d6791f97a 100644
--- a/app/components/modal-telemetry/template.hbs
+++ b/app/components/modal-telemetry/template.hbs
@@ -22,6 +22,6 @@
   </div>
 
   <div class="footer-actions">
-    <button {{action "cancel"}} class="btn bg-primary">{{t 'modalWelcome.closeModal'}}</button>
+    <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t 'modalWelcome.closeModal'}}</button>
   </div>
 </div>
diff --git a/app/components/modal-wechat/template.hbs b/app/components/modal-wechat/template.hbs
index b9516e957..06fcfb24e 100644
--- a/app/components/modal-wechat/template.hbs
+++ b/app/components/modal-wechat/template.hbs
@@ -10,5 +10,5 @@
 </div>
 
 <div class="footer-actions">
-<button {{action "cancel"}} class="btn btn-primary">{{t 'generic.closeModal'}}</button>
+<button class="btn btn-primary" type="button" {{action "cancel"}}>{{t 'generic.closeModal'}}</button>
 </div>
diff --git a/app/components/modal-whats-new/template.hbs b/app/components/modal-whats-new/template.hbs
index 80a147105..2377f2d09 100644
--- a/app/components/modal-whats-new/template.hbs
+++ b/app/components/modal-whats-new/template.hbs
@@ -40,6 +40,6 @@
   </ul>
 
   <div class="footer-actions">
-    <button {{action "cancel"}} class="btn bg-primary">{{t 'generic.closeModal'}}</button>
+    <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t 'generic.closeModal'}}</button>
   </div>
 </div>
diff --git a/app/components/namespace-list/component.js b/app/components/namespace-list/component.js
index abcff57a5..952d1e776 100644
--- a/app/components/namespace-list/component.js
+++ b/app/components/namespace-list/component.js
@@ -43,5 +43,5 @@ export default Component.extend({
   extraSearchFields: [
     'displayUserLabelStrings',
   ],
-  rows:       alias('model'),
+  rows: alias('model'),
 });
diff --git a/app/components/new-catalog/component.js b/app/components/new-catalog/component.js
index 7e852efff..eb24d4a9b 100644
--- a/app/components/new-catalog/component.js
+++ b/app/components/new-catalog/component.js
@@ -67,7 +67,7 @@ export default Component.extend(NewOrEdit, CatalogApp, ChildHook, {
   selectedFileContetnt:     null,
   editable:              { selectedTemplateUrl: null },
 
-  isGKE:                    alias('scope.currentCluster.isGKE'),
+  isGKE: alias('scope.currentCluster.isGKE'),
 
   primaryResource:          alias('namespaceResource'),
   editing:                  notEmpty('catalogApp.id'),
@@ -77,30 +77,7 @@ export default Component.extend(NewOrEdit, CatalogApp, ChildHook, {
     this._super(...arguments);
     set(this, 'selectedTemplateModel', null);
 
-    scheduleOnce('afterRender', () => {
-      if ( get(this, 'selectedTemplateUrl') ) {
-        if (this.catalogTemplate) {
-          this.initTemplateModel(this.catalogTemplate);
-        } else {
-          this.templateChanged();
-        }
-      } else {
-        var def   = get(this, 'templateResource.defaultVersion');
-        var links = get(this, 'versionLinks');
-        var app   = get(this, 'catalogApp');
-
-        if (get(app, 'id') && !get(this, 'upgrade')) {
-          def = get(app, 'externalIdInfo.version');
-        }
-
-        if (links[def]) {
-          set(this, 'selectedTemplateUrl', links[def]);
-        } else {
-          set(this, 'selectedTemplateUrl', null);
-        }
-      }
-      set(this, 'editable.selectedTemplateUrl', get(this, 'selectedTemplateUrl'));
-    });
+    scheduleOnce('afterRender', this, 'setupComponent');
   },
 
   didRender() {
@@ -320,7 +297,7 @@ export default Component.extend(NewOrEdit, CatalogApp, ChildHook, {
       }
     });
 
-    template.customAnswers = customAnswers;
+    set(template, 'customAnswers', customAnswers);
   },
 
   validate() {
@@ -445,4 +422,29 @@ export default Component.extend(NewOrEdit, CatalogApp, ChildHook, {
 
     return !!questions.some((question) => get(question, 'type') === 'password' && !!isNumeric(get(question, 'answer')) && get(question, 'answer') !== '');
   },
+
+  setupComponent() {
+    if ( get(this, 'selectedTemplateUrl') ) {
+      if (this.catalogTemplate) {
+        this.initTemplateModel(this.catalogTemplate);
+      } else {
+        this.templateChanged();
+      }
+    } else {
+      var def   = get(this, 'templateResource.defaultVersion');
+      var links = get(this, 'versionLinks');
+      var app   = get(this, 'catalogApp');
+
+      if (get(app, 'id') && !get(this, 'upgrade')) {
+        def = get(app, 'externalIdInfo.version');
+      }
+
+      if (links[def]) {
+        set(this, 'selectedTemplateUrl', links[def]);
+      } else {
+        set(this, 'selectedTemplateUrl', null);
+      }
+    }
+    set(this, 'editable.selectedTemplateUrl', get(this, 'selectedTemplateUrl'));
+  }
 });
diff --git a/app/components/new-catalog/template.hbs b/app/components/new-catalog/template.hbs
index 33759f369..f4bade5b0 100644
--- a/app/components/new-catalog/template.hbs
+++ b/app/components/new-catalog/template.hbs
@@ -49,7 +49,7 @@
         </h1>
         <p>{{templateResource.description}}</p>
         <div class="row">
-          <button class="btn btn-sm bg-transparent pl-0" {{action "toogleDetailedDescriptions"}}>
+          <button class="btn btn-sm bg-transparent pl-0" type="button" {{action "toogleDetailedDescriptions"}}>
             {{t "newCatalog.seeMore"}}
           </button>
         </div>
@@ -303,7 +303,7 @@
   </div>
 {{else}}
   <div class="footer-actions">
-    <button {{action "cancel"}} class="btn bg-transparent">
+    <button class="btn bg-transparent" type="button" {{action "cancel"}}>
       {{t "saveCancel.cancel"}}
     </button>
   </div>
diff --git a/app/components/new-edit-project/component.js b/app/components/new-edit-project/component.js
index 5787be494..a852669a7 100644
--- a/app/components/new-edit-project/component.js
+++ b/app/components/new-edit-project/component.js
@@ -73,7 +73,7 @@ export default Component.extend(NewOrEdit, ChildHook, {
   pspDidChange: observer('podSecurityPolicyTemplateId', function() {
     set(this, 'model.project.podSecurityPolicyTemplateId', get(this, 'podSecurityPolicyTemplateId'));
   }),
-  creator:         computed('primaryResource.creatorId', function() {
+  creator:         computed('editing', 'model.{me,users}', 'primaryResource.creatorId', function() {
     let cid = get(this, 'primaryResource.creatorId');
     let creator = null;
 
diff --git a/app/components/node-selector-row/template.hbs b/app/components/node-selector-row/template.hbs
index 780689e4c..052dbe0e0 100644
--- a/app/components/node-selector-row/template.hbs
+++ b/app/components/node-selector-row/template.hbs
@@ -35,6 +35,6 @@
 <td>&nbsp;</td>
 {{#if editing}}
   <div class="input-group-btn">
-    <button class="btn bg-primary btn-sm" {{action "removeRule" rule}}><i class="icon icon-minus"/></button>
+    <button class="btn bg-primary btn-sm" type="button" {{action "removeRule" rule}}><i class="icon icon-minus"/></button>
   </div>
 {{/if}}
diff --git a/app/components/node-selector/template.hbs b/app/components/node-selector/template.hbs
index 95ebd7030..ffcb388e8 100644
--- a/app/components/node-selector/template.hbs
+++ b/app/components/node-selector/template.hbs
@@ -37,11 +37,11 @@
 {{/if}}
 
 {{#if editing}}
-  <button class="btn bg-link icon-btn" {{action "addRule"}}>
+  <button class="btn bg-link icon-btn" type="button" {{action "addRule"}}>
     <span class="darken"><i class="icon icon-plus text-small"/></span>
     <span>{{t "formScheduling.addRule"}}</span>
   </button>
-  <button class="btn bg-transparent btn-sm" {{action "addRule" true}}>
+  <button class="btn bg-transparent btn-sm" type="button" {{action "addRule" true}}>
     {{t "formScheduling.addCustom"}}
   </button>
 {{/if}}
diff --git a/app/components/notifier/modal-new-edit/component.js b/app/components/notifier/modal-new-edit/component.js
index 28f671249..0ff4eb1cb 100644
--- a/app/components/notifier/modal-new-edit/component.js
+++ b/app/components/notifier/modal-new-edit/component.js
@@ -74,7 +74,7 @@ export default Component.extend(ModalBase, NewOrEdit, {
   intl:           service(),
 
   layout,
-  classNames:     ['generic', 'large-modal'],
+  classNames: ['generic', 'large-modal'],
 
   modelMap:       null,
   errors:         null,
@@ -162,7 +162,7 @@ export default Component.extend(ModalBase, NewOrEdit, {
       return 'generic.save';
     } else if (mode === 'clone') {
       return 'notifierPage.clone';
-    } else if (mode === 'add') {
+    } else {
       return 'generic.add';
     }
   }),
diff --git a/app/components/notifier/modal-new-edit/template.hbs b/app/components/notifier/modal-new-edit/template.hbs
index f59557f98..4800c6b66 100644
--- a/app/components/notifier/modal-new-edit/template.hbs
+++ b/app/components/notifier/modal-new-edit/template.hbs
@@ -579,25 +579,22 @@
       {{#if testing}}
         <button
           style="color: white;"
-          class="btn bg-info btn-disabled"
-          {{action "test"}}
+          class="btn bg-info btn-disabled" type="button" {{action "test"}}
         >
           <i class="icon icon-spinner icon-spin"></i>{{t "notifierPage.testAction.testing"}}
         </button>
       {{else}}
         {{#if tested}}
           <button
-            {{action "test"}}
             class="btn  btn-disabled {{if testOk "bg-success" "bg-error"}}"
-            style="color: white;"
+            style="color: white;" type="button" {{action "test"}}
           >
             {{if testOk (t "notifierPage.testAction.testOk") (t "notifierPage.testAction.testFailed")}}
           </button>
         {{else}}
           <button
-            {{action "test"}}
             class="btn bg-info"
-            style="color: white;"
+            style="color: white;" type="button" {{action "test"}}
           >
             {{t "notifierPage.testAction.test"}}
           </button>
diff --git a/app/components/notifier/notifier-table/component.js b/app/components/notifier/notifier-table/component.js
index 66a4eded3..77dcba396 100644
--- a/app/components/notifier/notifier-table/component.js
+++ b/app/components/notifier/notifier-table/component.js
@@ -42,7 +42,7 @@ export default Component.extend({
   headers,
 
   clusterId:         reads('scope.currentCluster.id'),
-  filteredNotifiers: computed('model.@each.{clusterId}', 'clusterId', function() {
+  filteredNotifiers: computed('model.@each.clusterId', 'clusterId', function() {
     const data = this.get('model') || [];
     const clusterId = get(this, 'clusterId')
 
diff --git a/app/components/page-footer/component.js b/app/components/page-footer/component.js
index cc52cfce2..9c118bd10 100644
--- a/app/components/page-footer/component.js
+++ b/app/components/page-footer/component.js
@@ -6,7 +6,7 @@ import C from 'ui/utils/constants';
 import layout from './template';
 
 export default Component.extend({
-  intl:         service(),
+  intl: service(),
 
   settings:     service(),
   prefs:        service(),
diff --git a/app/components/page-footer/template.hbs b/app/components/page-footer/template.hbs
index 16c6ffb45..a79686a8d 100644
--- a/app/components/page-footer/template.hbs
+++ b/app/components/page-footer/template.hbs
@@ -1,72 +1,107 @@
-<a href="#" class="btn btn-sm bg-transparent" {{action "showAbout"}} aria-label="About Rancher">
-  {{ displayVersion }}
+<a
+  href="#"
+  class="btn btn-sm bg-transparent"
+  aria-label="About Rancher"
+  {{action "showAbout"}}
+>
+  {{displayVersion}}
 </a>
-
 {{#if settings.isRancher}}
   {{#if projectId}}
-    <a href="{{href-to "authenticated.project.help" projectId}}" role="button" class="btn btn-sm bg-transparent">
+    <a
+      href="{{href-to "authenticated.project.help" projectId}}"
+      role="button"
+      class="btn btn-sm bg-transparent"
+    >
       {{t "pageFooter.help"}}
     </a>
   {{/if}}
-  <a role="button" class="btn btn-sm bg-transparent" target="blank" rel="noreferrer noopener" href="{{settings.docsBase}}">
+  <a
+    role="button"
+    class="btn btn-sm bg-transparent"
+    target="blank"
+    rel="noreferrer noopener"
+    href="{{settings.docsBase}}"
+  >
     {{t "pageFooter.help"}}
   </a>
-  <a role="button" class="btn btn-sm bg-transparent" target="blank" rel="noreferrer noopener" href="{{forumBase}}">
+  <a
+    role="button"
+    class="btn btn-sm bg-transparent"
+    target="blank"
+    rel="noreferrer noopener"
+    href="{{forumBase}}"
+  >
     {{t "pageFooter.forums"}}
   </a>
-  <a role="button" class="btn btn-sm bg-transparent" target="blank" rel="noreferrer noopener" href="{{slackBase}}">
+  <a
+    role="button"
+    class="btn btn-sm bg-transparent"
+    target="blank"
+    rel="noreferrer noopener"
+    href="{{slackBase}}"
+  >
     {{t "pageFooter.slack"}}
   </a>
   {{#if showWechat}}
-    <a role="button" class="btn btn-sm bg-transparent" target="blank" rel="noreferrer noopener" href="{{cnforumBase}}">
+    <a
+      role="button"
+      class="btn btn-sm bg-transparent"
+      target="blank"
+      rel="noreferrer noopener"
+      href="{{cnforumBase}}"
+    >
       {{t "pageFooter.cnforums"}}
     </a>
     <a class="btn btn-sm bg-transparent" {{action "showWechat"}}>
       {{t "modalWechat.wechat"}}
     </a>
   {{/if}}
-  <a role="button" class="btn btn-sm bg-transparent" target="blank" rel="noreferrer noopener" href="{{settings.issueUrl}}">
+  <a
+    role="button"
+    class="btn btn-sm bg-transparent"
+    target="blank"
+    rel="noreferrer noopener"
+    href="{{settings.issueUrl}}"
+  >
     {{t "pageFooter.issues"}}
   </a>
 {{/if}}
-
 <div class="pull-right">
   <div class="compose-download inline-block dropup">
     {{#hover-dropdown
-       verticalPosition="above"
-       horizontalPosition="right"
-       renderInPlace=true
-       as |dd|
+      verticalPosition="above"
+      horizontalPosition="right"
+      renderInPlace=true as |dd|
     }}
-      {{#dd.trigger
-         class="hand btn btn-sm bg-transparent"
-      }}
-        <i class="icon icon-download"></i> {{t "pageFooter.download.link"}} <i class="icon icon-chevron-down"></i>
-      {{/dd.trigger}}
-
-      {{#dd.content class="text-right"}}
-        <li>
+      <dd.Trigger class="hand btn btn-sm bg-transparent">
+        <i class="icon icon-download"></i>
+        {{t "pageFooter.download.link"}}
+        <i class="icon icon-chevron-down"></i>
+      </dd.Trigger>
+      <dd.Content class="text-right">
+        <li {{action dd.actions.close}}>
           <a href="{{cli.darwin}}">
-            {{t "pageFooter.download.mac"}} <i class="icon icon-fw icon-apple"></i>
+            {{t "pageFooter.download.mac"}}
+            <i class="icon icon-fw icon-apple"></i>
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a href="{{cli.windows}}">
-            {{t "pageFooter.download.windows"}} <i class="icon icon-fw icon-windows"></i>
+            {{t "pageFooter.download.windows"}}
+            <i class="icon icon-fw icon-windows"></i>
           </a>
         </li>
-        <li>
+        <li {{action dd.actions.close}}>
           <a href="{{cli.linux}}">
-            {{t "pageFooter.download.linux"}} <i class="icon icon-fw icon-linux"></i>
+            {{t "pageFooter.download.linux"}}
+            <i class="icon icon-fw icon-linux"></i>
           </a>
         </li>
-      {{/dd.content}}
+      </dd.Content>
     {{/hover-dropdown}}
   </div>
 </div>
 <div class="pull-right">
-  {{language-dropdown
-    dropdownVertPosition="above"
-    classNames="dropup"
-  }}
-</div>
+  {{language-dropdown dropdownVertPosition="above" classNames="dropup"}}
+</div>
\ No newline at end of file
diff --git a/app/components/page-header-project/component.js b/app/components/page-header-project/component.js
index d111df5bc..6dbee2966 100644
--- a/app/components/page-header-project/component.js
+++ b/app/components/page-header-project/component.js
@@ -26,7 +26,7 @@ export default Component.extend(ThrottledResize, {
   router:              service(),
 
   layout,
-  pageScope:           null,
+  pageScope: null,
 
   tagName:             'LI',
   classNames:          ['dropdown', 'nav-item', 'nav-cluster'],
@@ -250,7 +250,7 @@ export default Component.extend(ThrottledResize, {
     return out;
   }),
 
-  projectSearchResults: computed('searchInput', 'byCluster.[]', function() {
+  projectSearchResults: computed('byCluster.[]', 'projectChoices', 'searchInput', function() {
     const needle = get(this, 'searchInput');
     const out = [];
 
diff --git a/app/components/page-header-project/template.hbs b/app/components/page-header-project/template.hbs
index 3d3055ab0..8b45bbe8d 100644
--- a/app/components/page-header-project/template.hbs
+++ b/app/components/page-header-project/template.hbs
@@ -1,51 +1,64 @@
 {{#hover-dropdown
-   horizontalPosition="left"
-   verticalPosition="below"
-   renderInPlace=true
-   onOpen=(action "onOpen")
-   onClose=(action "onClose")
-   as |dd|
+  horizontalPosition="left"
+  verticalPosition="below"
+  renderInPlace=true
+  onOpen=(action "onOpen")
+  onClose=(action "onClose") as |dd|
 }}
-
-  {{#dd.trigger
-     ariaLabel=(t "nav.projectDropdown.label")
-  }}
-    <a role="button" aria-haspopup="true" class="{{if twoLine "two-line "}}text-white nav-link">
+  <dd.Trigger aria-label={{t "nav.projectDropdown.label"}}>
+    <a
+      role="button"
+      aria-haspopup="true"
+      class="{{if twoLine "two-line "}}text-white nav-link"
+    >
       {{#if (eq pageScope "project")}}
         <div class="clip">
-          <span>{{project.cluster.displayName}}</span>
+          <span>
+            {{project.cluster.displayName}}
+          </span>
         </div>
         <div class="pl-15 clip text-muted">
-          <span>{{project.displayName}}</span>
+          <span>
+            {{project.displayName}}
+          </span>
         </div>
       {{else if (eq pageScope "cluster")}}
         <div class="clip">
-          <span>{{cluster.displayName}}</span>
+          <span>
+            {{cluster.displayName}}
+          </span>
         </div>
       {{else if (eq pageScope "global")}}
         <div class="clip">
-          <span>{{t "nav.admin.tab"}}</span>
+          <span>
+            {{t "nav.admin.tab"}}
+          </span>
         </div>
       {{else}}
         <div class="clip">
-          <span>{{pageScope}}</span>
+          <span>
+            {{pageScope}}
+          </span>
         </div>
       {{/if}}
-
-      <span class="sr-only">{{t "nav.srToggleDropdown"}}</span>
+      <span class="sr-only">
+        {{t "nav.srToggleDropdown"}}
+      </span>
       <i class="icon icon-chevron-down chevron"></i>
     </a>
-
-  {{/dd.trigger}}
-
-  {{#dd.content
-     class="project-menu"
-     style=menuStyle
-  }}
+  </dd.Trigger>
+  <dd.Content class="project-menu" style={{menuStyle}}>
     <div class="global">
       <ul class="list-unstyled">
-        <li class="item clip {{if (eq pageScope "global") "active selected" "inactive"}}">
-          <a href="{{href-to "global-admin"}}" class="{{if (eq pageScope "global") "active selected" "inactive"}}">
+        <li
+          class="item clip
+            {{if (eq pageScope "global") "active selected" "inactive"}}"
+          {{action dd.actions.close}}
+        >
+          <a
+            href="{{href-to "global-admin"}}"
+            class="{{if (eq pageScope "global") "active selected" "inactive"}}"
+          >
             {{t "nav.admin.tab"}}
           </a>
         </li>
@@ -58,44 +71,50 @@
         value=searchInput
       }}
     </div>
-
     <div class="clusters">
       <label class="acc-label">
         {{t "nav.projectDropdown.clusters"}}
       </label>
-
-      <ul class="list-unstyled {{if (eq hoverEntry null) "no-hover-entry"}}" style="{{columnStyle}}">
+      <ul
+        class="list-unstyled {{if (eq hoverEntry null) "no-hover-entry"}}"
+        style="{{columnStyle}}"
+      >
         {{#if searchInput}}
           {{#each clusterSearchResults as |entry|}}
-            <li data-cluster-id="{{entry.cluster.id}}" class="item clip cluster">
-              {{#link-to
-                 "authenticated.cluster"
-                 entry.cluster.id
-                 class="top"
-              }}
+            <li
+              data-cluster-id="{{entry.cluster.id}}"
+              class="item clip cluster"
+              {{action dd.actions.close}}
+            >
+              {{#link-to "authenticated.cluster" entry.cluster.id class="top"}}
                 {{entry.searchMatch}}
               {{/link-to}}
-              <p class="state">{{entry.cluster.displayState}}</p>
+              <p class="state">
+                {{entry.cluster.displayState}}
+              </p>
             </li>
           {{else}}
             <li class="text-muted p-10">
-              {{t "nav.projectDropdown.clustersNoMatch" searchInput=searchInput}}
+              {{t "nav.projectDropdown.clustersNoMatch" searchInput=searchInput
+              }}
             </li>
           {{/each}}
         {{else}}
           {{#each byCluster as |entry|}}
             <li
               data-cluster-id={{entry.cluster.id}}
-              class="item clip cluster {{if entry.active "active" "inactive"}} {{if (eq hoverEntry entry) "hover"}}"
+              class="item clip cluster
+                {{if entry.active "active" "inactive"}}
+
+                {{if (eq hoverEntry entry) "hover"}}"
+              {{action dd.actions.close}}
             >
-              {{#link-to
-                 "authenticated.cluster"
-                 entry.cluster.id
-                 class="top"
-              }}
+              {{#link-to "authenticated.cluster" entry.cluster.id class="top"}}
                 {{entry.cluster.displayName}}
               {{/link-to}}
-              <p class="state">{{entry.cluster.displayState}}</p>
+              <p class="state">
+                {{entry.cluster.displayState}}
+              </p>
             </li>
           {{else}}
             <li class="text-muted p-10">
@@ -105,52 +124,57 @@
         {{/if}}
       </ul>
     </div>
-
     <div class="projects">
-      {{#if (or searchInput (not clusterEntry)) }}
+      {{#if (or searchInput (not clusterEntry))}}
         <label class="acc-label">
           {{t "nav.projectDropdown.projects"}}
         </label>
       {{else}}
         <label class="acc-label">
-          {{t "nav.projectDropdown.projectsIn" cluster=clusterEntry.cluster.displayName}}
+          {{t
+            "nav.projectDropdown.projectsIn"
+            cluster=clusterEntry.cluster.displayName
+          }}
         </label>
       {{/if}}
-
       <ul class="list-unstyled" style="{{columnStyle}}">
         {{#if searchInput}}
           {{#each projectSearchResults as |entry|}}
-            <li class="item clip project {{unless entry.project.isReady "not-ready"}}">
-              {{#link-to
-                 "authenticated.project"
-                 entry.project.id
-                 class="top"
-              }}
+            <li
+              class="item clip project
+                {{unless entry.project.isReady "not-ready"}}"
+              {{action dd.actions.close}}
+            >
+              {{#link-to "authenticated.project" entry.project.id class="top"}}
                 {{entry.searchMatch}}
               {{/link-to}}
               <p class="state">
-                {{t "nav.projectDropdown.projectInCluster" cluster=entry.cluster.displayName}}
-                {{~#unless entry.project.isReady~}}
-                , {{t "nav.projectDropdown.projectNotReady"}}
+                {{t
+                  "nav.projectDropdown.projectInCluster"
+                  cluster=entry.cluster.displayName
+                }}
+                {{#unless entry.project.isReady}}
+                  ,{{t "nav.projectDropdown.projectNotReady"}}
                 {{/unless}}
               </p>
             </li>
           {{else}}
             <li class="text-muted p-10">
-              {{t "nav.projectDropdown.projectsNoMatch" searchInput=searchInput}}
+              {{t "nav.projectDropdown.projectsNoMatch" searchInput=searchInput
+              }}
             </li>
           {{/each}}
         {{else if clusterEntry}}
           {{#each clusterEntry.projects as |project|}}
             <li
               data-project-id={{project.id}}
-              class="item clip project {{unless project.isReady "not-ready"}} {{if project.active "active" "inactive"}}"
+              class="item clip project
+                {{unless project.isReady "not-ready"}}
+
+                {{if project.active "active" "inactive"}}"
+              {{action dd.actions.close}}
             >
-              {{#link-to
-                 "authenticated.project"
-                 project.id
-                 class="top"
-              }}
+              {{#link-to "authenticated.project" project.id class="top"}}
                 {{project.displayName}}
               {{/link-to}}
               <p class="state">
@@ -161,7 +185,7 @@
                 {{/if}}
               </p>
             </li>
-        {{else}}
+          {{else}}
             <li class="text-muted p-10">
               {{t "nav.projectDropdown.projectNoData"}}
             </li>
@@ -173,5 +197,5 @@
         {{/if}}
       </ul>
     </div>
-  {{/dd.content}}
-{{/hover-dropdown}}
+  </dd.Content>
+{{/hover-dropdown}}
\ No newline at end of file
diff --git a/app/components/page-header/component.js b/app/components/page-header/component.js
index b9e3fb784..c905bb6e7 100644
--- a/app/components/page-header/component.js
+++ b/app/components/page-header/component.js
@@ -30,14 +30,14 @@ export default Component.extend({
 
   layout,
   // Inputs
-  pageScope:        null,
+  pageScope: null,
 
   // Component options
   tagName:          'header',
   classNames:       ['page-header'],
   dropdownSelector: '.navbar .dropdown',
 
-  stacks:           null,
+  stacks: null,
 
   // This computed property generates the active list of choices to display
   navTree:           null,
@@ -59,47 +59,11 @@ export default Component.extend({
 
     run.once(this, 'updateNavTree');
 
-    run.scheduleOnce('render', () => {
-      // responsive nav 63-87
-      var responsiveNav = document.getElementById('js-responsive-nav');
-
-      var toggleBtn = document.createElement('a');
-
-      toggleBtn.setAttribute('class', 'nav-toggle');
-      responsiveNav.insertBefore(toggleBtn, responsiveNav.firstChild);
-
-      function hasClass(e, t){
-        return (new RegExp(` ${ t } `)).test(` ${ e.className } `)
-      }
-
-      function toggleClass(e, t){
-        var n = ` ${  e.className.replace(/[\t\r\n]/g, ' ')  } `;
-
-        if (hasClass(e, t)){
-          while (n.indexOf(` ${ t } `) >= 0){
-            n = n.replace(` ${ t } `, ' ')
-          }e.className = n.replace(/^\s+|\s+$/g, '')
-        } else {
-          e.className += ` ${  t }`
-        }
-      }
-
-      toggleBtn.onclick = function() {
-        toggleClass(this.parentNode, 'nav-open');
-      }
-
-      var root = document.documentElement;
-
-      root.className = `${ root.className  } js`;
-    });
+    run.scheduleOnce('render', this, this.setupResponsiveNav);
   },
 
   didInsertElement() {
-    run.scheduleOnce('afterRender', this, function() {
-      this.get('router').on('routeWillChange', () => {
-        $('header > nav').removeClass('nav-open');// eslint-disable-line
-      });
-    });
+    run.scheduleOnce('afterRender', this, this.setupTearDown);
   },
 
   shouldUpdateNavTree: observer(
@@ -130,7 +94,7 @@ export default Component.extend({
     return get(this, 'scope.dashboardBase').replace(/\/+$/, '');
   }),
 
-  dashboardLink: computed('pageScope', 'clusterId', 'cluster.isReady', function() {
+  dashboardLink: computed('cluster.isReady', 'clusterId', 'pageScope', 'scope.dashboardLink', function() {
     if ( get(this, 'pageScope') === 'global' || !this.clusterId ) {
       // Only inside a cluster
       return;
@@ -244,4 +208,44 @@ export default Component.extend({
     }
   },
 
+  setupResponsiveNav() {
+    // responsive nav 63-87
+    var responsiveNav = document.getElementById('js-responsive-nav');
+
+    var toggleBtn = document.createElement('a');
+
+    toggleBtn.setAttribute('class', 'nav-toggle');
+    responsiveNav.insertBefore(toggleBtn, responsiveNav.firstChild);
+
+    function hasClass(e, t){
+      return (new RegExp(` ${ t } `)).test(` ${ e.className } `)
+    }
+
+    function toggleClass(e, t){
+      var n = ` ${  e.className.replace(/[\t\r\n]/g, ' ')  } `;
+
+      if (hasClass(e, t)){
+        while (n.indexOf(` ${ t } `) >= 0){
+          n = n.replace(` ${ t } `, ' ')
+        }e.className = n.replace(/^\s+|\s+$/g, '')
+      } else {
+        e.className += ` ${  t }`
+      }
+    }
+
+    toggleBtn.onclick = function() {
+      toggleClass(this.parentNode, 'nav-open');
+    }
+
+    var root = document.documentElement;
+
+    root.className = `${ root.className  } js`;
+  },
+
+  setupTearDown() {
+    this.get('router').on('routeWillChange', () => {
+      $('header > nav').removeClass('nav-open');// eslint-disable-line
+    });
+  }
+
 });
diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
index b2059fbd4..58d082762 100644
--- a/app/components/page-header/template.hbs
+++ b/app/components/page-header/template.hbs
@@ -1,62 +1,72 @@
 <nav class="clearfix responsive-nav" role="navigation" id="js-responsive-nav">
   <a class="nav-logo logo-oss btn bg-transparent">
-    <span class="sr-only">{{settings.appName}}</span>
+    <span class="sr-only">
+      {{settings.appName}}
+    </span>
   </a>
-
   <ul class="nav-main nav-list no-inline-space">
-    {{page-header-project
-      pageScope=pageScope
-    }}
-
+    {{page-header-project pageScope=pageScope}}
     {{#each navTree as |item|}}
       {{#if item.submenu.length}}
         {{! Has a submenu }}
-        {{#hover-dropdown
-           tagName="li"
-           class="nav-item"
-           as |dd|
-        }}
-          {{#dd.trigger}}
-            {{#if (or (not item.resource) (rbac-allows resource=item.resource scope=item.resourceScope))}}
+        {{#hover-dropdown tagName="li" class="nav-item" as |dd|}}
+          <dd.Trigger>
+            {{#if
+              (or
+                (not item.resource)
+                (rbac-allows resource=item.resource scope=item.resourceScope)
+              )
+            }}
               {{#if item.route}}
                 {{#link-to-as-attrs
-                   ourRoute=item.route
-                   ctx=item.ctx
-                   qp=item.qp
-                   currentWhen=item.currentWhen
-                   activeParent="LI"
-                   role="button"
-                   aria-haspopup="true"
-                   aria-expanded="false"
+                  ourRoute=item.route
+                  ctx=item.ctx
+                  qp=item.qp
+                  currentWhen=item.currentWhen
+                  activeParent="LI"
+                  role="button"
+                  aria-haspopup="true"
+                  aria-expanded="false"
                 }}
                   {{t item.localizedLabel default=item.label}}
-                  <span class="icon icon-chevron-down"/>
+                  <span class="icon icon-chevron-down"></span>
                 {{/link-to-as-attrs}}
               {{else}}
-                <a class="nav-link" role="button" aria-haspopup="true" aria-label={{t item.localizedLabel default=item.label}}>
+                <a
+                  class="nav-link"
+                  role="button"
+                  aria-haspopup="true"
+                  aria-label={{t item.localizedLabel default=item.label}}
+                >
                   {{t item.localizedLabel default=item.label}}
-                  <span class="icon icon-chevron-down"/>
+                  <span class="icon icon-chevron-down"></span>
                 </a>
               {{/if}}
             {{/if}}
-          {{/dd.trigger}}
-
-          {{#dd.content}}
+          </dd.Trigger>
+          <dd.Content>
             {{#each item.submenu as |subitem|}}
               {{#if subitem.route}}
-                {{#if (or (not subitem.resource) (rbac-allows resource=subitem.resource scope=subitem.resourceScope))}}
-                  <li>
+                {{#if
+                  (or
+                    (not subitem.resource)
+                    (rbac-allows
+                      resource=subitem.resource scope=subitem.resourceScope
+                    )
+                  )
+                }}
+                  <li {{action dd.actions.close}}>
                     {{#link-to-as-attrs
-                       ourRoute=subitem.route
-                       ctx=subitem.ctx
-                       qp=subitem.qp
-                       activeParent="LI"
-                       currentWhen=subitem.currentWhen
+                      ourRoute=subitem.route
+                      ctx=subitem.ctx
+                      qp=subitem.qp
+                      activeParent="LI"
+                      currentWhen=subitem.currentWhen
                     }}
                       <span>
                         {{t subitem.localizedLabel default=subitem.label}}
                       </span>
-                      <i class="{{subitem.icon}}"/>
+                      <i class="{{subitem.icon}}"></i>
                     {{/link-to-as-attrs}}
                   </li>
                 {{/if}}
@@ -64,76 +74,79 @@
                 <li class="divider"></li>
               {{else if subitem.dashboardBaseLink}}
                 {{#if dashboardBaseLink}}
-                  <li>
+                  <li {{action dd.actions.close}}>
                     <a
-                      href={{ concat dashboardBaseLink subitem.dashboardBaseLink }}
+                      href={{concat dashboardBaseLink subitem.dashboardBaseLink
+                      }}
                     >
                       {{t subitem.localizedLabel default=subitem.label}}
-                      <i class="icon icon-external-link" />
+                      <i class="icon icon-external-link"></i>
                     </a>
                   </li>
                 {{/if}}
               {{else if subitem.dashboardLink}}
                 {{#if dashboardLink}}
-                  <li>
-                    <a
-                      href={{ concat dashboardLink subitem.dashboardLink }}
-                    >
+                  <li {{action dd.actions.close}}>
+                    <a href={{concat dashboardLink subitem.dashboardLink}}>
                       {{t subitem.localizedLabel default=subitem.label}}
-                      <i class="icon icon-external-link" />
+                      <i class="icon icon-external-link"></i>
                     </a>
                   </li>
                 {{/if}}
               {{else}}
                 {{! Just a label }}
-                <li class="dropdown-header">
+                <li class="dropdown-header" {{action dd.actions.close}}>
                   <span>
                     {{t subitem.localizedLabel default=subitem.label}}
                   </span>
-                  <i class="{{subitem.icon}}"/>
+                  <i class="{{subitem.icon}}"></i>
                 </li>
               {{/if}}
             {{/each}}
-          {{/dd.content}}
+          </dd.Content>
         {{/hover-dropdown}}
-
       {{else if item.route}}
-
-        {{#if (or (not item.resource) (rbac-allows resource=item.resource scope=item.resourceScope))}}
+        {{#if
+          (or
+            (not item.resource)
+            (rbac-allows resource=item.resource scope=item.resourceScope)
+          )
+        }}
           {{! No submenu }}
-          <li class="nav-item {{if (and item.disableIfClusterNotReady (not cluster.isReady)) "pointer-events-none"}}">
+          <li
+            class="nav-item
+              {{if
+                (and item.disableIfClusterNotReady (not cluster.isReady))
+                "pointer-events-none"
+              }}"
+          >
             {{#link-to-as-attrs
-               ourRoute=item.route
-               ctx=item.ctx
-               qp=item.qp
-               activeParent="LI"
-               currentWhen=item.currentWhen
-               class="nav-link"
+              ourRoute=item.route
+              ctx=item.ctx
+              qp=item.qp
+              activeParent="LI"
+              currentWhen=item.currentWhen
+              class="nav-link"
             }}
               {{t item.localizedLabel default=item.label}}
             {{/link-to-as-attrs}}
           </li>
         {{/if}}
-
       {{else if item.dashboardBaseLink}}
         {{#if dashboardBaseLink}}
           <li>
-            <a
-              href={{ concat dashboardBaseLink item.dashboardBaseLink }}
-            >
+            <a href={{concat dashboardBaseLink item.dashboardBaseLink}}>
               {{t item.localizedLabel default=item.label}}
-              <i class="icon icon-external-link" />
+              <i class="icon icon-external-link"></i>
             </a>
           </li>
         {{/if}}
       {{else if item.dashboardLink}}
         {{#if dashboardLink}}
           <li>
-            <a
-              href={{ concat dashboardLink item.dashboardLink }}
-            >
+            <a href={{concat dashboardLink item.dashboardLink}}>
               {{t item.localizedLabel default=item.label}}
-              <i class="icon icon-external-link" />
+              <i class="icon icon-external-link"></i>
             </a>
           </li>
         {{/if}}
@@ -142,35 +155,30 @@
         <li class="dropdown-header">
           {{t item.localizedLabel default=item.label}}
         </li>
-
       {{/if}}
     {{/each}}
   </ul>
-
   {{#if dashboardLink}}
     <div class="try-dashboard bg-secondary">
-      <a href="{{dashboardLink}}" class="btn bg-warning">{{t "nav.dashboard.try"}}</a>
+      <a href="{{dashboardLink}}" class="btn bg-warning">
+        {{t "nav.dashboard.try"}}
+      </a>
     </div>
   {{/if}}
-
   {{#hover-dropdown
-     tagName="ul"
-     class="nav-user list-unstyled"
-     horizontalPosition="right"
-     delay=250
-     as |dd|
+    tagName="ul"
+    class="nav-user list-unstyled"
+    horizontalPosition="right"
+    delay=250 as |dd|
   }}
     <li class="nav-item">
-      {{#dd.trigger
-         class="btn"
-         ariaLabel=(t "nav.user.label" username=session.user)
-      }}
+      <dd.Trigger
+        class="btn"
+        ariaLabel={{t "nav.user.label" username=session.user}}
+      >
         <a role="button" aria-haspopup="true" class="nav-link">
           {{#if accessEnabled}}
-            {{identity-avatar
-              link=false
-              identity=access.principal
-            }}
+            {{identity-avatar link=false identity=access.principal}}
           {{else}}
             <div class="gh-avatar">
               <div class="gh-placeholder">
@@ -183,43 +191,51 @@
           </span>
           <i class="icon icon-chevron-down text-muted"></i>
         </a>
-      {{/dd.trigger}}
+      </dd.Trigger>
     </li>
-
-    {{#dd.content class="text-right"}}
+    <dd.Content class="text-right">
       {{#if accessEnabled}}
-        <li role="presentation" class="user-auth">
+        <li role="presentation" class="user-auth" {{action dd.actions.close}}>
           {{identity-block principal=access.principal}}
         </li>
       {{/if}}
-
       <li role="separator" class="divider"></li>
-      <li>
+      <li {{action dd.actions.close}}>
         {{#link-to "authenticated.apikeys"}}
-          <span>{{t "nav.api.link"}}</span>
+          <span>
+            {{t "nav.api.link"}}
+          </span>
         {{/link-to}}
       </li>
-      <li>
+      <li {{action dd.actions.close}}>
         {{#link-to "global-admin.security.cloud-credentials"}}
-          <span>{{t "nav.admin.security.cloudCredentials"}}</span>
+          <span>
+            {{t "nav.admin.security.cloudCredentials"}}
+          </span>
         {{/link-to}}
       </li>
-      <li>
+      <li {{action dd.actions.close}}>
         {{#link-to "nodes.node-templates"}}
-          <span>{{t "nav.nodeTemplates.link"}}</span>
+          <span>
+            {{t "nav.nodeTemplates.link"}}
+          </span>
         {{/link-to}}
       </li>
-      <li>
+      <li {{action dd.actions.close}}>
         {{#link-to "authenticated.prefs"}}
-          <span>{{t "nav.userPreferences.link"}}</span>
+          <span>
+            {{t "nav.userPreferences.link"}}
+          </span>
         {{/link-to}}
       </li>
       <li role="separator" class="divider"></li>
-      <li>
+      <li {{action dd.actions.close}}>
         {{#link-to "logout" class="user-logout"}}
-          <span>{{t "nav.user.logout"}}</span>
+          <span>
+            {{t "nav.user.logout"}}
+          </span>
         {{/link-to}}
       </li>
-    {{/dd.content}}
+    </dd.Content>
   {{/hover-dropdown}}
-</nav>
+</nav>
\ No newline at end of file
diff --git a/app/components/pod-dots/component.js b/app/components/pod-dots/component.js
index 757a9857d..7db2d10ab 100644
--- a/app/components/pod-dots/component.js
+++ b/app/components/pod-dots/component.js
@@ -35,7 +35,7 @@ export default Component.extend({
   }),
   // Ignore the setting because these are tiny dots.
 
-  filtered: computed('pods.[]', 'pod', 'searchText', function() {
+  filtered: computed('pod', 'pods.[]', 'searchFields', 'searchText', function() {
     let out = [];
     const pod = this.get('pod');
     const pods = this.get('pods');
diff --git a/app/components/pod-metrics/component.js b/app/components/pod-metrics/component.js
index 656915a2e..41399c7d6 100644
--- a/app/components/pod-metrics/component.js
+++ b/app/components/pod-metrics/component.js
@@ -8,7 +8,7 @@ export default Component.extend(Metrics, {
 
   filters: { resourceType: 'pod' },
 
-  projectScope:  true,
+  projectScope: true,
 
   init() {
     this._super(...arguments);
diff --git a/app/components/pod-row/component.js b/app/components/pod-row/component.js
index c1974d349..a01f4df58 100644
--- a/app/components/pod-row/component.js
+++ b/app/components/pod-row/component.js
@@ -32,7 +32,7 @@ export default Component.extend({
     },
   },
 
-  canExpand:  computed('expandPlaceholder', 'model.containers', function() {
+  canExpand:  computed('expandPlaceholder', 'model.containers.length', function() {
     return get(this, 'expandPlaceholder') && get(this, 'model.containers.length') > 1;
   }),
 
diff --git a/app/components/progress-bar-multi/component.js b/app/components/progress-bar-multi/component.js
index 53e39bd13..4afc88d33 100644
--- a/app/components/progress-bar-multi/component.js
+++ b/app/components/progress-bar-multi/component.js
@@ -37,7 +37,7 @@ export default Component.extend({
 
     let valueDep = `values.@each.{${ colorKey },${ labelKey },${ valueKey }}`;
 
-    defineProperty(this, 'pieces', computed('min', 'max', valueDep, () => {
+    defineProperty(this, 'pieces', computed(valueDep, 'max', 'min', 'minPercent', 'values', () => {
       let min = get(this, 'min');
       let max = get(this, 'max');
 
@@ -81,7 +81,7 @@ export default Component.extend({
     }));
 
     valueDep = `tooltipValues.@each.{${ labelKey },${ valueKey }}`;
-    defineProperty(this, 'tooltipContent', computed(valueDep, () => {
+    defineProperty(this, 'tooltipContent', computed(valueDep, 'labelKey', 'tooltipArrayOrString', 'tooltipValues', 'valueKey', () => {
       let labelKey = get(this, 'labelKey');
       let valueKey = get(this, 'valueKey');
 
diff --git a/app/components/project-quota-row/template.hbs b/app/components/project-quota-row/template.hbs
index f1edccb14..31236a335 100644
--- a/app/components/project-quota-row/template.hbs
+++ b/app/components/project-quota-row/template.hbs
@@ -10,7 +10,7 @@
 <td>&nbsp;</td>
 <div class="input-group-btn">
   {{#if editing}}
-    <button class="btn bg-primary btn-sm" {{action remove quota}}>
+    <button class="btn bg-primary btn-sm" type="button" {{action remove quota}}>
       <i class="icon icon-minus" />
     </button>
   {{/if}}
diff --git a/app/components/project-resource-quota/template.hbs b/app/components/project-resource-quota/template.hbs
index 95c75c48e..bcd716d93 100644
--- a/app/components/project-resource-quota/template.hbs
+++ b/app/components/project-resource-quota/template.hbs
@@ -26,7 +26,7 @@
 
 {{#if editing}}
   <div class="row mt-10">
-    <button class="btn bg-link icon-btn" {{action "addQuota"}}>
+    <button class="btn bg-link icon-btn" type="button" {{action "addQuota"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t "formResourceQuota.addQuotaLabel"}}</span>
     </button>
diff --git a/app/components/settings/billing-info/template.hbs b/app/components/settings/billing-info/template.hbs
index f0777affb..e3e06d74f 100644
--- a/app/components/settings/billing-info/template.hbs
+++ b/app/components/settings/billing-info/template.hbs
@@ -21,5 +21,5 @@
   <div class="text-center text-muted border-dash p-20 mb-20">{{t 'billingInfo.noSub'}}</div>
 {{/if}}
 <div class="text-center">
-  <button class="btn bg-primary" onclick={{action 'addNew'}} disabled={{if (gte cards.length 1) 'true' ''}}>{{t 'billingInfo.addNew'}}</button>
+  <button class="btn bg-primary" onclick={{action 'addNew'}} disabled={{if (gte cards.length 1) 'true' ''}} type="button">{{t 'billingInfo.addNew'}}</button>
 </div>
\ No newline at end of file
diff --git a/app/components/settings/table-rows/component.js b/app/components/settings/table-rows/component.js
index 2733b56c0..3617a7280 100644
--- a/app/components/settings/table-rows/component.js
+++ b/app/components/settings/table-rows/component.js
@@ -21,7 +21,7 @@ export default Component.extend({
   tableCounts:   TABLE_COUNTS,
   selectedCount: null,
 
-  perPage:       alias('prefs.tablePerPage'),
+  perPage: alias('prefs.tablePerPage'),
   init() {
     this._super(...arguments);
     this.set('selectedCount', `${ this.get('perPage') }`);
diff --git a/app/components/settings/user-info/template.hbs b/app/components/settings/user-info/template.hbs
index e8ebe794e..349c89715 100644
--- a/app/components/settings/user-info/template.hbs
+++ b/app/components/settings/user-info/template.hbs
@@ -14,7 +14,7 @@
   </div>
   <div class="row text-center">
     <div class="col span-12 text-left">
-      <button class="btn bg-primary" {{action 'editPassword'}}>{{t 'userPreferencesPage.generalInfo.password.text'}}</button>
+      <button class="btn bg-primary" type="button" {{action 'editPassword'}}>{{t 'userPreferencesPage.generalInfo.password.text'}}</button>
     </div>
   </div>
 </div>
diff --git a/app/components/volume-source/source-aws-ebs/component.js b/app/components/volume-source/source-aws-ebs/component.js
index a884a2e4d..163322620 100644
--- a/app/components/volume-source/source-aws-ebs/component.js
+++ b/app/components/volume-source/source-aws-ebs/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'awsElasticBlockStore',
+  field: 'awsElasticBlockStore',
 });
diff --git a/app/components/volume-source/source-azure-disk/component.js b/app/components/volume-source/source-azure-disk/component.js
index 398855088..7f8ea853b 100644
--- a/app/components/volume-source/source-azure-disk/component.js
+++ b/app/components/volume-source/source-azure-disk/component.js
@@ -4,7 +4,7 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'azureDisk',
+  field: 'azureDisk',
 
   initValue: {
     readOnly:    false,
diff --git a/app/components/volume-source/source-azure-file/component.js b/app/components/volume-source/source-azure-file/component.js
index d2e2fa552..79e179455 100644
--- a/app/components/volume-source/source-azure-file/component.js
+++ b/app/components/volume-source/source-azure-file/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'azureFile',
+  field: 'azureFile',
 });
diff --git a/app/components/volume-source/source-cephfs/component.js b/app/components/volume-source/source-cephfs/component.js
index 673bc5762..6f0101eba 100644
--- a/app/components/volume-source/source-cephfs/component.js
+++ b/app/components/volume-source/source-cephfs/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'cephfs'
+  field: 'cephfs'
 });
diff --git a/app/components/volume-source/source-certificate/component.js b/app/components/volume-source/source-certificate/component.js
index 870dc038b..fc2158ace 100644
--- a/app/components/volume-source/source-certificate/component.js
+++ b/app/components/volume-source/source-certificate/component.js
@@ -5,7 +5,7 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'secret',
+  field: 'secret',
 
   defaultMode: null,
   editing:     true,
diff --git a/app/components/volume-source/source-cinder/component.js b/app/components/volume-source/source-cinder/component.js
index 55840a2a2..3360b98dd 100644
--- a/app/components/volume-source/source-cinder/component.js
+++ b/app/components/volume-source/source-cinder/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'cinder',
+  field: 'cinder',
 });
diff --git a/app/components/volume-source/source-config-map/component.js b/app/components/volume-source/source-config-map/component.js
index f4676404d..e12b5eeba 100644
--- a/app/components/volume-source/source-config-map/component.js
+++ b/app/components/volume-source/source-config-map/component.js
@@ -5,7 +5,7 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'configMap',
+  field: 'configMap',
 
   specific:    false,
   defaultMode: null,
diff --git a/app/components/volume-source/source-csi-volume-longhorn/component.js b/app/components/volume-source/source-csi-volume-longhorn/component.js
index 5ceaff364..8179cf1e6 100644
--- a/app/components/volume-source/source-csi-volume-longhorn/component.js
+++ b/app/components/volume-source/source-csi-volume-longhorn/component.js
@@ -6,7 +6,7 @@ import C from 'ui/utils/constants';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'csi',
+  field: 'csi',
 
   init() {
     this._super();
diff --git a/app/components/volume-source/source-empty-dir/component.js b/app/components/volume-source/source-empty-dir/component.js
index 01036d171..c4a55d2c3 100644
--- a/app/components/volume-source/source-empty-dir/component.js
+++ b/app/components/volume-source/source-empty-dir/component.js
@@ -4,7 +4,7 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'emptyDir',
+  field: 'emptyDir',
 
   initValue: { medium: '' }
 });
diff --git a/app/components/volume-source/source-fc/component.js b/app/components/volume-source/source-fc/component.js
index 0fa7891c9..660db5bcc 100644
--- a/app/components/volume-source/source-fc/component.js
+++ b/app/components/volume-source/source-fc/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'fc',
+  field: 'fc',
 });
diff --git a/app/components/volume-source/source-flex-volume/component.js b/app/components/volume-source/source-flex-volume/component.js
index 7a2933bc1..804e97cec 100644
--- a/app/components/volume-source/source-flex-volume/component.js
+++ b/app/components/volume-source/source-flex-volume/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'flexVolume',
+  field: 'flexVolume',
 });
diff --git a/app/components/volume-source/source-flocker/component.js b/app/components/volume-source/source-flocker/component.js
index 943329c3c..e41632286 100644
--- a/app/components/volume-source/source-flocker/component.js
+++ b/app/components/volume-source/source-flocker/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'flocker',
+  field: 'flocker',
 });
diff --git a/app/components/volume-source/source-gce-pd/component.js b/app/components/volume-source/source-gce-pd/component.js
index 528002a08..6a141b01d 100644
--- a/app/components/volume-source/source-gce-pd/component.js
+++ b/app/components/volume-source/source-gce-pd/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'gcePersistentDisk',
+  field: 'gcePersistentDisk',
 });
diff --git a/app/components/volume-source/source-glusterfs/component.js b/app/components/volume-source/source-glusterfs/component.js
index 24637c4b2..e14147b89 100644
--- a/app/components/volume-source/source-glusterfs/component.js
+++ b/app/components/volume-source/source-glusterfs/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'glusterfs',
+  field: 'glusterfs',
 });
diff --git a/app/components/volume-source/source-host-path/component.js b/app/components/volume-source/source-host-path/component.js
index a91988017..59182d974 100644
--- a/app/components/volume-source/source-host-path/component.js
+++ b/app/components/volume-source/source-host-path/component.js
@@ -5,7 +5,7 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'hostPath',
+  field: 'hostPath',
 
   kindChoices: computed(() => {
     const out = [
diff --git a/app/components/volume-source/source-iscsi/component.js b/app/components/volume-source/source-iscsi/component.js
index 512954de6..5fe828428 100644
--- a/app/components/volume-source/source-iscsi/component.js
+++ b/app/components/volume-source/source-iscsi/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'iscsi',
+  field: 'iscsi',
 });
diff --git a/app/components/volume-source/source-local/component.js b/app/components/volume-source/source-local/component.js
index bd7e7f8b7..88b476a5c 100644
--- a/app/components/volume-source/source-local/component.js
+++ b/app/components/volume-source/source-local/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'local',
+  field: 'local',
 });
diff --git a/app/components/volume-source/source-nfs/component.js b/app/components/volume-source/source-nfs/component.js
index b25a7f52a..036cf7e28 100644
--- a/app/components/volume-source/source-nfs/component.js
+++ b/app/components/volume-source/source-nfs/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'nfs',
+  field: 'nfs',
 });
diff --git a/app/components/volume-source/source-photon/component.js b/app/components/volume-source/source-photon/component.js
index be9942ef5..7a1d93f56 100644
--- a/app/components/volume-source/source-photon/component.js
+++ b/app/components/volume-source/source-photon/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'photonPersistentDisk',
+  field: 'photonPersistentDisk',
 });
diff --git a/app/components/volume-source/source-portworx/component.js b/app/components/volume-source/source-portworx/component.js
index 9489c33f6..da26e0abc 100644
--- a/app/components/volume-source/source-portworx/component.js
+++ b/app/components/volume-source/source-portworx/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'portworxVolume',
+  field: 'portworxVolume',
 });
diff --git a/app/components/volume-source/source-quobyte/component.js b/app/components/volume-source/source-quobyte/component.js
index 69db5b758..05b48c963 100644
--- a/app/components/volume-source/source-quobyte/component.js
+++ b/app/components/volume-source/source-quobyte/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'quobyte',
+  field: 'quobyte',
 });
diff --git a/app/components/volume-source/source-rbd/component.js b/app/components/volume-source/source-rbd/component.js
index d3f079ad7..5aab0facb 100644
--- a/app/components/volume-source/source-rbd/component.js
+++ b/app/components/volume-source/source-rbd/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'rbd',
+  field: 'rbd',
 });
diff --git a/app/components/volume-source/source-scaleio/component.js b/app/components/volume-source/source-scaleio/component.js
index 5236c53b3..3bd2f1a9d 100644
--- a/app/components/volume-source/source-scaleio/component.js
+++ b/app/components/volume-source/source-scaleio/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'scaleIO',
+  field: 'scaleIO',
 });
diff --git a/app/components/volume-source/source-secret/component.js b/app/components/volume-source/source-secret/component.js
index ff81343c0..67b34ff08 100644
--- a/app/components/volume-source/source-secret/component.js
+++ b/app/components/volume-source/source-secret/component.js
@@ -5,7 +5,7 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'secret',
+  field: 'secret',
 
   specific:    false,
   defaultMode: null,
diff --git a/app/components/volume-source/source-storageos/component.js b/app/components/volume-source/source-storageos/component.js
index 3fbcad950..24da26cf7 100644
--- a/app/components/volume-source/source-storageos/component.js
+++ b/app/components/volume-source/source-storageos/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:       'storageos',
+  field: 'storageos',
 });
diff --git a/app/components/volume-source/source-vsphere-volume/component.js b/app/components/volume-source/source-vsphere-volume/component.js
index 8b18aa609..af72fedef 100644
--- a/app/components/volume-source/source-vsphere-volume/component.js
+++ b/app/components/volume-source/source-vsphere-volume/component.js
@@ -4,5 +4,5 @@ import VolumeSource from 'shared/mixins/volume-source';
 
 export default Component.extend(VolumeSource, {
   layout,
-  field:     'vsphereVolume',
+  field: 'vsphereVolume',
 });
diff --git a/app/components/workload-metrics/component.js b/app/components/workload-metrics/component.js
index 42e7eebb7..ed1aa22df 100644
--- a/app/components/workload-metrics/component.js
+++ b/app/components/workload-metrics/component.js
@@ -8,7 +8,7 @@ export default Component.extend(Metrics, {
 
   filters: { resourceType: 'workload' },
 
-  projectScope:  true,
+  projectScope: true,
 
   init() {
     this._super(...arguments);
diff --git a/app/components/workload-row/component.js b/app/components/workload-row/component.js
index 7c52034d8..2075070cc 100644
--- a/app/components/workload-row/component.js
+++ b/app/components/workload-row/component.js
@@ -1,4 +1,4 @@
-import { or } from '@ember/object/computed';
+import { readOnly } from '@ember/object/computed';
 import Component from '@ember/component';
 import layout from './template';
 import { inject as service } from '@ember/service'
@@ -18,7 +18,7 @@ export default Component.extend({
   showInstanceCount: true,
   showImage:         true,
 
-  showLabelRow:      or('model.displayUserLabelStrings.length'),
+  showLabelRow: readOnly('model.displayUserLabelStrings.length'),
 
   actions:      {
     toggle() {
diff --git a/app/components/workload-row/template.hbs b/app/components/workload-row/template.hbs
index d49d0923a..9e0caaa8c 100644
--- a/app/components/workload-row/template.hbs
+++ b/app/components/workload-row/template.hbs
@@ -81,8 +81,8 @@
     <td class="text-center">
       {{#if (and expanded model.canScale)}}
         <div class="btn-group-xs bg-default scale-arrow">
-          <button class="btn btn-xs bg-primary" {{action "scaleDown" target=model}} disabled={{not model.canScaleDown}}><i class="icon icon-minus icon-fw"/></button>
-          <button class="btn btn-xs bg-primary" {{action "scaleUp" target=model}} disabled={{not model.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
+          <button class="btn btn-xs bg-primary" disabled={{not model.canScaleDown}} type="button" {{action "scaleDown" target=model}}><i class="icon icon-minus icon-fw"/></button>
+          <button class="btn btn-xs bg-primary" disabled={{not model.canScaleUp}} type="button" {{action "scaleUp" target=model}}><i class="icon icon-plus icon-fw"/></button>
         </div>
       {{/if}}
     </td>
diff --git a/app/containers/index/controller.js b/app/containers/index/controller.js
index 60783feb2..a1dca3377 100644
--- a/app/containers/index/controller.js
+++ b/app/containers/index/controller.js
@@ -86,8 +86,8 @@ export default Controller.extend({
 
     if (group === 'node') {
       return 'node';
-    } else if (group === 'namespace') {
-      return 'namespace'
     }
+
+    return 'namespace';
   }),
 });
diff --git a/app/containers/index/template.hbs b/app/containers/index/template.hbs
index 0c296ed9f..f5d7ba7cf 100644
--- a/app/containers/index/template.hbs
+++ b/app/containers/index/template.hbs
@@ -1,8 +1,7 @@
 {{#containers-header}}
   <button
-    {{action "importYaml"}}
     class="btn btn-sm bg-default mr-10"
-    disabled={{rbac-prevents resource="workload" scope="project" permission="create"}}
+    disabled={{rbac-prevents resource="workload" scope="project" permission="create"}} type="button" {{action "importYaml"}}
   >
     {{t "nav.containers.importCompose"}}
   </button>
diff --git a/app/containers/run/template.hbs b/app/containers/run/template.hbs
index fb8b6cbee..933c933f8 100644
--- a/app/containers/run/template.hbs
+++ b/app/containers/run/template.hbs
@@ -50,9 +50,7 @@
           {{t "newContainer.sidekick.sidekick"}}
         </p>
         <button
-          class="btn btn-sm bg-error"
-          {{action "promptRemove" index}}
-          disabled={{deleting}}
+          class="btn btn-sm bg-error" disabled={{deleting}} type="button" {{action "promptRemove" index}}
         >
           {{t "action.remove"}}
         </button>
@@ -67,7 +65,7 @@
     {{/each}}
   </div>
   <div class="text-center">
-    <button class="btn bg-transparent" {{action "cancel"}}>{{t "generic.cancel"}}</button>
+    <button class="btn bg-transparent" type="button" {{action "cancel"}}>{{t "generic.cancel"}}</button>
   </div>
 {{else}}
   {{container/new-edit
diff --git a/app/ingresses/index/controller.js b/app/ingresses/index/controller.js
index 3dd82c4cc..60b77c4f0 100644
--- a/app/ingresses/index/controller.js
+++ b/app/ingresses/index/controller.js
@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import Controller, { inject as controller } from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
   projectController: controller('authenticated.project'),
   queryParams:       ['sortBy'],
diff --git a/app/ingresses/index/template.hbs b/app/ingresses/index/template.hbs
index 4c9d6f220..e8c31227b 100644
--- a/app/ingresses/index/template.hbs
+++ b/app/ingresses/index/template.hbs
@@ -1,5 +1,5 @@
 {{#containers-header showGroup=false}}
-  <button {{action 'importYaml'}} class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="ingress" scope="project" permission="create"}}>{{t 'nav.containers.importCompose'}}</button>
+  <button class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="ingress" scope="project" permission="create"}} type="button" {{action 'importYaml'}}>{{t 'nav.containers.importCompose'}}</button>
   {{#link-to "ingresses.run" scope.currentProject.id class="btn btn-sm bg-primary" disabled=(rbac-prevents resource="ingress" scope="project" permission="create")}}{{t 'nav.containers.addIngress'}}{{/link-to}}
 {{/containers-header}}
 
diff --git a/app/initializers/app.js b/app/initializers/app.js
index 94412b8f2..017e309f2 100644
--- a/app/initializers/app.js
+++ b/app/initializers/app.js
@@ -9,6 +9,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'app',
+  name: 'app',
   initialize
 };
diff --git a/app/initializers/aws-sdk.js b/app/initializers/aws-sdk.js
index e6ca2454d..a340fb922 100644
--- a/app/initializers/aws-sdk.js
+++ b/app/initializers/aws-sdk.js
@@ -34,6 +34,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'aws-sdk',
+  name: 'aws-sdk',
   initialize
 };
diff --git a/app/initializers/extend-ember-input.js b/app/initializers/extend-ember-input.js
index bd59e2305..cf7fb8a6e 100644
--- a/app/initializers/extend-ember-input.js
+++ b/app/initializers/extend-ember-input.js
@@ -19,6 +19,6 @@ export function initialize(/* application */) {
 }
 
 export default {
-  name:       'extend-ember-input',
+  name: 'extend-ember-input',
   initialize
 };
diff --git a/app/initializers/extend-ember-link.js b/app/initializers/extend-ember-link.js
index acbcd5786..2bd3925ad 100644
--- a/app/initializers/extend-ember-link.js
+++ b/app/initializers/extend-ember-link.js
@@ -52,6 +52,6 @@ export function initialize(/* application */) {
 }
 
 export default {
-  name:       'extend-ember-link',
+  name: 'extend-ember-link',
   initialize
 };
diff --git a/app/initializers/extend-ember-route.js b/app/initializers/extend-ember-route.js
index 9e33ff2e4..301820992 100644
--- a/app/initializers/extend-ember-route.js
+++ b/app/initializers/extend-ember-route.js
@@ -87,6 +87,6 @@ export function initialize(/* application */) {
 }
 
 export default {
-  name:       'extend-ember-route',
+  name: 'extend-ember-route',
   initialize
 };
diff --git a/app/initializers/extend-jquery.js b/app/initializers/extend-jquery.js
index 82d65d6a0..ff34c638a 100644
--- a/app/initializers/extend-jquery.js
+++ b/app/initializers/extend-jquery.js
@@ -16,6 +16,6 @@ export function initialize(/* application */) {
 }
 
 export default {
-  name:       'extend-jquery',
+  name: 'extend-jquery',
   initialize
 };
diff --git a/app/initializers/extend-resource.js b/app/initializers/extend-resource.js
index 06fd9d8ec..b1b66e39f 100644
--- a/app/initializers/extend-resource.js
+++ b/app/initializers/extend-resource.js
@@ -11,7 +11,7 @@ export function initialize(/* application */) {
 }
 
 export default {
-  name:       'extend-resource',
+  name: 'extend-resource',
   initialize
 };
 
diff --git a/app/initializers/growl.js b/app/initializers/growl.js
index f1e416f4e..2250b18d2 100644
--- a/app/initializers/growl.js
+++ b/app/initializers/growl.js
@@ -6,6 +6,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'growl',
+  name: 'growl',
   initialize
 };
diff --git a/app/initializers/inject-application.js b/app/initializers/inject-application.js
index e41e0b947..4d8f150e3 100644
--- a/app/initializers/inject-application.js
+++ b/app/initializers/inject-application.js
@@ -5,6 +5,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'inject-application',
+  name: 'inject-application',
   initialize
 };
diff --git a/app/initializers/inject-router.js b/app/initializers/inject-router.js
index 4b6824c58..4479560a9 100644
--- a/app/initializers/inject-router.js
+++ b/app/initializers/inject-router.js
@@ -5,6 +5,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'inject-router',
+  name: 'inject-router',
   initialize
 };
diff --git a/app/initializers/polyfill-svg.js b/app/initializers/polyfill-svg.js
index e59c6d9b6..c79c92b36 100644
--- a/app/initializers/polyfill-svg.js
+++ b/app/initializers/polyfill-svg.js
@@ -9,6 +9,6 @@ export function initialize( /* application*/ ) {
 }
 
 export default {
-  name:       'polyfill-svg',
+  name: 'polyfill-svg',
   initialize
 };
diff --git a/app/initializers/session.js b/app/initializers/session.js
index ffa9c7f14..20d061541 100644
--- a/app/initializers/session.js
+++ b/app/initializers/session.js
@@ -15,6 +15,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'session',
+  name: 'session',
   initialize
 };
diff --git a/app/initializers/touch.js b/app/initializers/touch.js
index 7f3a55d4b..808aa5350 100644
--- a/app/initializers/touch.js
+++ b/app/initializers/touch.js
@@ -13,6 +13,6 @@ export function initialize(/* application*/) {
 }
 
 export default {
-  name:       'touch',
+  name: 'touch',
   initialize
 };
diff --git a/app/initializers/viewport.js b/app/initializers/viewport.js
index 188bb8206..1223df7f2 100644
--- a/app/initializers/viewport.js
+++ b/app/initializers/viewport.js
@@ -5,6 +5,6 @@ export function initialize() {
 }
 
 export default {
-  name:       'viewport',
+  name: 'viewport',
   initialize
 };
diff --git a/app/instance-initializers/cluster-store.js b/app/instance-initializers/cluster-store.js
index 8259bf951..28c4acbbb 100644
--- a/app/instance-initializers/cluster-store.js
+++ b/app/instance-initializers/cluster-store.js
@@ -16,6 +16,6 @@ export function initialize(instance) {
 }
 
 export default {
-  name:       'cluster-store',
+  name: 'cluster-store',
   initialize
 };
diff --git a/app/instance-initializers/global-store.js b/app/instance-initializers/global-store.js
index 50abbfc71..378ceea23 100644
--- a/app/instance-initializers/global-store.js
+++ b/app/instance-initializers/global-store.js
@@ -16,6 +16,6 @@ export function initialize(instance) {
 }
 
 export default {
-  name:       'global-store',
+  name: 'global-store',
   initialize
 };
diff --git a/app/instance-initializers/intl.js b/app/instance-initializers/intl.js
index a9a282a61..9db5c5d8f 100644
--- a/app/instance-initializers/intl.js
+++ b/app/instance-initializers/intl.js
@@ -20,6 +20,6 @@ export function initialize(instance) {
 }
 
 export default {
-  name:       'intl',
+  name: 'intl',
   initialize
 };
diff --git a/app/instance-initializers/lookup.js b/app/instance-initializers/lookup.js
index 08e228d3c..4542d2a78 100644
--- a/app/instance-initializers/lookup.js
+++ b/app/instance-initializers/lookup.js
@@ -18,6 +18,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'lookup',
+  name: 'lookup',
   initialize,
 };
diff --git a/app/instance-initializers/store.js b/app/instance-initializers/store.js
index dff40ada5..617b517e4 100644
--- a/app/instance-initializers/store.js
+++ b/app/instance-initializers/store.js
@@ -16,6 +16,6 @@ export function initialize(instance) {
 }
 
 export default {
-  name:       'store',
+  name: 'store',
   initialize
 };
diff --git a/app/instance-initializers/theme.js b/app/instance-initializers/theme.js
index 980c2f828..f201f0df6 100644
--- a/app/instance-initializers/theme.js
+++ b/app/instance-initializers/theme.js
@@ -9,6 +9,6 @@ export function initialize(instance) {
 }
 
 export default {
-  name:       'theme',
+  name: 'theme',
   initialize
 };
diff --git a/app/mixins/model-alert.js b/app/mixins/model-alert.js
index 2bc3c7afb..f54b95b7d 100644
--- a/app/mixins/model-alert.js
+++ b/app/mixins/model-alert.js
@@ -1,5 +1,5 @@
 import Mixin from '@ember/object/mixin';
-import { get, computed } from '@ember/object';
+import { get, computed, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { reads } from '@ember/object/computed';
 
@@ -40,7 +40,8 @@ export default Mixin.create({
       },
     };
 
-    this.constructor.stateMap = stateMap
+    set(this.constructor, 'stateMap', stateMap);
+
     this._super(...arguments);
   },
 
@@ -79,7 +80,7 @@ export default Mixin.create({
     return null;
   }),
 
-  displayRecipient: computed('firstRecipient', 'model.recipients.length', function() {
+  displayRecipient: computed('firstRecipient', 'model.recipients.length', 'recipients.length', function() {
     const len = get(this, 'recipients.length');
     const firstRecipient = get(this, 'firstRecipient');
     const intl = get(this, 'intl');
@@ -136,7 +137,7 @@ export default Mixin.create({
     },
   },
 
-  availableActions: computed('actionLinks.{mute,unmute,activate,deactivate}', 'isAlertRule', function() {
+  availableActions: computed('actionLinks.{activate,deactivate,mute,unmute}', 'alertState', 'isAlertRule', function() {
     const state = this.get('alertState');
     const isAlertRule = get(this, 'isAlertRule');
     let out = [];
diff --git a/app/mixins/principal-reference.js b/app/mixins/principal-reference.js
index 9d784b1fb..eecf2be5c 100644
--- a/app/mixins/principal-reference.js
+++ b/app/mixins/principal-reference.js
@@ -2,7 +2,7 @@ import Mixin from '@ember/object/mixin';
 import { computed, get } from '@ember/object';
 
 export default Mixin.create({
-  principalIdReference: computed('userPrincipalId', 'groupPrincipalId', function(){
+  principalIdReference: computed('groupPrincipalId.length', 'userId.length', 'userPrincipalId.length', function(){
     if (get(this, 'userPrincipalId.length') > 0) {
       return get(this, 'userPrincipalId');
     }
@@ -15,5 +15,7 @@ export default Mixin.create({
       // TODO temp fix until craig switches PRTB/CRTP to use principalId. userId is only set for local users and only when the user creates a cluster.
       return `local://${ get(this, 'userId') }`;
     }
+
+    return '';
   }),
 });
diff --git a/app/models/app.js b/app/models/app.js
index cba3d0b15..611f600d5 100644
--- a/app/models/app.js
+++ b/app/models/app.js
@@ -21,7 +21,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
   globalStore:  service(),
   modalService: service('modal'),
 
-  canEdit:      false,
+  canEdit: false,
 
   namespace:       reference('targetNamespace', 'namespace', 'clusterStore'),
   catalogTemplate: reference('externalIdInfo.templateId', 'template', 'globalStore'),
@@ -51,7 +51,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     }
   }),
 
-  pods: computed('namespace.pods.@each.{workloadId,state}', 'workloads.@each.workloadLabels', function() {
+  pods: computed('name', 'namespace.pods.@each.{state,workloadId}', 'workloads.@each.workloadLabels', function() {
     return (get(this, 'namespace.pods') || []).filter((item) => {
       if ( item.state === 'removed' ) {
         return false;
@@ -75,7 +75,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  services: computed('namespace.services.@each.labels', function() {
+  services: computed('name', 'namespace.services.@each.labels', function() {
     return (get(this, 'namespace.services') || []).filter((item) => {
       if ( item['labels'] ) {
         return item['labels']['io.cattle.field/appId'] === get(this, 'name');
@@ -83,7 +83,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  dnsRecords: computed('namespace.services.@each.labels', function() {
+  dnsRecords: computed('name', 'namespace.services.@each.labels', function() {
     return (get(this, 'namespace.services') || []).filter((item) => {
       if ( item['labels'] ) {
         return item['labels']['io.cattle.field/appId'] === get(this, 'name');
@@ -91,7 +91,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  workloads: computed('namespace.workloads.@each.workloadLabels', function() {
+  workloads: computed('name', 'namespace.workloads.@each.workloadLabels', function() {
     return (get(this, 'namespace.workloads') || []).filter((item) => {
       if ( item['workloadLabels'] ) {
         return item['workloadLabels']['io.cattle.field/appId'] === get(this, 'name');
@@ -99,7 +99,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  secrets: computed('namespace.secrets', function() {
+  secrets: computed('name', 'namespace.secrets', function() {
     return (get(this, 'namespace.secrets') || []).filter((item) => {
       if ( item['labels'] ) {
         return item['labels']['io.cattle.field/appId'] === get(this, 'name');
@@ -107,7 +107,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  configMaps: computed('namespace.configMaps', function() {
+  configMaps: computed('name', 'namespace.configMaps', function() {
     return (get(this, 'namespace.configMaps') || []).filter((item) => {
       if ( item['labels'] ) {
         return item['labels']['io.cattle.field/appId'] === get(this, 'name');
@@ -115,7 +115,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  ingress: computed('namespace.ingress', function() {
+  ingress: computed('name', 'namespace.ingress', function() {
     return (get(this, 'namespace.ingress') || []).filter((item) => {
       if ( item['labels'] ) {
         return item['labels']['io.cattle.field/appId'] === get(this, 'name');
@@ -123,7 +123,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     });
   }),
 
-  volumes: computed('namespace.volumes', function() {
+  volumes: computed('name', 'namespace.volumes', function() {
     return (get(this, 'namespace.volumes') || []).filter((item) => {
       if ( item['labels'] ) {
         return item['labels']['io.cattle.field/appId'] === get(this, 'name');
@@ -164,7 +164,7 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     return parseHelmExternalId(get(this, 'externalId'));
   }),
 
-  canUpgrade: computed('actionLinks.{upgrade}', 'catalogTemplate', function() {
+  canUpgrade: computed('actionLinks.upgrade', 'catalogTemplate', function() {
     let a = get(this, 'actionLinks') || {};
 
     return !!a.upgrade && !isEmpty(this.catalogTemplate);
@@ -174,11 +174,11 @@ const App = Resource.extend(StateCounts, EndpointPorts, {
     return !isEmpty(this.catalogTemplate);
   }),
 
-  canRollback: computed('catalogTemplate', function() {
+  canRollback: computed('actionLinks', 'catalogTemplate', function() {
     return !isEmpty(this.catalogTemplate) && !!( this.actionLinks || {} ).rollback;
   }),
 
-  availableActions: computed('actionLinks.{rollback,upgrade}', 'catalogTemplate', function() {
+  availableActions: computed('actionLinks.{rollback,upgrade}', 'canRollback', 'canUpgrade', 'catalogTemplate', 'isIstio', function() {
     return [
       {
         label:   'action.upgrade',
diff --git a/app/models/catalog.js b/app/models/catalog.js
index 7b1636e04..036d7a5a4 100644
--- a/app/models/catalog.js
+++ b/app/models/catalog.js
@@ -34,9 +34,11 @@ const Catalog = Resource.extend({
     if ( !get(this, 'id') ) {
       return 'disabled';
     }
+
+    return '';
   }),
 
-  canClone: computed('actions.clone', function() {
+  canClone: computed('actions.clone', 'name', function() {
     const name         = get(this, 'name');
     const catalogNames = get(C, 'CATALOG');
     const builtIn      = [
@@ -51,7 +53,7 @@ const Catalog = Resource.extend({
     return !builtIn.includes(name);
   }),
 
-  availableActions: computed('actionLinks.{refresh}', function() {
+  availableActions: computed('actionLinks.refresh', 'id', function() {
     let a = get(this, 'actionLinks') || {};
 
     return [
diff --git a/app/models/catalogtemplate.js b/app/models/catalogtemplate.js
index 2c6372c47..79fae2532 100644
--- a/app/models/catalogtemplate.js
+++ b/app/models/catalogtemplate.js
@@ -15,6 +15,8 @@ export default Resource.extend({
     if ( id ) {
       return C.EXTERNAL_ID.KIND_CATALOG + C.EXTERNAL_ID.KIND_SEPARATOR + id;
     }
+
+    return '';
   }),
 
   externalIdInfo: computed('externalId', function() {
@@ -32,6 +34,8 @@ export default Resource.extend({
     if ( tpl ) {
       return tpl.linkFor('icon');
     }
+
+    return '';
   }),
 
   categories: computed('catalogTemplate.categories', function() {
diff --git a/app/models/certificate.js b/app/models/certificate.js
index 44996b3af..227c35dd3 100644
--- a/app/models/certificate.js
+++ b/app/models/certificate.js
@@ -10,7 +10,7 @@ export default Resource.extend({
 
   state: 'active',
 
-  workloads: computed('allWorkloads.list.@each.volumes', 'allWorkloads.list.@each.containers', function() {
+  workloads: computed('allWorkloads.list.@each.{containers,volumes}', 'name', 'namespaceId', function() {
     return (get(this, 'allWorkloads.list') || []).map((item) => item.obj).filter((workload) => {
       if ( get(this, 'namespaceId') && get(workload, 'namespaceId') !== get(this, 'namespaceId')) {
         return false;
diff --git a/app/models/cloudcredential.js b/app/models/cloudcredential.js
index f0ef3146f..0a308ba52 100644
--- a/app/models/cloudcredential.js
+++ b/app/models/cloudcredential.js
@@ -10,7 +10,7 @@ const cloudCredential = Resource.extend({
   globalStore:    service(),
   nodeTemplates: hasMany('id', 'nodetemplate', 'cloudCredentialId', 'globalStore'),
 
-  type:     'cloudCredential',
+  type: 'cloudCredential',
 
   canClone: false,
   canEdit:  true,
@@ -21,6 +21,7 @@ const cloudCredential = Resource.extend({
   isLinode:    notEmpty('linodecredentialConfig'),
   isOCI:       notEmpty('ocicredentialConfig'),
   isVMware:    notEmpty('vmwarevspherecredentialConfig'),
+
   displayType: computed('amazonec2credentialConfig', 'azurecredentialConfig', 'digitaloceancredentialConfig', 'linodecredentialConfig', 'ocicredentialConfig', 'vmwarevspherecredentialConfig', function() {
     const {
       isAmazon,
@@ -44,6 +45,8 @@ const cloudCredential = Resource.extend({
     } else if (isVMware) {
       return 'VMware vSphere';
     }
+
+    return '';
   }),
 
   numberOfNodeTemplateAssociations: computed('nodeTemplates.[]', function() {
diff --git a/app/models/cluster.js b/app/models/cluster.js
index fb4ea63f0..7c84b4ae1 100644
--- a/app/models/cluster.js
+++ b/app/models/cluster.js
@@ -94,14 +94,14 @@ export default Resource.extend(Grafana, ResourceUsage, {
     }
   })),
 
-  clusterTemplateDisplayName: computed('clusterTemplate.name', 'clusterTemplateId', function() {
+  clusterTemplateDisplayName: computed('clusterTemplate.{displayName,name}', 'clusterTemplateId', function() {
     const displayName = get(this, 'clusterTemplate.displayName');
     const clusterTemplateId = (get(this, 'clusterTemplateId') || '').replace(CLUSTER_TEMPLATE_ID_PREFIX, '');
 
     return displayName || clusterTemplateId;
   }),
 
-  clusterTemplateRevisionDisplayName: computed('clusterTemplateRevision.name', 'clusterTemplateRevisionId', function() {
+  clusterTemplateRevisionDisplayName: computed('clusterTemplateRevision.{displayName,name}', 'clusterTemplateRevisionId', function() {
     const displayName = get(this, 'clusterTemplateRevision.displayName');
     const revisionId = (get(this, 'clusterTemplateRevisionId') || '').replace(CLUSTER_TEMPLATE_ID_PREFIX, '')
 
@@ -188,6 +188,8 @@ export default Resource.extend(Grafana, ResourceUsage, {
     if ( configName ) {
       return get(this, `${ configName }.region`) || get(this, `${ configName }.regionId`) || get(this, `${ configName }.location`) || get(this, `${ configName }.zone`) || get(this, `${ configName }.zoneId`);
     }
+
+    return '';
   }),
 
   clusterProvider: computed('configName', 'nodePools.@each.{driver,nodeTemplateId}', 'driver', function() {
@@ -279,7 +281,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
     return get(projects, 'firstObject');
   }),
 
-  canSaveMonitor: computed('actionLinks.{editMonitoring,enableMonitoring}', function() {
+  canSaveMonitor: computed('actionLinks.{editMonitoring,enableMonitoring}', 'enableClusterMonitoring', function() {
     const action = get(this, 'enableClusterMonitoring') ?  'editMonitoring' : 'enableMonitoring';
 
     return !!this.hasAction(action)
@@ -308,7 +310,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
     return out;
   }),
 
-  nodeGroupVersionUpdate: computed('eksStatus.upstreamSpec.kubernetesVersion', 'eksStatus.upstreamSpec.nodeGroups.@each.{version}', function() {
+  nodeGroupVersionUpdate: computed('eksStatus.upstreamSpec.kubernetesVersion', 'eksStatus.upstreamSpec.nodeGroups.@each.version', function() {
     if (isEmpty(get(this, 'eksStatus.upstreamSpec.nodeGroups'))) {
       return false;
     }
@@ -352,7 +354,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
     return false;
   }),
 
-  availableActions: computed('actionLinks.{rotateCertificates}', 'canSaveAsTemplate', function() {
+  availableActions: computed('actionLinks.rotateCertificates', 'canSaveAsTemplate', 'isClusterScanDisabled', function() {
     const a = get(this, 'actionLinks') || {};
 
     return [
@@ -406,7 +408,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
       || get(this, 'isWindows');
   }),
 
-  isAddClusterScanScheduleDisabled: computed('isClusterScanDown', 'scheduledClusterScan.enabled', 'clusterTemplateRevision', 'clusterTemplateRevision.questions.@each', function() {
+  isAddClusterScanScheduleDisabled: computed('isClusterScanDown', 'scheduledClusterScan.enabled', 'clusterTemplateRevision', 'clusterTemplateRevision.questions.[]', function() {
     if (get(this, 'clusterTemplateRevision') === null) {
       return get(this, 'isClusterScanDown');
     }
diff --git a/app/models/clusteralertrule.js b/app/models/clusteralertrule.js
index 0de179ba0..b1ab061c5 100644
--- a/app/models/clusteralertrule.js
+++ b/app/models/clusteralertrule.js
@@ -14,7 +14,7 @@ const clusterAlertRule = Resource.extend(Alert, {
   canClone: true,
   canEdit:  true,
 
-  targetType: computed('systemServiceRule.condition', 'nodeRule.{nodeId,selector}', 'eventRule.resourceKind', 'metricRule.expression', function() {
+  targetType: computed('clusterScanRule.scanRunType', 'eventRule.resourceKind', 'metricRule.expression', 'nodeRule.{nodeId,selector}', 'systemServiceRule.condition', function() {
     if ( get(this, 'systemServiceRule.condition') ) {
       return 'systemService';
     }
@@ -33,13 +33,15 @@ const clusterAlertRule = Resource.extend(Alert, {
     if ( get(this, 'clusterScanRule.scanRunType') ) {
       return 'cisScan';
     }
+
+    return;
   }),
 
   displayTargetType: computed('targetType', function() {
     return get(this, 'intl').t(`alertPage.targetTypes.${ get(this, 'targetType') }`);
   }),
 
-  displayCondition: computed('targetType', 'nodeRule.{condition,cpuThreshold,memThreshold}', 'metricRule.{expression,comparison,thresholdValue}', function() {
+  displayCondition: computed('clusterScanRule', 'metricRule.{comparison,expression,thresholdValue}', 'nodeRule.{condition,cpuThreshold,memThreshold}', 'targetType', function() {
     const t = get(this, 'targetType');
     const intl = get(this, 'intl');
     let out = intl.t('alertPage.na');
@@ -95,6 +97,8 @@ const clusterAlertRule = Resource.extend(Alert, {
         return get(this, 'nodeRule.memThreshold');
       }
     }
+
+    return 0;
   }),
 
   actions: {
diff --git a/app/models/clusterroletemplatebinding.js b/app/models/clusterroletemplatebinding.js
index b94715bc4..120c2eb42 100644
--- a/app/models/clusterroletemplatebinding.js
+++ b/app/models/clusterroletemplatebinding.js
@@ -6,7 +6,7 @@ import PrincipalReference from 'ui/mixins/principal-reference';
 
 
 export default Resource.extend(PrincipalReference, {
-  type:    'clusterRoleTemplateBinding',
+  type: 'clusterRoleTemplateBinding',
 
   canEdit:      false,
   cluster:      reference('clusterId'),
diff --git a/app/models/clusterscan.js b/app/models/clusterscan.js
index 874a5010a..959f750f4 100644
--- a/app/models/clusterscan.js
+++ b/app/models/clusterscan.js
@@ -8,7 +8,7 @@ import { toTitle } from 'shared/utils/util';
 import { inject as service } from '@ember/service';
 
 const ClusterScan = Resource.extend({
-  intl:        service(),
+  intl: service(),
 
   type:          'clusterScan',
   report:        'null',
@@ -25,7 +25,7 @@ const ClusterScan = Resource.extend({
     this.loadReport();
   }),
 
-  file: computed('report', 'name', function(){
+  file: computed('name', 'report', 'resultsForCsv', function(){
     return {
       name: `${ get(this, 'name') }.csv`,
       file:  get(this, 'resultsForCsv')
@@ -54,13 +54,13 @@ const ClusterScan = Resource.extend({
     ]
   }),
 
-  referencedResults: computed('report', function() {
+  referencedResults: computed('report.results', function() {
     return (get(this, 'report.results') || [])
       .map((result) => result.checks)
       .reduce((agg, check) => [...agg, ...(check || [])], []);
   }),
 
-  resultsForCsv: computed('referencedResults', 'report', function() {
+  resultsForCsv: computed('profile', 'referencedResults', 'report', function() {
     return get(this, 'referencedResults').map((result) => {
       const intl = get(this, 'intl');
       const nodesAndStateForTest = this.getNodesAndStateForTestResult(result);
diff --git a/app/models/clustertemplate.js b/app/models/clustertemplate.js
index 80a1dfce7..a0424dba6 100644
--- a/app/models/clustertemplate.js
+++ b/app/models/clustertemplate.js
@@ -11,11 +11,11 @@ const ClusterTemplate =  Resource.extend({
 
   revisions: hasMany('id', 'clustertemplaterevision', 'clusterTemplateId', 'globalStore', null, 'globalStore'),
 
-  type:      'clustertemplate',
+  type: 'clustertemplate',
 
   canCloneRevision: true,
 
-  availableActions: computed('actionLinks.[]', function() {
+  availableActions: computed('actionLinks.[]', 'canCloneRevision', function() {
     return [
       {
         label:     'action.revision',
@@ -38,7 +38,7 @@ const ClusterTemplate =  Resource.extend({
       : revisions.sortBy('createdTS').get('lastObject');
   }),
 
-  displayDefaultRevisionId: computed('revisionsCount', 'revisions.[]', function() {
+  displayDefaultRevisionId: computed('defaultRevisionId', 'revisions.[]', 'revisionsCount', function() {
     return get(this, 'defaultRevisionId').split(':')[1];
   }),
 
diff --git a/app/models/clustertemplaterevision.js b/app/models/clustertemplaterevision.js
index 50ba95171..47c0aca84 100644
--- a/app/models/clustertemplaterevision.js
+++ b/app/models/clustertemplaterevision.js
@@ -10,7 +10,7 @@ export default Resource.extend({
   growl:       service(),
   intl:        service(),
 
-  type:            'clustertemplaterevision',
+  type: 'clustertemplaterevision',
 
   clusterTemplate:  reference('clusterTemplateId', 'clusterTemplate', 'globalStore'),
   canRemove:        alias('canMakeDefault'),
@@ -23,7 +23,7 @@ export default Resource.extend({
     return 'disabled';
   }),
 
-  canMakeDefault: computed('clusterTemplate.defaultRevisionId', function() {
+  canMakeDefault: computed('clusterTemplate.defaultRevisionId', 'id', function() {
     let defaultRevisionId = get(this, 'clusterTemplate.defaultRevisionId') || null;
 
     if (defaultRevisionId) {
@@ -33,7 +33,7 @@ export default Resource.extend({
     return false;
   }),
 
-  availableActions: computed('actionLinks.[]', 'enabled', 'clusterTemplate.defaultRevisionId', function() {
+  availableActions: computed('actionLinks.[]', 'canMakeDefault', 'clusterTemplate.defaultRevisionId', 'enabled', function() {
     const a = get(this, 'actionLinks') || {};
 
     return [
diff --git a/app/models/configmap.js b/app/models/configmap.js
index 046bbe415..94fb5380b 100644
--- a/app/models/configmap.js
+++ b/app/models/configmap.js
@@ -14,9 +14,9 @@ export default Resource.extend({
   canHaveLabels:  true,
   namespace:     reference('namespaceId', 'namespace', 'clusterStore'),
 
-  firstKey:  alias('keys.firstObject'),
+  firstKey: alias('keys.firstObject'),
 
-  workloads: computed('namespace.workloads.@each.volumes', 'namespace.workloads.@each.containers', function() {
+  workloads: computed('name', 'namespace.workloads.@each.{containers,volumes}', function() {
     return (get(this, 'namespace.workloads') || []).filter((workload) => {
       const volume = (get(workload, 'volumes') || []).find((volume) => get(volume, 'configMap.name') === get(this, 'name'));
       const env = (get(workload, 'containers') || []).find((container) => (get(container, 'environmentFrom') || []).find((env) => get(env, 'source') === 'configMap' && get(env, 'sourceName') === get(this, 'name')));
diff --git a/app/models/container.js b/app/models/container.js
index f6195d841..4b38e85b8 100644
--- a/app/models/container.js
+++ b/app/models/container.js
@@ -56,12 +56,14 @@ var Container = Resource.extend(Grafana, DisplayImage, {
     return choices;
   }),
 
-  restarts: computed('pod.status.containerStatuses.@each.restartCount', function() {
+  restarts: computed('name', 'pod.status.containerStatuses.@each.restartCount', function() {
     const state = (get(this, 'pod.status.containerStatuses') || []).findBy('name', get(this, 'name'));
 
     if ( state ) {
       return get(state, 'restartCount');
     }
+
+    return 0;
   }),
 
   hasCpuReservation: computed('resources.requests.cpu', function() {
diff --git a/app/models/cronjob.js b/app/models/cronjob.js
index 009f8a850..55455bf71 100644
--- a/app/models/cronjob.js
+++ b/app/models/cronjob.js
@@ -12,7 +12,7 @@ const CronJob = Workload.extend({
     return service;
   }),
 
-  availableActions: computed('actionLinks.{activate,deactivate,pause,restart,rollback,garbagecollect}', 'links.{update,remove}', 'podForShell', 'isPaused', 'canEdit', function() {
+  availableActions: computed('actionLinks.{activate,deactivate,garbagecollect,pause,restart,rollback}', 'canEdit', 'cronJobConfig.suspend', 'isPaused', 'links.{remove,update}', 'podForShell', function() {
     const actions = this._super();
     const canEdit = get(this, 'canEdit');
     const suspend = get(this, 'cronJobConfig.suspend');
diff --git a/app/models/dockercredential.js b/app/models/dockercredential.js
index b0d635afc..dc6ade441 100644
--- a/app/models/dockercredential.js
+++ b/app/models/dockercredential.js
@@ -44,13 +44,13 @@ var DockerCredential = Resource.extend({
     });
   }),
 
-  searchAddresses: computed('asArray.[].address', function() {
+  searchAddresses: computed('asArray.@each.address', function() {
     return get(this, 'asArray').map((x) => get(x, 'address'))
       .sort()
       .uniq();
   }),
 
-  searchUsernames: computed('asArray.[].username', function() {
+  searchUsernames: computed('asArray.@each.username', function() {
     return get(this, 'asArray').map((x) => get(x, 'username'))
       .sort()
       .uniq();
diff --git a/app/models/etcdbackup.js b/app/models/etcdbackup.js
index 4fe90079e..5ebec9807 100644
--- a/app/models/etcdbackup.js
+++ b/app/models/etcdbackup.js
@@ -3,7 +3,7 @@ import { computed, get } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Resource.extend({
-  scope:            service(),
+  scope: service(),
 
   availableActions: computed(() => {
     return [
diff --git a/app/models/githubconfig.js b/app/models/githubconfig.js
index b48c2f042..fb8632965 100644
--- a/app/models/githubconfig.js
+++ b/app/models/githubconfig.js
@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 var GithubConfig = Resource.extend({
   globalStore: service(),
 
-  type:        'githubConfig',
+  type: 'githubConfig',
   /*
   _principals: null,
 
diff --git a/app/models/globaldns.js b/app/models/globaldns.js
index 7bac494ac..a5d9bb3c2 100644
--- a/app/models/globaldns.js
+++ b/app/models/globaldns.js
@@ -36,7 +36,7 @@ export default Resource.extend({
   }),
 
 
-  linkedProjects: computed('projectIds.[]', 'scope.allProjects.@each.{id}', function() {
+  linkedProjects: computed('projectIds.[]', 'scope.allProjects.@each.id', function() {
     const allProjects = get(this, 'scope.allProjects') || [];
     const projectIds  = get(this, 'projectIds') || [];
 
diff --git a/app/models/globalrole.js b/app/models/globalrole.js
index 9a875d2ea..93c5a01a2 100644
--- a/app/models/globalrole.js
+++ b/app/models/globalrole.js
@@ -20,14 +20,12 @@ export default Resource.extend({
   // because of this the state shows as "Unknown" with bright yellow background
   stateColor:    'text-success',
 
+  canRemove: computed.not('builtin'),
+
   canClone: computed('access.me', 'id', function() {
     return this.access.allows('globalrole', 'create', 'global');
   }),
 
-  canRemove: computed('id', 'builtin', function() {
-    return !this.builtin;
-  }),
-
   isHidden: computed('id', function() {
     return SPECIAL.includes(get(this, 'id'));
   }),
@@ -70,7 +68,7 @@ export default Resource.extend({
     return `(${ id })`;
   }),
 
-  detail: computed('name', 'intl.locale', function() {
+  detail: computed('id', 'intl.locale', 'name', function() {
     const intl = get(this, 'intl');
     const id = get(this, 'id');
     const key = `formGlobalRoles.role.${ id }.detail`;
diff --git a/app/models/globalrolebinding.js b/app/models/globalrolebinding.js
index ac8b60889..bfdc744d0 100644
--- a/app/models/globalrolebinding.js
+++ b/app/models/globalrolebinding.js
@@ -19,7 +19,7 @@ export default Resource.extend({
     return false;
   }),
 
-  availableActions: computed('links.{remove}', function() {
+  availableActions: computed('canUpdate', 'links.remove', function() {
     let out = [
       {
         label:   'action.edit',
diff --git a/app/models/groupglobalrolebindings.js b/app/models/groupglobalrolebindings.js
index 38cdb259b..8114fc925 100644
--- a/app/models/groupglobalrolebindings.js
+++ b/app/models/groupglobalrolebindings.js
@@ -15,7 +15,7 @@ export default Resource.extend({
   globalStore:          service(),
   modalService:         service('modal'),
 
-  type:                 'groupGloblaRoleBindings',
+  type: 'groupGloblaRoleBindings',
 
   globalRoleBindingIds: null,
   groupPrincipalId:     null,
@@ -39,7 +39,7 @@ export default Resource.extend({
     return false;
   }),
 
-  availableActions: computed('globalRoleBindingIds', 'groupPrincipalId', function() {
+  availableActions: computed('canUpdate', 'globalRoleBindingIds', 'groupPrincipalId', function() {
     let out = [
       {
         label:   'action.edit',
diff --git a/app/models/horizontalpodautoscaler.js b/app/models/horizontalpodautoscaler.js
index fdfd2886e..d091e3738 100644
--- a/app/models/horizontalpodautoscaler.js
+++ b/app/models/horizontalpodautoscaler.js
@@ -10,11 +10,16 @@ export default Resource.extend({
   clusterStore:  service(),
   router:        service(),
 
-  canHaveLabels:  true,
+  canHaveLabels: true,
 
   workload:       reference('workloadId'),
   namespace:      reference('namespaceId', 'namespace', 'clusterStore'),
-  displayMetrics: computed('metrics.@each.current.{averageValue,utilization,value}', function() {
+
+  currentMetrics: computed('metrics.@each.current', function() {
+    return (get(this, 'metrics') || []).map((metric) => get(metric, 'current'));
+  }),
+
+  displayMetrics: computed('currentMetrics.@each.{averageValue,utilization,value}', 'metrics', function() {
     return (get(this, 'metrics') || [])
       .map((metric) => {
         const arr = [];
@@ -59,6 +64,8 @@ export default Resource.extend({
     if ( get(items, 'length') > 1 ) {
       return items[1];
     }
+
+    return null;
   }),
 
   actions:      {
diff --git a/app/models/ingress.js b/app/models/ingress.js
index a90543f4a..83a5c4552 100644
--- a/app/models/ingress.js
+++ b/app/models/ingress.js
@@ -7,14 +7,14 @@ export default Resource.extend({
   clusterStore:  service(),
   router:        service(),
 
-  type:          'ingress',
+  type: 'ingress',
 
   canClone:      true,
   canHaveLabels: true,
 
-  namespace:     reference('namespaceId', 'namespace', 'clusterStore'),
+  namespace: reference('namespaceId', 'namespace', 'clusterStore'),
 
-  targets: computed('rules.@each.paths', function() {
+  targets: computed('defaultBackend', 'rules.@each.paths', 'store', 'tls', function() {
     const out = [];
     const store = get(this, 'store');
 
diff --git a/app/models/kontainerdriver.js b/app/models/kontainerdriver.js
index e584ea59f..510c4a8aa 100644
--- a/app/models/kontainerdriver.js
+++ b/app/models/kontainerdriver.js
@@ -29,7 +29,7 @@ var KontainerDriver = Resource.extend({
     ];
   }),
 
-  displayName: computed('name', 'intl.locale', function() {
+  displayName: computed('id', 'intl.locale', 'name', function() {
     const intl = get(this, 'intl');
     const name = get(this, 'name');
     const keyByName = `kontainerDriver.displayName.${ name }`;
@@ -51,7 +51,7 @@ var KontainerDriver = Resource.extend({
   }),
 
 
-  hasUi: computed('hasBuiltinUi', function() {
+  hasUi: computed('hasBuiltinUi', 'uiUrl', function() {
     return !!get(this, 'uiUrl');
   }),
 
diff --git a/app/models/member.js b/app/models/member.js
index 4c6aedd7a..e18b67c0b 100644
--- a/app/models/member.js
+++ b/app/models/member.js
@@ -16,7 +16,7 @@ export default Resource.extend({
     return;
   }),
 
-  displayType: computed('principal.{id}', function() {
+  displayType: computed('principal.id', 'principalType', function() {
     let principal = get(this, 'principal');
     let type      = null;
 
@@ -29,7 +29,7 @@ export default Resource.extend({
     return type;
   }),
 
-  displayName: computed('principal.{id}', function() {
+  displayName: computed('groupPrincipalId', 'principal.id', 'userPrincipalId', function() {
     let principal = get(this, 'principal');
     let name      = null;
 
diff --git a/app/models/multiclusterapp.js b/app/models/multiclusterapp.js
index 8defb8b85..6788b7af7 100644
--- a/app/models/multiclusterapp.js
+++ b/app/models/multiclusterapp.js
@@ -18,7 +18,7 @@ const MultiClusterApp = Resource.extend({
   clusterStore:    service(),
   globalStore:     service(),
 
-  canEdit:         false,
+  canEdit: false,
 
   templateVersion: reference('templateVersionId', 'templateversion', 'globalStore'),
   catalogTemplate: reference('templateId', 'template', 'globalStore'),
@@ -37,11 +37,11 @@ const MultiClusterApp = Resource.extend({
     return parseHelmExternalId(get(this, 'templateVersion.externalId'));
   }),
 
-  templateId: computed('externalIdInfo.{templateId}', function() {
+  templateId: computed('externalIdInfo.templateId', function() {
     return get(this, 'externalIdInfo.templateId');
   }),
 
-  canUpgrade: computed('actionLinks.{upgrade}', 'catalogTemplate', 'templateVersion', function() {
+  canUpgrade: computed('actionLinks.upgrade', 'catalogTemplate', 'links', 'templateVersion', function() {
     const l = get(this, 'links') || {};
 
     return !!l.update && !isEmpty(this.catalogTemplate);
@@ -51,11 +51,11 @@ const MultiClusterApp = Resource.extend({
     return !isEmpty(this.catalogTemplate);
   }),
 
-  canRollback: computed('catalogTemplate', 'templateVersion', function() {
+  canRollback: computed('actionLinks', 'catalogTemplate', 'templateVersion', function() {
     return !isEmpty(this.catalogTemplate) && !!( this.actionLinks || {} ).rollback;
   }),
 
-  availableActions: computed('actionLinks.{rollback}', 'links.{update}', 'canUpgrade', 'canRollback', function() {
+  availableActions: computed('actionLinks.rollback', 'links.update', 'canUpgrade', 'canRollback', function() {
     return [
       {
         label:   'action.upgrade',
diff --git a/app/models/namespace.js b/app/models/namespace.js
index 26d281f2e..32a70bf51 100644
--- a/app/models/namespace.js
+++ b/app/models/namespace.js
@@ -87,7 +87,7 @@ var Namespace = Resource.extend(StateCounts, {
     // @TODO-2.0 this.defineStateCounts('services', 'serviceStates', 'serviceCountSort');
   },
 
-  availableActions: computed('projectId', 'actionLinks.@each.{move}', 'scope.currentCluster.istioEnabled', 'scope.currentCluster.systemProject', 'autoInjectionEnabled', function() {
+  availableActions: computed('projectId', 'actionLinks.@each.move', 'scope.currentCluster.istioEnabled', 'scope.currentCluster.systemProject', 'autoInjectionEnabled', function() {
     let aa = get(this, 'actionLinks') || {};
 
     let out = [
@@ -162,6 +162,8 @@ var Namespace = Resource.extend(StateCounts, {
     if ( tpl ) {
       return tpl.linkFor('icon');
     }
+
+    return '';
   }),
 
   grouping: computed('externalIdInfo.kind', 'group', 'system', function() {
diff --git a/app/models/namespacedsecret.js b/app/models/namespacedsecret.js
index 7b5128cba..b0229b490 100644
--- a/app/models/namespacedsecret.js
+++ b/app/models/namespacedsecret.js
@@ -7,9 +7,9 @@ export default Secret.extend({
   clusterStore: service(),
   router:       service(),
 
-  canClone:     true,
+  canClone: true,
 
-  namespace:    reference('namespaceId', 'namespace', 'clusterStore'),
+  namespace: reference('namespaceId', 'namespace', 'clusterStore'),
 
   actions: {
     edit() {
diff --git a/app/models/node.js b/app/models/node.js
index f7fd11cda..190a03596 100644
--- a/app/models/node.js
+++ b/app/models/node.js
@@ -42,7 +42,7 @@ var Node = Resource.extend(Grafana, StateCounts, ResourceUsage, {
     this.defineStateCounts('arrangedInstances', 'instanceStates', 'instanceCountSort');
   },
 
-  availableActions: computed('links.{nodeConfig}', 'actionLinks.{cordon,uncordon,drain}', function() {
+  availableActions: computed('links.nodeConfig', 'actionLinks.{cordon,uncordon,drain}', function() {
     let l = get(this, 'links');
     const a = get(this, 'actionLinks') || {};
 
@@ -88,7 +88,7 @@ var Node = Resource.extend(Grafana, StateCounts, ResourceUsage, {
     return out;
   }),
 
-  displayName: computed('name', 'nodeName', 'requestedHostname', 'id', function() {
+  displayName: computed('id', 'name', 'nodeName.length', 'nodes', 'requestedHostname', function() {
     let name = get(this, 'name');
 
     if ( name ) {
@@ -217,7 +217,7 @@ var Node = Resource.extend(Grafana, StateCounts, ResourceUsage, {
     return 'icon-docker';
   }),
 
-  versionBlurb: computed('info.os.dockerVersion', function() {
+  versionBlurb: computed('info.os.dockerVersion', 'isContainerD', function() {
     let version = get(this, 'info.os.dockerVersion') || '';
 
     if ( version.startsWith(CONTAINERD) ) {
@@ -263,7 +263,7 @@ var Node = Resource.extend(Grafana, StateCounts, ResourceUsage, {
   }),
 
   // If you use this you must ensure that services and containers are already in the store
-  requireAnyLabelStrings: computed(`labels.${ C.LABEL.REQUIRE_ANY }`, function() {
+  requireAnyLabelStrings: computed(`labels.${ C.LABEL.REQUIRE_ANY }`, 'labels', function() {
     return  ((get(this, 'labels') || {})[C.LABEL.REQUIRE_ANY] || '')
       .split(/\s*,\s*/)
       .filter((x) => x.length > 0 && x !== C.LABEL.SYSTEM_TYPE);
diff --git a/app/models/nodedriver.js b/app/models/nodedriver.js
index a0ee95a62..33408d32d 100644
--- a/app/models/nodedriver.js
+++ b/app/models/nodedriver.js
@@ -30,7 +30,7 @@ export default Resource.extend({
   catalog:             service(),
   intl:                service(),
   type:                'nodeDriver',
-  catalogTemplateIcon: computed('externalId', function() {
+  catalogTemplateIcon: computed('app.baseAssets', 'externalId', function() {
     let parsedExtId = parseExternalId(get(this, 'externalId')) || null;
 
     if (!parsedExtId) {
@@ -45,7 +45,7 @@ export default Resource.extend({
     }
   }),
 
-  displayName: computed('name', 'intl.locale', function() {
+  displayName: computed('id', 'intl.locale', 'name', function() {
     const intl = get(this, 'intl');
     const name = get(this, 'name');
     const key = `nodeDriver.displayName.${ name }`;
@@ -59,7 +59,7 @@ export default Resource.extend({
     }
   }),
 
-  displayIcon: computed('name', function() {
+  displayIcon: computed('hasBuiltinUi', 'name', function() {
     let name = get(this, 'name');
 
     if ( get(this, 'hasBuiltinUi') ) {
@@ -93,7 +93,7 @@ export default Resource.extend({
     return !get(this, 'builtin') && !get(this, 'externalId');
   }),
 
-  hasUi: computed('hasBuiltinUi', function() {
+  hasUi: computed('hasBuiltinUi', 'uiUrl', function() {
     return get(this, 'hasBuiltinUi') || !!get(this, 'uiUrl');
   }),
 
@@ -111,7 +111,7 @@ export default Resource.extend({
     return get(this, 'state') === 'inactive'
   }),
 
-  availableActions: computed('actionLinks.{activate,deactivate}', function() {
+  availableActions: computed('actionLinks.{activate,deactivate}', 'state', function() {
     let a = get(this, 'actionLinks') || {};
 
     return [
diff --git a/app/models/nodepool.js b/app/models/nodepool.js
index 729949a9e..a449b1f62 100644
--- a/app/models/nodepool.js
+++ b/app/models/nodepool.js
@@ -8,7 +8,7 @@ const NodePool = Resource.extend({
   type:          'nodePool',
   quantityTimer: null,
 
-  nodeTemplate:  reference('nodeTemplateId'),
+  nodeTemplate: reference('nodeTemplateId'),
 
   displayProvider: computed('driver', 'nodeTemplate.driver', 'intl.locale', function() {
     const intl = get(this, 'intl');
diff --git a/app/models/nodetemplate.js b/app/models/nodetemplate.js
index c058922dc..06a23e4eb 100644
--- a/app/models/nodetemplate.js
+++ b/app/models/nodetemplate.js
@@ -11,9 +11,11 @@ export default Resource.extend({
   modalService: service('modal'),
   globalStore:  service(),
 
-  type:         'nodeTemplate',
-  canClone:     true,
-  creator:      reference('creatorId', 'user', 'globalStore'),
+  type:                   'nodeTemplate',
+  canClone:               true,
+  dynamicComputedKeyName: null,
+
+  creator: reference('creatorId', 'user', 'globalStore'),
 
   init() {
     this._super(...arguments);
@@ -128,9 +130,11 @@ export default Resource.extend({
   },
 
   registerDynamicComputedProperty(propertyName, watchedKeys, key) {
-    defineProperty(this, propertyName, computed(...watchedKeys, () => {
-      return this._displayVar(key);
-    }));
+    set(this, 'dynamicComputedKeyName', key);
+    defineProperty(this, propertyName, computed(...watchedKeys, 'dynamicComputedKeyName', this.getDisplayVar));
   },
 
+  getDisplayVar() {
+    return this._displayVar(get(this, 'dynamicComputedKeyName'));
+  }
 });
diff --git a/app/models/notifier.js b/app/models/notifier.js
index 7d4fc250a..57d675c6c 100644
--- a/app/models/notifier.js
+++ b/app/models/notifier.js
@@ -11,7 +11,7 @@ export default Resource.extend({
   globalStore:  service(),
   modalService: service('modal'),
 
-  type:         'notifier',
+  type: 'notifier',
 
   displayNameAndType: computed('displayName', 'notifierType', function() {
     const upperCaseType = (get(this, 'notifierType') || '').replace(/^\S/, (s) => {
@@ -21,7 +21,7 @@ export default Resource.extend({
     return `${ get(this, 'displayName') } (${ upperCaseType })`
   }),
 
-  notifierTableLabel: computed('slackConfig', 'pagerdutyConfig', 'emailConfig', 'webhookConfig', 'wechatConfig', 'dingtalkConfig', 'msteamsConfig', function(){
+  notifierTableLabel: computed('dingtalkConfig', 'emailConfig', 'msteamsConfig', 'pagerdutyConfig', 'slackConfig', 'smtpConfig', 'webhookConfig', 'wechatConfig', function(){
     const sc = get(this, 'slackConfig');
     const pc = get(this, 'pagerdutyConfig');
     const ec = get(this, 'smtpConfig');
@@ -55,7 +55,7 @@ export default Resource.extend({
     return C.NOTIFIER_TABLE_LABEL.DEFAULT;
   }),
 
-  notifierType: computed('slackConfig', 'pagerdutyConfig', 'emailConfig', 'webhookConfig', 'wechatConfig', 'dingtalkConfig', 'msteamsConfig', function(){
+  notifierType: computed('dingtalkConfig', 'emailConfig', 'msteamsConfig', 'pagerdutyConfig', 'slackConfig', 'smtpConfig', 'webhookConfig', 'wechatConfig', function(){
     const sc = get(this, 'slackConfig');
     const pc = get(this, 'pagerdutyConfig');
     const ec = get(this, 'smtpConfig');
@@ -89,7 +89,7 @@ export default Resource.extend({
     return null;
   }),
 
-  notifierValue: computed('slackConfig', 'pagerdutyConfig', 'emailConfig', 'webhookConfig', 'wechatConfig', function(){
+  notifierValue: computed('emailConfig', 'pagerdutyConfig', 'slackConfig', 'smtpConfig', 'webhookConfig', 'wechatConfig', function(){
     const sc = get(this, 'slackConfig');
     const pc = get(this, 'pagerdutyConfig');
     const ec = get(this, 'smtpConfig');
@@ -121,7 +121,7 @@ export default Resource.extend({
     return moment(d).fromNow();
   }),
 
-  notifierLabel: computed('slackConfig', 'pagerdutyConfig', 'emailConfig', 'webhookConfig', 'wechartConfig', function(){
+  notifierLabel: computed('emailConfig', 'pagerdutyConfig', 'slackConfig', 'smtpConfig', 'webhookConfig', 'wechartConfig', 'wechatConfig', function(){
     const sc = get(this, 'slackConfig');
     const pc = get(this, 'pagerdutyConfig');
     const ec = get(this, 'smtpConfig');
diff --git a/app/models/persistentvolume.js b/app/models/persistentvolume.js
index 8497dc82c..eba610a17 100644
--- a/app/models/persistentvolume.js
+++ b/app/models/persistentvolume.js
@@ -18,6 +18,8 @@ export default Volume.extend({
     if ( get(this, 'claimRef.name') ) {
       return `${ get(this, 'claimRef.namespace') }/${ get(this, 'claimRef.name') }`;
     }
+
+    return;
   }),
 
   actions: {
diff --git a/app/models/persistentvolumeclaim.js b/app/models/persistentvolumeclaim.js
index fb90cfb4c..c027ef519 100644
--- a/app/models/persistentvolumeclaim.js
+++ b/app/models/persistentvolumeclaim.js
@@ -13,7 +13,7 @@ var PersistentVolumeClaim = Resource.extend({
   persistentVolume: reference('volumeId', 'persistentVolume', 'clusterStore'),
   namespace:        reference('namespaceId', 'namespace', 'clusterStore'),
 
-  workloads: computed('namespace.workloads.@each.volumes', function() {
+  workloads: computed('id', 'namespace.workloads.@each.volumes', function() {
     return (get(this, 'namespace.workloads') || []).filter((workload) => (get(workload, 'volumes') || []).find((volume) => get(volume, 'persistentVolumeClaim.persistentVolumeClaimId') === get(this, 'id')));
   }),
 
@@ -23,6 +23,8 @@ var PersistentVolumeClaim = Resource.extend({
     if ( str ) {
       return parseSi(str, 1024);
     }
+
+    return;
   }),
 
   displaySize: computed('sizeBytes', function() {
@@ -31,6 +33,8 @@ var PersistentVolumeClaim = Resource.extend({
     if ( bytes ) {
       return formatSi(bytes, 1024, 'iB', 'B');
     }
+
+    return;
   }),
 });
 
diff --git a/app/models/pipeline.js b/app/models/pipeline.js
index 9dd9140ce..a08b73931 100644
--- a/app/models/pipeline.js
+++ b/app/models/pipeline.js
@@ -60,7 +60,7 @@ let Pipeline = Resource.extend({
     return tokens.join('/');
   }),
 
-  availableActions: computed('links.yaml', function() {
+  availableActions: computed('actions', 'links.yaml', 'repositoryUrl', function() {
     let l = get(this, 'links') || {};
     let a = get(this, 'actions') || {};
     const isExample = C.DEMO_REPOSITORIES.findBy('url', get(this, 'repositoryUrl'));
diff --git a/app/models/pipelineexecution.js b/app/models/pipelineexecution.js
index 034025012..5fb68fc52 100644
--- a/app/models/pipelineexecution.js
+++ b/app/models/pipelineexecution.js
@@ -84,7 +84,7 @@ let PipelineExecution = Resource.extend({
     return url;
   }),
 
-  commitUrl: computed('commit', function() {
+  commitUrl: computed('commit', 'displayRepositoryUrl', 'pipeline.displayName', 'pipeline.sourceCodeCredential.sourceCodeType', function() {
     let url = get(this, 'displayRepositoryUrl');
     const sourceCodeType = get(this, 'pipeline.sourceCodeCredential.sourceCodeType');
     const name = get(this, 'pipeline.displayName');
@@ -103,7 +103,7 @@ let PipelineExecution = Resource.extend({
     }
   }),
 
-  branchUrl: computed('branch', function() {
+  branchUrl: computed('branch', 'displayRepositoryUrl', 'pipeline.displayName', 'pipeline.sourceCodeCredential.sourceCodeType', function() {
     let url = get(this, 'displayRepositoryUrl');
     const sourceCodeType = get(this, 'pipeline.sourceCodeCredential.sourceCodeType');
     const name = get(this, 'pipeline.displayName');
@@ -131,6 +131,8 @@ let PipelineExecution = Resource.extend({
 
       return duration < 0 ? null : duration;
     }
+
+    return null;
   }),
 
   bitbucketRootUrl(repoType) {
diff --git a/app/models/pod.js b/app/models/pod.js
index e8e0b56c9..018330c78 100644
--- a/app/models/pod.js
+++ b/app/models/pod.js
@@ -66,6 +66,8 @@ var Pod = Resource.extend(Grafana, DisplayImage, {
     if ( get(this, 'memoryReservation') ) {
       return formatSi(get(this, 'memoryReservation'), 1024, 'iB', 'B');
     }
+
+    return;
   }),
 
   combinedState: computed('node.state', 'workload.state', 'state', 'healthState', 'healthCheck', function() {
@@ -88,7 +90,7 @@ var Pod = Resource.extend(Grafana, DisplayImage, {
     return ['running', 'migrating', 'restarting'].indexOf(get(this, 'state')) >= 0;
   }),
 
-  displayState: computed('_displayState', 'exitCode', function() {
+  displayState: computed('_displayState', 'exitCode', 'state', function() {
     let out = get(this, '_displayState');
     let code = get(this, 'exitCode');
 
@@ -147,6 +149,8 @@ var Pod = Resource.extend(Grafana, DisplayImage, {
       return match.slice(1).map((octet) => strPad(octet, 3, '0', false))
         .join('.');
     }
+
+    return '';
   }),
 
   isGlobalScale: computed('labels', function() {
diff --git a/app/models/podsecuritypolicytemplate.js b/app/models/podsecuritypolicytemplate.js
index 3f8ace121..2781fafe4 100644
--- a/app/models/podsecuritypolicytemplate.js
+++ b/app/models/podsecuritypolicytemplate.js
@@ -4,7 +4,7 @@ import Resource from '@rancher/ember-api-store/models/resource';
 export default Resource.extend({
   router: service(),
 
-  type:    'podSecurityPolicyTemplate',
+  type: 'podSecurityPolicyTemplate',
 
   canHaveLabels: true,
 
diff --git a/app/models/port.js b/app/models/port.js
index 4027d4f5a..80d3418df 100644
--- a/app/models/port.js
+++ b/app/models/port.js
@@ -4,7 +4,7 @@ import { computed } from '@ember/object';
 var Port = Resource.extend({
   _publicIp:       null,
   _publicIpState:  null,
-  displayPublicIp: computed('_publicIpState', '_publicIp', 'publicIpAddressId', 'bindAddress', 'publicPort', function() {
+  displayPublicIp: computed('_publicIp', '_publicIpState', 'bindAddress', 'publicIpAddressId', 'publicPort', 'store', function() {
     var bind = this.get('bindAddress');
 
     if ( bind ) {
diff --git a/app/models/principal.js b/app/models/principal.js
index c4b0ae1e8..b7cdc11fb 100644
--- a/app/models/principal.js
+++ b/app/models/principal.js
@@ -29,12 +29,12 @@ var Principal = Resource.extend({
     }
   }),
 
-  isGithub: computed('parsedExternalType', function() {
+  isGithub: computed('parsedExternalType', 'provider', function() {
     // console.log('is github?', get(this, 'provider'));
     return (get(this, 'provider') || '').toLowerCase() === 'github';
   }),
 
-  isGoogleOauth: computed('parsedExternalType', function() {
+  isGoogleOauth: computed('parsedExternalType', 'provider', function() {
     return (get(this, 'provider') || '').toLowerCase() === 'googleoauth';
   }),
 
@@ -52,11 +52,10 @@ var Principal = Resource.extend({
     case C.PROJECT.TYPE_PING_USER:
     case C.PROJECT.TYPE_RANCHER:
     case C.PROJECT.TYPE_SHIBBOLETH_USER:
+    default:
       return C.PROJECT.PERSON;
-
     case C.PROJECT.TYPE_GITHUB_TEAM:
       return C.PROJECT.TEAM;
-
     case C.PROJECT.TYPE_ACTIVE_DIRECTORY_GROUP:
     case C.PROJECT.TYPE_ADFS_GROUP:
     case C.PROJECT.TYPE_AZURE_GROUP:
diff --git a/app/models/project.js b/app/models/project.js
index a7b2458d8..8a338f0b6 100644
--- a/app/models/project.js
+++ b/app/models/project.js
@@ -67,7 +67,7 @@ export default Resource.extend({
     return get(this, 'scope.currentProject.id') === get(this, 'id');
   }),
 
-  canSaveMonitor: computed('isSystemProject', 'actionLinks.{editMonitoring,enableMonitoring}', function() {
+  canSaveMonitor: computed('actionLinks.{editMonitoring,enableMonitoring}', 'enableProjectMonitoring', 'isSystemProject', function() {
     if ( get(this, 'isSystemProject') ) {
       return false;
     }
diff --git a/app/models/projectalertrule.js b/app/models/projectalertrule.js
index c2296c76e..30210608a 100644
--- a/app/models/projectalertrule.js
+++ b/app/models/projectalertrule.js
@@ -40,7 +40,7 @@ const projectAlertRule = Resource.extend(Alert, {
     return get(workload, 'displayName')
   }),
 
-  displayCondition: computed('targetType', 'podRule.{condition,restartTimes,restartIntervalSeconds}', 'workloadRule.availablePercentage', function() {
+  displayCondition: computed('metricRule', 'podRule.{condition,restartIntervalSeconds,restartTimes}', 'targetType', 'workloadRule.availablePercentage', function() {
     const t = get(this, 'targetType');
     const intl = get(this, 'intl');
 
@@ -94,6 +94,8 @@ const projectAlertRule = Resource.extend(Alert, {
     if ( get(this, 'metricRule.expression') ) {
       return 'metric'
     }
+
+    return;
   }),
 
   actions: {
diff --git a/app/models/publicendpoint.js b/app/models/publicendpoint.js
index da2c2f137..2e4f9b742 100644
--- a/app/models/publicendpoint.js
+++ b/app/models/publicendpoint.js
@@ -49,7 +49,7 @@ var PublicEndpoint = Resource.extend({
   }),
 
   // ip:port
-  endpoint: computed('port', 'addresses', 'allNodes', 'isIngress', 'hostname', function() {
+  endpoint: computed('addresses', 'allNodes', 'hostname', 'isIngress', 'port', 'scope.currentCluster.id', function() {
     const addresses = get(this, 'addresses');
     const allNodes = get(this, 'allNodes');
     const hostname = get(this, 'hostname') || '';
@@ -100,7 +100,7 @@ var PublicEndpoint = Resource.extend({
     return out;
   }),
 
-  linkEndpoint: computed('isTcpish', 'isMaybeSecure', 'displayEndpoint', 'port', 'isIngress', 'path', function() {
+  linkEndpoint: computed('displayEndpoint', 'endpoint', 'isIngress', 'isMaybeSecure', 'isTcpish', 'path', 'port', function() {
     let path = get(this, 'path') || '';
 
     if (get(this, 'isTcpish') && get(this, 'port') > 0 ) {
@@ -118,6 +118,8 @@ var PublicEndpoint = Resource.extend({
 
       return out;
     }
+
+    return;
   }),
 
   isTcpish: computed('protocol', function() {
@@ -136,7 +138,7 @@ var PublicEndpoint = Resource.extend({
     return get(this, 'ingressId') !== '' && get(this, 'ingressId') !== null;
   }),
 
-  isReady: computed('hostname', function(){
+  isReady: computed('hostname', 'isIngress', function(){
     const xip = get(this, `settings.${ C.SETTING.INGRESS_IP_DOMAIN }`);
     const hostname = get(this, 'hostname') || '';
 
diff --git a/app/models/roletemplate.js b/app/models/roletemplate.js
index 004eee5e6..aadb99b2b 100644
--- a/app/models/roletemplate.js
+++ b/app/models/roletemplate.js
@@ -15,7 +15,7 @@ export default Resource.extend({
     return get(this, 'locked') ? 'locked' : 'active';
   }),
 
-  isCustom: computed('roleTemplateId', function() {
+  isCustom: computed('id', 'roleTemplateId', function() {
     return !C.BASIC_ROLE_TEMPLATE_ROLES.includes(get(this, 'id'));
   }),
 
diff --git a/app/models/secret.js b/app/models/secret.js
index 8bf916cb9..98c598fe8 100644
--- a/app/models/secret.js
+++ b/app/models/secret.js
@@ -15,7 +15,7 @@ export default Resource.extend({
     return Object.keys(get(this, 'data') || {}).sort();
   }),
 
-  workloads: computed('allWorkloads.list.@each.volumes', 'allWorkloads.list.@each.containers', function() {
+  workloads: computed('allWorkloads.list.@each.{containers,volumes}', 'name', 'namespaceId', function() {
     return (get(this, 'allWorkloads.list') || []).map((item) => item.obj).filter((workload) => {
       if ( get(this, 'namespaceId') && get(workload, 'namespaceId') !== get(this, 'namespaceId')) {
         return false;
diff --git a/app/models/service.js b/app/models/service.js
index 7bd928733..8e503c176 100644
--- a/app/models/service.js
+++ b/app/models/service.js
@@ -32,7 +32,7 @@ var Service = Resource.extend(EndpointPorts, {
 
   isIngress: equal('ownerReferences.firstObject.kind', 'Ingress'),
 
-  selectedPods: computed('selector', function() {
+  selectedPods: computed('selector', 'store', function() {
     const rules = get(this, 'selector');
     let keys = Object.keys(rules);
 
@@ -112,7 +112,7 @@ var Service = Resource.extend(EndpointPorts, {
     return get(this, 'intl').t(`dnsPage.type.${  get(this, 'recordType') }`);
   }),
 
-  displayTarget: computed('recordType', 'ipAddresses.[]', 'hostname', 'selector', 'targetDnsRecords.[]', 'targetWorkloads.[]', function() {
+  displayTarget: computed('clusterIp', 'hostname', 'ipAddresses.[]', 'recordType', 'selector', 'targetDnsRecords.[]', 'targetWorkloads.[]', function() {
     const selectors = get(this, 'selector') || {};
     const records = get(this, 'targetDnsRecords') || [];
     const workloads = get(this, 'targetWorkloads') || {};
@@ -168,7 +168,7 @@ var Service = Resource.extend(EndpointPorts, {
     }
   }),
 
-  proxyEndpoints: computed('labels', function(){
+  proxyEndpoints: computed('labels', 'name', 'namespaceId', 'ports', 'scope.currentCluster.id', function(){
     const parts = []
     const labels = get(this, 'labels');
     const location = window.location;
diff --git a/app/models/setting.js b/app/models/setting.js
index 936c94933..71e0b0c02 100644
--- a/app/models/setting.js
+++ b/app/models/setting.js
@@ -25,7 +25,7 @@ export default Resource.extend({
     return !!get(this, 'links.update') && id !== 'cacerts';
   }),
 
-  availableActions: computed('actionLinks.{update,remove}', function() {
+  availableActions: computed('actionLinks.{remove,update}', 'canRevert', function() {
     return [
       {
         label:     'action.revert',
diff --git a/app/models/storageclass.js b/app/models/storageclass.js
index 388146a97..4f46a66c9 100644
--- a/app/models/storageclass.js
+++ b/app/models/storageclass.js
@@ -38,7 +38,7 @@ export function registerProvisioner(name, provisioner, component, supported) {
 
   PROVISIONERS.push({
     name,
-    value:     provisioner,
+    value: provisioner,
     component,
     supported,
   });
diff --git a/app/models/target.js b/app/models/target.js
index d19149aa9..8d8bd5fdb 100644
--- a/app/models/target.js
+++ b/app/models/target.js
@@ -5,11 +5,11 @@ import { reference } from '@rancher/ember-api-store/utils/denormalize';
 export default Resource.extend({
   project: reference('projectId'),
 
-  projectName: computed('project', function() {
+  projectName: computed('project.displayName', function() {
     return get(this, 'project.displayName');
   }),
 
-  clusterName: computed('project.cluster', function() {
+  clusterName: computed('project.cluster.displayName', function() {
     return get(this, 'project.cluster.displayName');
   }),
 
diff --git a/app/models/template.js b/app/models/template.js
index 47eb50518..5c768b4be 100644
--- a/app/models/template.js
+++ b/app/models/template.js
@@ -59,7 +59,7 @@ const Template = Resource.extend({
     return out;
   }),
 
-  headers: computed('project.current.id', function() {
+  headers: computed('project.current.id', 'projects.current.id', function() {
     return { [C.HEADER.PROJECT_ID]: get(this, 'projects.current.id') };
   }),
 
@@ -96,7 +96,7 @@ const Template = Resource.extend({
     return get(this, 'categoryArray').map((x) => (x || '').underscore().toLowerCase());
   }),
 
-  certifiedType: computed('catalogId', function() {
+  certifiedType: computed('catalogId', 'labels', function() {
     let str = null;
     let labels = get(this, 'labels');
 
@@ -113,7 +113,7 @@ const Template = Resource.extend({
     }
   }),
 
-  certifiedClass: computed('certifiedType', function() {
+  certifiedClass: computed('certifiedType', 'settings.isRancher', function() {
     let type = get(this, 'certifiedType');
 
     if ( type === 'rancher' && get(this, 'settings.isRancher') ) {
@@ -123,7 +123,7 @@ const Template = Resource.extend({
     }
   }),
 
-  certified: computed('certifiedType', 'catalogId', 'labels', 'intl.locale', function() {
+  certified: computed('catalogId', 'certifiedType', 'intl.locale', 'labels', 'settings.isRancher', function() {
     let out = null;
     let labels = get(this, 'labels');
 
diff --git a/app/models/templateversion.js b/app/models/templateversion.js
index f866174d9..3f52c3bc5 100644
--- a/app/models/templateversion.js
+++ b/app/models/templateversion.js
@@ -28,7 +28,7 @@ export default Resource.extend({
     return false;
   }),
 
-  headers: computed('project.current.id', function() {
+  headers: computed('project.current.id', 'scope.currentProject.id', function() {
     return { [C.HEADER.PROJECT_ID]: get(this, 'scope.currentProject.id') };
   }),
 
diff --git a/app/models/token.js b/app/models/token.js
index 0762d5b04..3ca082d47 100644
--- a/app/models/token.js
+++ b/app/models/token.js
@@ -4,7 +4,7 @@ import { next } from '@ember/runloop'
 import { inject as service } from '@ember/service';
 
 export default Resource.extend({
-  growl:       service(),
+  growl: service(),
 
   state: computed('expired', function() {
     if ( get(this, 'expired') ) {
diff --git a/app/models/user.js b/app/models/user.js
index 7be3cb01b..4421e6e8f 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -58,11 +58,11 @@ export default Resource.extend({
     return get(this, 'globalRoleBindings').findBy('globalRole.isBase', true);
   }),
 
-  isMe: computed('access.principal', function() {
+  isMe: computed('access.principal.id', 'id', function() {
     return get(this, 'access.principal.id') === get(this, 'id');
   }),
 
-  availableActions: computed('enabled', 'access.providers.[]', function() {
+  availableActions: computed('access.providers.[]', 'actionLinks', 'enabled', function() {
     const on         = get(this, 'enabled') !== false;
     const { access } = this;
     const a = get(this, 'actionLinks') || {};
diff --git a/app/models/volume.js b/app/models/volume.js
index bd1bc7dd8..1bdde0341 100644
--- a/app/models/volume.js
+++ b/app/models/volume.js
@@ -76,7 +76,7 @@ var Volume = Resource.extend({
 
   type: 'volume',
 
-  configName: computed('sources.@each.{value}', 'state', function() {
+  configName: computed('sources.@each.value', 'state', function() {
     const keys = get(this, 'sources').map((x) => x.value);
 
     for ( let key, i = 0 ; i < keys.length ; i++ ) {
@@ -95,13 +95,15 @@ var Volume = Resource.extend({
     if ( key ) {
       return get(this, key);
     }
+
+    return;
   }),
 
-  sourceName: computed('configName', function(){
+  sourceName: computed('configName', 'sources', function(){
     const key = get(this, 'configName');
 
     if ( !key ) {
-      return
+      return;
     }
 
     let entry;
@@ -121,9 +123,11 @@ var Volume = Resource.extend({
     if (entry){
       return entry.name;
     }
+
+    return;
   }),
 
-  displaySource: computed('sourceName', 'intl.locale', function() {
+  displaySource: computed('csi.driver', 'intl.locale', 'sourceName', function() {
     const intl       = get(this, 'intl');
     const sourceName = get(this, 'sourceName');
 
diff --git a/app/models/workload.js b/app/models/workload.js
index a01144baf..1d0fa7afa 100644
--- a/app/models/workload.js
+++ b/app/models/workload.js
@@ -22,9 +22,9 @@ var Workload = Resource.extend(Grafana, DisplayImage, StateCounts, EndpointPorts
   router:        service(),
   clusterStore: service(),
 
-  pods:         hasMany('id', 'pod', 'workloadId'),
+  pods: hasMany('id', 'pod', 'workloadId'),
 
-  scaleTimer:       null,
+  scaleTimer: null,
 
   // @TODO-2.0 cleanup all these...
   hasPorts:            true,
@@ -40,7 +40,7 @@ var Workload = Resource.extend(Grafana, DisplayImage, StateCounts, EndpointPorts
   isBalancer:          false,
   canBalanceTo:         true,
 
-  grafanaResourceId:    alias('name'),
+  grafanaResourceId: alias('name'),
 
   namespace:    reference('namespaceId', 'namespace', 'clusterStore'),
   canClone:  not('hasSidekicks'),
@@ -187,6 +187,8 @@ var Workload = Resource.extend(Grafana, DisplayImage, StateCounts, EndpointPorts
     if ( get(this, 'launchConfig.memoryReservation') ) {
       return formatSi(get(this, 'launchConfig.memoryReservation'), 1024, 'iB', 'B');
     }
+
+    return '';
   }),
 
   podForShell: computed('pods.@each.canShell', function() {
diff --git a/app/resolver.js b/app/resolver.js
deleted file mode 100644
index 2fb563d6c..000000000
--- a/app/resolver.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Resolver from 'ember-resolver';
-
-export default Resolver;
diff --git a/app/router.js b/app/router.js
index a9a564bee..a42fc722d 100644
--- a/app/router.js
+++ b/app/router.js
@@ -25,7 +25,7 @@ Router.map(function() {
   this.route('failWhale', { path: '/fail' });
   this.route('not-found', { path: '*path' });
 
-  this.route('signup', { path: '/signup' });
+  this.route('signup' );
   this.route('verify', { path: '/verify/:verify_token' });
   this.route('verify-reset-password', { path: '/verify-reset-password/:verify_token' });
 
@@ -33,7 +33,7 @@ Router.map(function() {
 
   this.route('verify-auth');
   this.route('verify-auth-azure');
-  this.route('update-password', { path: '/update-password' });
+  this.route('update-password' );
   this.route('update-critical-settings', { path: '/update-setting' });
 
   this.route('authenticated', { path: '/' }, function() {
@@ -122,7 +122,7 @@ Router.map(function() {
     this.route('project', { path: '/p/:project_id' }, function() {
       this.route('index', { path: '/' });
 
-      this.route('ns', { path: '/ns' }, function() {
+      this.route('ns',  function() {
         this.route('index', { path: '/' });
       });
 
@@ -139,7 +139,7 @@ Router.map(function() {
         path:           '/workloads',
         resetNamespace: true
       }, function() {
-        this.route('run', { path: '/run' });
+        this.route('run' );
         this.route('index', { path: '/' });
 
         this.route('pod', {
@@ -154,7 +154,7 @@ Router.map(function() {
       });
 
       this.route('ingresses', { resetNamespace: true }, function() {
-        this.route('run', { path: '/run' });
+        this.route('run' );
         this.route('index', { path: '/' });
 
         this.route('ingress', {
@@ -179,10 +179,7 @@ Router.map(function() {
         });
       });
 
-      this.route('volumes', {
-        path:           '/volumes',
-        resetNamespace: true
-      }, function() {
+      this.route('volumes', { resetNamespace: true }, function() {
         this.route('index', { path: '/' });
         this.route('new', { path: '/add' });
         this.route('detail', { path: '/:volume_id' });
diff --git a/app/signup/template.hbs b/app/signup/template.hbs
index 8614ef943..c11a6a447 100644
--- a/app/signup/template.hbs
+++ b/app/signup/template.hbs
@@ -20,12 +20,12 @@
         </p>
       </div>
       {{#if loading}}
-        <button class="btn bg-primary mt-10 btn-disabled">
+        <button class="btn bg-primary mt-10 btn-disabled" type="button">
           <i class="icon icon-spinner icon-spin"></i>
           {{t "generic.loading"}}
         </button>
       {{else}}
-        <button class="btn bg-primary mt-10" name="submit" {{action "register"}}>
+        <button class="btn bg-primary mt-10" name="submit" type="button" {{action "register"}}>
           {{t "signupPage.emailSuccess.confirm.resend"}}
         </button>
       {{/if}}
diff --git a/app/update-password/controller.js b/app/update-password/controller.js
index 4326e4d04..264a17207 100644
--- a/app/update-password/controller.js
+++ b/app/update-password/controller.js
@@ -37,7 +37,7 @@ export default Controller.extend({
     return get(this, 'access.firstLogin');
   }),
 
-  currentPassword: computed('', function() {
+  currentPassword: computed('', 'access.userCode.password', 'firstLogin', function() {
     return get(this, 'access.userCode.password') || (this.firstLogin ? 'admin' : null);
   }),
 
diff --git a/app/verify-reset-password/template.hbs b/app/verify-reset-password/template.hbs
index d3a870864..01d0ea203 100644
--- a/app/verify-reset-password/template.hbs
+++ b/app/verify-reset-password/template.hbs
@@ -6,12 +6,12 @@
         {{new-password passwordOkay=(mut canSend) passwordOut=(mut password)}}
         <div class="text-center">
           {{#if loading}}
-            <button class="btn bg-primary mt-10" disabled><i class="icon icon-spinner icon-spin"></i> {{t 'generic.loading'}}</button>
+            <button class="btn bg-primary mt-10" disabled type="button"><i class="icon icon-spinner icon-spin"></i> {{t 'generic.loading'}}</button>
           {{else}}
             {{#if canSend}}
-              <button {{action 'resetPassword'}} class="btn bg-primary mt-10" name="submit">{{t 'verifyResetPasswordPage.button'}}</button>
+              <button class="btn bg-primary mt-10" name="submit" type="button" {{action 'resetPassword'}}>{{t 'verifyResetPasswordPage.button'}}</button>
             {{else}}
-              <button class="btn bg-primary mt-10" disabled>{{t 'verifyResetPasswordPage.button'}}</button>
+              <button class="btn bg-primary mt-10" disabled type="button">{{t 'verifyResetPasswordPage.button'}}</button>
             {{/if}}
           {{/if}}
         </div>
diff --git a/app/verify/template.hbs b/app/verify/template.hbs
index 47d08e777..6ec9ab1c8 100644
--- a/app/verify/template.hbs
+++ b/app/verify/template.hbs
@@ -20,12 +20,12 @@
         {{new-password passwordOkay=(mut canSend) passwordOut=(mut model.pw)}}
         <div class="text-center">
           {{#if loading}}
-            <button class="btn bg-primary mt-10 btn-disabled" disabled><i class="icon icon-spinner icon-spin"></i> {{t 'generic.loading'}}</button>
+            <button class="btn bg-primary mt-10 btn-disabled" disabled type="button"><i class="icon icon-spinner icon-spin"></i> {{t 'generic.loading'}}</button>
           {{else}}
             {{#if canSend}}
-              <button {{action 'createAcct'}} class="btn bg-primary mt-10" name="submit">{{t 'generic.save'}}</button>
+              <button class="btn bg-primary mt-10" name="submit" type="button" {{action 'createAcct'}}>{{t 'generic.save'}}</button>
             {{else}}
-              <button class="btn bg-primary mt-10" disabled>{{t 'generic.save'}}</button>
+              <button class="btn bg-primary mt-10" disabled type="button">{{t 'generic.save'}}</button>
             {{/if}}
           {{/if}}
         </div>
diff --git a/app/volumes/index/controller.js b/app/volumes/index/controller.js
index 5ba2a78cc..70fcd9478 100644
--- a/app/volumes/index/controller.js
+++ b/app/volumes/index/controller.js
@@ -3,7 +3,7 @@ import { inject as service } from '@ember/service';
 import Controller, { inject as controller } from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
   projectController: controller('authenticated.project'),
   queryParams:       ['sortBy'],
diff --git a/app/volumes/index/template.hbs b/app/volumes/index/template.hbs
index d08314f73..3237178ec 100644
--- a/app/volumes/index/template.hbs
+++ b/app/volumes/index/template.hbs
@@ -1,5 +1,5 @@
 {{#containers-header showGroup=false}}
-    <button {{action 'importYaml'}} class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="persistentvolumeclaim" scope="project" permission="create"}}>{{t 'nav.containers.importCompose'}}</button>
+    <button class="btn btn-sm bg-default mr-10" disabled={{rbac-prevents resource="persistentvolumeclaim" scope="project" permission="create"}} type="button" {{action 'importYaml'}}>{{t 'nav.containers.importCompose'}}</button>
   {{#link-to "volumes.new" class="btn btn-sm bg-primary"}}{{t 'nav.containers.addVolume'}}{{/link-to}}
 {{/containers-header}}
 
diff --git a/app/workload/controller.js b/app/workload/controller.js
index 7d960618f..7f312bf3b 100644
--- a/app/workload/controller.js
+++ b/app/workload/controller.js
@@ -5,7 +5,7 @@ import { get } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Controller.extend({
-  scope:       service(),
+  scope: service(),
 
   launchConfig: null,
 
diff --git a/app/workload/template.hbs b/app/workload/template.hbs
index 87c0ccd73..1948479a1 100644
--- a/app/workload/template.hbs
+++ b/app/workload/template.hbs
@@ -99,17 +99,13 @@
       <span>
         <div class="btn-group btn-group-xs p-0 ml-10">
           <button
-            class="btn btn-xs bg-primary"
-            {{action "scaleDown" target=service}}
-            disabled={{not service.canScaleDown}}
+            class="btn btn-xs bg-primary" disabled={{not service.canScaleDown}} type="button" {{action "scaleDown" target=service}}
           >
             <i class="icon icon-minus icon-fw"/>
           </button>
           <button
             style="margin-left: -1px;"
-            class="btn btn-xs bg-primary"
-            {{action "scaleUp" target=service}}
-            disabled={{not service.canScaleUp}}
+            class="btn btn-xs bg-primary" disabled={{not service.canScaleUp}} type="button" {{action "scaleUp" target=service}}
           >
             <i class="icon icon-plus icon-fw"/>
           </button>
diff --git a/config/optional-features.json b/config/optional-features.json
index 21f1dc719..642484fca 100644
--- a/config/optional-features.json
+++ b/config/optional-features.json
@@ -1,3 +1,6 @@
 {
-  "jquery-integration": true
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": true,
+  "template-only-glimmer-components": false
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 82110344c..5b0fd1e29 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -111,7 +111,7 @@ module.exports = function(defaults) {
   // along with the exports of each module as its value.
   app.import('node_modules/jgrowl/jquery.jgrowl.css');
   app.import('node_modules/jsondiffpatch/dist/formatters-styles/html.css');
-  app.import('node_modules/xterm/dist/xterm.css');
+  app.import('node_modules/xterm/css/xterm.css');
   app.import('vendor/icons/style.css');
 
   app.import('node_modules/ember-source/dist/ember-template-compiler.js');
diff --git a/lib/alert/addon/components/alert-chart/component.js b/lib/alert/addon/components/alert-chart/component.js
index e9ecce4c3..a73e6ed22 100644
--- a/lib/alert/addon/components/alert-chart/component.js
+++ b/lib/alert/addon/components/alert-chart/component.js
@@ -18,7 +18,7 @@ const FORMATTERS = {
 };
 
 export default GraphArea.extend({
-  intl:       service(),
+  intl: service(),
   layout,
 
   tagName:    'div',
diff --git a/lib/alert/addon/components/alert-select/component.js b/lib/alert/addon/components/alert-select/component.js
index cddbdbb0b..b0ef3a6d6 100644
--- a/lib/alert/addon/components/alert-select/component.js
+++ b/lib/alert/addon/components/alert-select/component.js
@@ -9,7 +9,7 @@ import $ from 'jquery';
 const MAX_HEIGHT = 285;
 
 export default Select.extend({
-  intl:                service(),
+  intl: service(),
 
   showMessage: false,
   editor:      false,
@@ -65,7 +65,7 @@ export default Select.extend({
     }
   }),
 
-  filtered: computed('filter', 'interContent.[]', function() {
+  filtered: computed('allowCustom', 'clientSideFiltering', 'filter', 'interContent.[]', 'optionGroupPath', 'optionLabelPath', function() {
     set(this, 'editor', false)
     let filter  = (get(this, 'filter') || '').trim();
     const options = get(this, 'interContent');
@@ -145,6 +145,8 @@ export default Select.extend({
     if (unGroupedContent.length === 0 && groupedContent.length === 0 ) {
       return 'no-options'
     }
+
+    return '';
   }),
 
   setSelect(item) {
diff --git a/lib/alert/addon/components/alert-table/component.js b/lib/alert/addon/components/alert-table/component.js
index b38990835..1b66a901a 100644
--- a/lib/alert/addon/components/alert-table/component.js
+++ b/lib/alert/addon/components/alert-table/component.js
@@ -73,7 +73,7 @@ export default Component.extend({
     });
   }),
 
-  filteredNotifiers: computed('clusterId', 'notifiers.@each.{clusterId}', function() {
+  filteredNotifiers: computed('clusterId', 'notifiers.@each.clusterId', function() {
     const clusterId = get(this, 'clusterId');
 
     return get(this, 'notifiers').filterBy('clusterId', clusterId);
diff --git a/lib/alert/addon/components/alert/alert-group/component.js b/lib/alert/addon/components/alert/alert-group/component.js
index a3e379a0e..215ff3ea8 100644
--- a/lib/alert/addon/components/alert/alert-group/component.js
+++ b/lib/alert/addon/components/alert/alert-group/component.js
@@ -5,7 +5,7 @@ import { inject as service } from '@ember/service'
 import { reads } from '@ember/object/computed'
 
 export default Component.extend({
-  scope:        service(),
+  scope: service(),
 
   layout,
   model:          null,
@@ -17,9 +17,9 @@ export default Component.extend({
   noAlerts:       false,
   hasOtherGroups: true,
 
-  pageScope:   reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
 
-  group: computed('model.group', function() {
+  group: computed('groups', 'model.group', function() {
     const groupId = get(this, 'model.group')
     const groups = get(this, 'groups')
     const filter = groups.filter((g) => g.id === groupId)
diff --git a/lib/alert/addon/components/alert/form-alert-rules/component.js b/lib/alert/addon/components/alert/form-alert-rules/component.js
index fe747e9b1..79b29e4f3 100644
--- a/lib/alert/addon/components/alert/form-alert-rules/component.js
+++ b/lib/alert/addon/components/alert/form-alert-rules/component.js
@@ -12,7 +12,7 @@ export default Component.extend({
   layout,
   editing:           true,
 
-  clusterId:         reads('scope.currentCluster.id'),
+  clusterId: reads('scope.currentCluster.id'),
 
   init() {
     this._super(...arguments);
diff --git a/lib/alert/addon/components/alert/form-alert-rules/template.hbs b/lib/alert/addon/components/alert/form-alert-rules/template.hbs
index 0ad1cbb64..65087f156 100644
--- a/lib/alert/addon/components/alert/form-alert-rules/template.hbs
+++ b/lib/alert/addon/components/alert/form-alert-rules/template.hbs
@@ -51,7 +51,7 @@
 </div>
 
 <div class="row">
-  <button class="btn bg-link icon-btn pull-right" {{action "addRule"}}>
+  <button class="btn bg-link icon-btn pull-right" type="button" {{action "addRule"}}>
     <span class="darken"><i class="icon icon-plus text-small"></i></span>
     <span>{{t 'alertPage.index.addAlert'}}</span>
   </button>
diff --git a/lib/alert/addon/components/alert/form-cluster-rule-row/component.js b/lib/alert/addon/components/alert/form-cluster-rule-row/component.js
index 0692a168b..4edfe4c81 100644
--- a/lib/alert/addon/components/alert/form-cluster-rule-row/component.js
+++ b/lib/alert/addon/components/alert/form-cluster-rule-row/component.js
@@ -17,7 +17,7 @@ export default Component.extend({
   showAdvancedSection:        false,
   clustScanRuleFailuresOnly: 'false',
 
-  clusterId:           reads('scope.currentCluster.id'),
+  clusterId: reads('scope.currentCluster.id'),
 
   init() {
     this._super(...arguments);
diff --git a/lib/alert/addon/components/alert/form-cluster-rule-row/template.hbs b/lib/alert/addon/components/alert/form-cluster-rule-row/template.hbs
index c4fa1d07b..2af4db0f1 100644
--- a/lib/alert/addon/components/alert/form-cluster-rule-row/template.hbs
+++ b/lib/alert/addon/components/alert/form-cluster-rule-row/template.hbs
@@ -3,7 +3,7 @@
     {{#if (and editing (gt alertRules.length 1))}}
       <div class="pull-right">
         {{#if canRemoveRule}}
-          <button class="btn bg-transparent text-small vertical-middle" {{action removeRule model}}>
+          <button class="btn bg-transparent text-small vertical-middle" type="button" {{action removeRule model}}>
             {{t "alertPage.newOrEdit.removeAlert"}}
           </button>
         {{/if}}
@@ -135,7 +135,7 @@
               changed=(action (mut model.nodeRule.selector))
             }}
           {{else}}
-            <button {{action "noop"}} style="cursor:not-allowed;" class="btn bg-disabled icon-btn">
+            <button style="cursor:not-allowed;" class="btn bg-disabled icon-btn" type="button" {{action "noop"}}>
               <span class="darken">
                 <i class="icon icon-plus text-small"/>
               </span>
@@ -342,7 +342,7 @@
             {{else}}
               {{t "generic.disabled"}}
             {{/if}}
-            <button class="btn bg-transparent text-small p-0" {{action "showAdvanced"}}>
+            <button class="btn bg-transparent text-small p-0" type="button" {{action "showAdvanced"}}>
               <i class="icon icon-edit"/>
             </button>
           </div>
diff --git a/lib/alert/addon/components/alert/form-comparison-row/component.js b/lib/alert/addon/components/alert/form-comparison-row/component.js
index 63d9b140d..306538060 100644
--- a/lib/alert/addon/components/alert/form-comparison-row/component.js
+++ b/lib/alert/addon/components/alert/form-comparison-row/component.js
@@ -7,7 +7,7 @@ import C from 'ui/utils/constants';
 import { on } from '@ember/object/evented';
 
 export default Component.extend({
-  intl:                service(),
+  intl: service(),
 
   comparisonObserver: on('init', observer('model.metricRule.comparison', function() {
     if (get(this, 'model.metricRule.comparison') === get(this, 'hasValue')) {
diff --git a/lib/alert/addon/components/alert/form-project-rule-row/component.js b/lib/alert/addon/components/alert/form-project-rule-row/component.js
index d79bb1377..a44d461e2 100644
--- a/lib/alert/addon/components/alert/form-project-rule-row/component.js
+++ b/lib/alert/addon/components/alert/form-project-rule-row/component.js
@@ -77,13 +77,13 @@ export default Component.extend({
     set(this, 'model.podRule.restartIntervalSeconds', n * 60);
   }),
 
-  pods: computed('projectId', function() {
+  pods: computed('projectId', 'store', function() {
     const projectId = get(this, 'projectId');
 
     return get(this, 'store').all('pod').filterBy('projectId', projectId);
   }),
 
-  workloads: computed('projectId', function() {
+  workloads: computed('projectId', 'store', function() {
     const projectId = get(this, 'projectId');
 
     return get(this, 'store').all('workload').filterBy('projectId', projectId);
diff --git a/lib/alert/addon/components/alert/form-project-rule-row/template.hbs b/lib/alert/addon/components/alert/form-project-rule-row/template.hbs
index f3e2865da..c59479a3c 100644
--- a/lib/alert/addon/components/alert/form-project-rule-row/template.hbs
+++ b/lib/alert/addon/components/alert/form-project-rule-row/template.hbs
@@ -3,7 +3,7 @@
     {{#if (and editing (gt alertRules.length 1))}}
       <div class="pull-right">
         {{#if (and (gt alertRules.length 1 ) isCreate)}}
-          <button class="btn bg-transparent text-small vertical-middle" {{action removeRule model}}>
+          <button class="btn bg-transparent text-small vertical-middle" type="button" {{action removeRule model}}>
             {{t "alertPage.newOrEdit.removeAlert"}}
           </button>
         {{/if}}
@@ -109,7 +109,7 @@
               changed=(action (mut model.workloadRule.selector))
             }}
           {{else}}
-            <button {{action "noop"}} style="cursor:not-allowed;" class="btn bg-disabled icon-btn">
+            <button style="cursor:not-allowed;" class="btn bg-disabled icon-btn" type="button" {{action "noop"}}>
               <span class="darken">
                 <i class="icon icon-plus text-small"/>
               </span>
@@ -313,7 +313,7 @@
             {{else}}
               {{t "generic.disabled"}}
             {{/if}}
-            <button class="btn bg-transparent text-small p-0" {{action "showAdvanced"}}>
+            <button class="btn bg-transparent text-small p-0" type="button" {{action "showAdvanced"}}>
               <i class="icon icon-edit"/>
             </button>
           </div>
diff --git a/lib/alert/addon/components/alert/form-recipient-item/template.hbs b/lib/alert/addon/components/alert/form-recipient-item/template.hbs
index ef89c1e05..dbe7115f7 100644
--- a/lib/alert/addon/components/alert/form-recipient-item/template.hbs
+++ b/lib/alert/addon/components/alert/form-recipient-item/template.hbs
@@ -34,7 +34,7 @@
   </div>
 
   <div class="col mt-0 span-1-of-24" style="padding-top:2px;">
-    <button class="btn bg-link icon-btn {{if disableRemove 'disabled' ''}}" {{action "remove"}}>
+    <button class="btn bg-link icon-btn {{if disableRemove 'disabled' ''}}" type="button" {{action "remove"}}>
       <span class="darken"><i class="icon icon-minus text-small"/></span>
     </button>
   </div>
diff --git a/lib/alert/addon/components/alert/form-recipients/template.hbs b/lib/alert/addon/components/alert/form-recipients/template.hbs
index 8cc39a0a9..12287d2c1 100644
--- a/lib/alert/addon/components/alert/form-recipients/template.hbs
+++ b/lib/alert/addon/components/alert/form-recipients/template.hbs
@@ -24,7 +24,7 @@
       }}
     {{/each}}
     <div class="mt-15">
-      <button class="btn bg-link icon-btn p-0" {{action "add"}}>
+      <button class="btn bg-link icon-btn p-0" type="button" {{action "add"}}>
         <span class="darken"><i class="icon icon-plus text-small"/></span>
         <span>{{t "alertPage.newOrEdit.addRecipient"}}</span>
       </button>
diff --git a/lib/alert/addon/components/alert/form-row-advanced/component.js b/lib/alert/addon/components/alert/form-row-advanced/component.js
index beb73dcdc..b3b87d1a2 100644
--- a/lib/alert/addon/components/alert/form-row-advanced/component.js
+++ b/lib/alert/addon/components/alert/form-row-advanced/component.js
@@ -4,5 +4,5 @@ import layout from './template';
 export default Advanced.extend({
   layout,
 
-  advanced:   false,
+  advanced: false,
 });
diff --git a/lib/alert/addon/components/cluster-alert-row/component.js b/lib/alert/addon/components/cluster-alert-row/component.js
index 0e42f9aeb..5b17bd714 100644
--- a/lib/alert/addon/components/cluster-alert-row/component.js
+++ b/lib/alert/addon/components/cluster-alert-row/component.js
@@ -6,7 +6,7 @@ import notifierMixin from 'ui/mixins/notifier';
 import { computed } from '@ember/object';
 
 export default Component.extend(notifierMixin, {
-  intl:        service(),
+  intl: service(),
 
   model:             null,
   tagName:           '',
@@ -21,7 +21,7 @@ export default Component.extend(notifierMixin, {
       }
     },
   },
-  selectorList: computed('model.targetType', function() {
+  selectorList: computed('model.nodeRule.selector', 'model.targetType', function() {
     const t = get(this, 'model.targetType');
 
     if (t === 'nodeSelector') {
@@ -42,7 +42,7 @@ export default Component.extend(notifierMixin, {
     return htmlSafe(out);
   }),
 
-  alertGroup: computed('groups', function() {
+  alertGroup: computed('groups', 'model.groupId', function() {
     const alertGroups = get(this, 'groups')
     const groupId = get(this, 'model.groupId')
 
diff --git a/lib/alert/addon/components/project-alert-row/component.js b/lib/alert/addon/components/project-alert-row/component.js
index db0b2a5af..9f49c7730 100644
--- a/lib/alert/addon/components/project-alert-row/component.js
+++ b/lib/alert/addon/components/project-alert-row/component.js
@@ -25,7 +25,7 @@ export default Component.extend(notifierMixin, {
     return t === 'pod' && c === 'restarts';
   }),
 
-  selectorList: computed('model.targetType', function() {
+  selectorList: computed('model.targetType', 'model.workloadRule.selector', function() {
     const t = get(this, 'model.targetType');
 
     if (t === 'workloadSelector') {
@@ -48,7 +48,7 @@ export default Component.extend(notifierMixin, {
     return htmlSafe(out);
   }),
 
-  alertGroup: computed('groups', function() {
+  alertGroup: computed('groups', 'model.groupId', function() {
     const alertGroups = get(this, 'groups')
     const groupId = get(this, 'model.groupId')
 
diff --git a/lib/alert/addon/edit-rule/route.js b/lib/alert/addon/edit-rule/route.js
index db967398e..8cb444cb6 100644
--- a/lib/alert/addon/edit-rule/route.js
+++ b/lib/alert/addon/edit-rule/route.js
@@ -10,7 +10,7 @@ export default Route.extend(EditOrClone, {
   scope:       service(),
   growl:       service(),
 
-  pageScope:   reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
 
   model(params) {
     const pageScope = get(this, 'pageScope');
diff --git a/lib/alert/addon/edit/route.js b/lib/alert/addon/edit/route.js
index 751b97886..5f393525a 100644
--- a/lib/alert/addon/edit/route.js
+++ b/lib/alert/addon/edit/route.js
@@ -9,7 +9,7 @@ export default Route.extend({
   scope:       service(),
   growl:       service(),
 
-  pageScope:   reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
 
   model(params) {
     const pageScope = get(this, 'pageScope');
diff --git a/lib/alert/addon/index/route.js b/lib/alert/addon/index/route.js
index 190d968b5..dd05dded1 100644
--- a/lib/alert/addon/index/route.js
+++ b/lib/alert/addon/index/route.js
@@ -11,7 +11,7 @@ export default Route.extend({
   session:     service(),
   globalStore: service(),
 
-  pageScope:       reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
   model() {
     const pageScope = get(this, 'pageScope');
 
diff --git a/lib/alert/addon/initializers/app.js b/lib/alert/addon/initializers/app.js
index 26ed24052..992a54d40 100644
--- a/lib/alert/addon/initializers/app.js
+++ b/lib/alert/addon/initializers/app.js
@@ -7,6 +7,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'app',
+  name: 'app',
   initialize
 };
diff --git a/lib/alert/addon/mixins/alert-rule.js b/lib/alert/addon/mixins/alert-rule.js
index 7321a4ee4..4eb503e35 100644
--- a/lib/alert/addon/mixins/alert-rule.js
+++ b/lib/alert/addon/mixins/alert-rule.js
@@ -45,7 +45,7 @@ export default Mixin.create({
     }
   },
 
-  monitoringEnabled: computed(function() {
+  monitoringEnabled: computed('pageScope', 'scope.currentCluster.enableClusterMonitoring', 'scope.currentProject.enableProjectMonitoring', function() {
     const ps = get(this, 'pageScope');
 
     if (ps === 'cluster') {
diff --git a/lib/alert/addon/new-rule/route.js b/lib/alert/addon/new-rule/route.js
index 263b1d8a9..200821123 100644
--- a/lib/alert/addon/new-rule/route.js
+++ b/lib/alert/addon/new-rule/route.js
@@ -10,7 +10,7 @@ export default Route.extend(EditOrClone, {
   scope:       service(),
   growl:       service(),
 
-  pageScope:   reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
 
   model(params/* , transition */) {
     const pageScope = get(this, 'pageScope');
diff --git a/lib/alert/addon/new/route.js b/lib/alert/addon/new/route.js
index 16eaf9065..24e3649c3 100644
--- a/lib/alert/addon/new/route.js
+++ b/lib/alert/addon/new/route.js
@@ -9,7 +9,7 @@ export default Route.extend({
   scope:       service(),
   growl:       service(),
 
-  pageScope:   reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
 
   model(/* params, transition */) {
     const pageScope = get(this, 'pageScope');
diff --git a/lib/global-admin/addon/catalog/template.hbs b/lib/global-admin/addon/catalog/template.hbs
index f5e9c4856..73d845771 100644
--- a/lib/global-admin/addon/catalog/template.hbs
+++ b/lib/global-admin/addon/catalog/template.hbs
@@ -1,6 +1,6 @@
 <section class="header clearfix">
   <div class="right-buttons">
-    <button disabled={{rbac-prevents resource="catalog" scope="global" permission="create"}} class="btn bg-primary btn-sm" {{action "add"}}>
+    <button disabled={{rbac-prevents resource="catalog" scope="global" permission="create"}} class="btn bg-primary btn-sm" type="button" {{action "add"}}>
       {{t 'catalogSettings.more.addActionLabel'}}
     </button>
   </div>
diff --git a/lib/global-admin/addon/cluster-templates/new-revision/controller.js b/lib/global-admin/addon/cluster-templates/new-revision/controller.js
index fd21c1db5..b8962c3b3 100644
--- a/lib/global-admin/addon/cluster-templates/new-revision/controller.js
+++ b/lib/global-admin/addon/cluster-templates/new-revision/controller.js
@@ -4,7 +4,7 @@ import { set } from '@ember/object';
 export default Controller.extend({
   queryParams: ['revision'],
 
-  revision:    null,
+  revision: null,
 
   parentRoute: 'global-admin.cluster-templates.index',
 
diff --git a/lib/global-admin/addon/cluster-templates/route.js b/lib/global-admin/addon/cluster-templates/route.js
index 4d3631305..0338534a6 100644
--- a/lib/global-admin/addon/cluster-templates/route.js
+++ b/lib/global-admin/addon/cluster-templates/route.js
@@ -3,7 +3,7 @@ import { hash } from 'rsvp';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  globalStore:         service(),
+  globalStore: service(),
 
   model() {
     const { globalStore: gs } = this;
diff --git a/lib/global-admin/addon/clusters/new/index/route.js b/lib/global-admin/addon/clusters/new/index/route.js
index 2cb9c44be..414c0bb35 100644
--- a/lib/global-admin/addon/clusters/new/index/route.js
+++ b/lib/global-admin/addon/clusters/new/index/route.js
@@ -3,7 +3,7 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default Route.extend({
-  globalStore:         service(),
+  globalStore: service(),
 
   redirect(/* model , transition */) {
     this.transitionTo('clusters.new.select');
diff --git a/lib/global-admin/addon/clusters/new/launch/controller.js b/lib/global-admin/addon/clusters/new/launch/controller.js
index f4c37f3da..d6232a2c7 100644
--- a/lib/global-admin/addon/clusters/new/launch/controller.js
+++ b/lib/global-admin/addon/clusters/new/launch/controller.js
@@ -11,7 +11,7 @@ export default Controller.extend({
   clusterTemplateRevision: null,
   importProvider:          null,
 
-  cluster:  alias('model.cluster'),
+  cluster: alias('model.cluster'),
 
   actions: {
     close() {
diff --git a/lib/global-admin/addon/clusters/new/route.js b/lib/global-admin/addon/clusters/new/route.js
index a20c3bdf4..c4fae7818 100644
--- a/lib/global-admin/addon/clusters/new/route.js
+++ b/lib/global-admin/addon/clusters/new/route.js
@@ -6,7 +6,7 @@ import { loadScript, loadStylesheet, proxifyUrl } from 'shared/utils/load-script
 import { get, set } from '@ember/object';
 
 export default Route.extend({
-  globalStore:         service(),
+  globalStore: service(),
 
   model() {
     const gs = this.globalStore;
diff --git a/lib/global-admin/addon/clusters/new/select/controller.js b/lib/global-admin/addon/clusters/new/select/controller.js
index 3a68729a3..bb76c51c0 100644
--- a/lib/global-admin/addon/clusters/new/select/controller.js
+++ b/lib/global-admin/addon/clusters/new/select/controller.js
@@ -29,11 +29,7 @@ export default Controller.extend({
   init() {
     this._super(...arguments);
 
-    scheduleOnce('afterRender', () => {
-      $('BODY').on('click', '#k3s-info-external-link', (e) => {
-        e.stopPropigation();
-      });
-    });
+    scheduleOnce('afterRender', this, this.setupClickHandler);
   },
 
   reloadSchema: observer('needReloadSchema', function() {
@@ -66,7 +62,7 @@ export default Controller.extend({
     }
   }),
 
-  providerChoices: computed('model.nodeDrivers.{id,state}', 'schemaReloaded', 'intl.locale', 'kontainerDrivers.[]', function() {
+  providerChoices: computed('app.proxyEndpoint', 'intl.locale', 'kontainerDrivers.[]', 'model.nodeDrivers.{id,state}', 'schemaReloaded', function() {
     const { kontainerDrivers, intl  } = this;
     const { builtIn, custom } = kontainerDrivers;
 
@@ -217,4 +213,10 @@ export default Controller.extend({
       rkeGroup:    rkeGroup.sortBy('name'),
     };
   }),
+
+  setupClickHandler() {
+    $('BODY').on('click', '#k3s-info-external-link', (e) => {
+      e.stopPropigation();
+    });
+  },
 });
diff --git a/lib/global-admin/addon/components/cru-group-account/component.js b/lib/global-admin/addon/components/cru-group-account/component.js
index b2c44a07d..d7c1fff9f 100644
--- a/lib/global-admin/addon/components/cru-group-account/component.js
+++ b/lib/global-admin/addon/components/cru-group-account/component.js
@@ -33,7 +33,7 @@ export default Component.extend({
   canUserLogIn:     null,
   groupPrincipalId: null,
 
-  headers:          HEADERS,
+  headers: HEADERS,
 
   init() {
     this._super(...arguments);
diff --git a/lib/global-admin/addon/components/form-fsgroup-policy/template.hbs b/lib/global-admin/addon/components/form-fsgroup-policy/template.hbs
index a283c71dc..544b3cf64 100644
--- a/lib/global-admin/addon/components/form-fsgroup-policy/template.hbs
+++ b/lib/global-admin/addon/components/form-fsgroup-policy/template.hbs
@@ -44,7 +44,7 @@
               </td>
               <td class="text-right">
                 {{#unless readOnly}}
-                  <button class="btn bg-primary btn-sm" {{action "remove" range}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+                  <button class="btn bg-primary btn-sm" type="button" {{action "remove" range}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
                 {{/unless}}
               </td>
             </tr>
@@ -53,7 +53,7 @@
       {{/if}}
       {{#unless readOnly}}
         <div>
-          <button class="btn bg-link icon-btn" {{action "add"}}>
+          <button class="btn bg-link icon-btn" type="button" {{action "add"}}>
             <span class="darken"><i class="icon icon-plus text-small"/></span>
             <span>{{t 'formFsGroupPodSecurityPolicy.range.addLabel'}}</span>
           </button>
diff --git a/lib/global-admin/addon/components/form-google-auth/template.hbs b/lib/global-admin/addon/components/form-google-auth/template.hbs
index e15b7f57e..734c0ea87 100644
--- a/lib/global-admin/addon/components/form-google-auth/template.hbs
+++ b/lib/global-admin/addon/components/form-google-auth/template.hbs
@@ -234,8 +234,7 @@
     <div class="btn-group">
       <button
         disabled={{buttonDisabled}}
-        class="btn bg-primary"
-        {{action save}}>
+        class="btn bg-primary" type="button" {{action save}}>
         {{#if saving}}
           <i class="icon icon-spinner icon-spin"></i>
           {{t "authPage.googleoauth.testAuth.buttonText.post"}}
@@ -246,7 +245,7 @@
           {{t "authPage.googleoauth.testAuth.buttonText.pre"}}
         {{/if}}
       </button>
-      <button {{action cancel}} class="btn bg-transparent">
+      <button class="btn bg-transparent" type="button" {{action cancel}}>
         {{t "saveCancel.cancel"}}
       </button>
     </div>
diff --git a/lib/global-admin/addon/components/form-hostpath-policy/template.hbs b/lib/global-admin/addon/components/form-hostpath-policy/template.hbs
index d7f6c4aa1..14581be73 100644
--- a/lib/global-admin/addon/components/form-hostpath-policy/template.hbs
+++ b/lib/global-admin/addon/components/form-hostpath-policy/template.hbs
@@ -15,7 +15,7 @@
           {{else}}
             <div class="row">
               <div class="col span-11">{{input type="text" value=item.pathPrefix classNames="form-control input-sm" placeholder=(t 'formAllowedHostPathsPodSecurityPolicy.path.placeholder')}}</div>
-              <div class="col"><button class="btn bg-primary btn-sm" {{action "remove" item}}><i class="icon icon-minus"/></button></div>
+              <div class="col"><button class="btn bg-primary btn-sm" type="button" {{action "remove" item}}><i class="icon icon-minus"/></button></div>
             </div>
           {{/if}}
         {{/each}}
@@ -25,7 +25,7 @@
     {{/if}}
     {{#unless readOnly}}
       <div>
-        <button class="btn bg-link icon-btn" {{action "add"}}>
+        <button class="btn bg-link icon-btn" type="button" {{action "add"}}>
           <span class="darken"><i class="icon icon-plus text-small"/></span>
           <span>{{t 'formAllowedHostPathsPodSecurityPolicy.path.addLabel'}}</span>
         </button>
diff --git a/lib/global-admin/addon/components/form-hostports-policy/template.hbs b/lib/global-admin/addon/components/form-hostports-policy/template.hbs
index bd7ae57eb..8191d4e14 100644
--- a/lib/global-admin/addon/components/form-hostports-policy/template.hbs
+++ b/lib/global-admin/addon/components/form-hostports-policy/template.hbs
@@ -28,7 +28,7 @@
             </td>
             <td class="text-right">
               {{#unless readOnly}}
-               <button class="btn bg-primary btn-sm" {{action "remove" port}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+               <button class="btn bg-primary btn-sm" type="button" {{action "remove" port}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
               {{/unless}}
             </td>
           </tr>
@@ -40,7 +40,7 @@
 
     {{#unless readOnly}}
       <div>
-        <button class="btn bg-link icon-btn" {{action "add"}}>
+        <button class="btn bg-link icon-btn" type="button" {{action "add"}}>
           <span class="darken"><i class="icon icon-plus text-small"/></span>
           <span>{{t 'formHostPortsPodSecurityPolicy.port.addLabel'}}</span>
         </button>
diff --git a/lib/global-admin/addon/components/form-runasgroup-policy/template.hbs b/lib/global-admin/addon/components/form-runasgroup-policy/template.hbs
index 5a989c499..e0e7ebe81 100644
--- a/lib/global-admin/addon/components/form-runasgroup-policy/template.hbs
+++ b/lib/global-admin/addon/components/form-runasgroup-policy/template.hbs
@@ -85,8 +85,7 @@
               <td class="text-right">
                 {{#unless readOnly}}
                   <button
-                    class="btn bg-primary btn-sm"
-                    {{action "remove" range}}
+                    class="btn bg-primary btn-sm" type="button" {{action "remove" range}}
                   >
                     <i class="icon icon-minus"></i>
                     <span class="sr-only">
@@ -101,7 +100,7 @@
       {{/if}}
       {{#unless readOnly}}
         <div>
-          <button class="btn bg-link icon-btn" {{action "add"}}>
+          <button class="btn bg-link icon-btn" type="button" {{action "add"}}>
             <span class="darken">
               <i class="icon icon-plus text-small"></i>
             </span>
diff --git a/lib/global-admin/addon/components/form-runasuser-policy/template.hbs b/lib/global-admin/addon/components/form-runasuser-policy/template.hbs
index 33e4e4f3c..e268b2a40 100644
--- a/lib/global-admin/addon/components/form-runasuser-policy/template.hbs
+++ b/lib/global-admin/addon/components/form-runasuser-policy/template.hbs
@@ -49,7 +49,7 @@
               </td>
               <td class="text-right">
                 {{#unless readOnly}}
-                  <button class="btn bg-primary btn-sm" {{action "remove" range}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+                  <button class="btn bg-primary btn-sm" type="button" {{action "remove" range}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
                 {{/unless}}
               </td>
             </tr>
@@ -59,7 +59,7 @@
 
       {{#unless readOnly}}
         <div>
-          <button class="btn bg-link icon-btn" {{action "add"}}>
+          <button class="btn bg-link icon-btn" type="button" {{action "add"}}>
             <span class="darken"><i class="icon icon-plus text-small"/></span>
             <span>{{t 'formRunAsUserPodSecurityPolicy.range.addLabel'}}</span>
           </button>
diff --git a/lib/global-admin/addon/components/form-supplementalgroups-policy/template.hbs b/lib/global-admin/addon/components/form-supplementalgroups-policy/template.hbs
index fb15dac85..a42f24f11 100644
--- a/lib/global-admin/addon/components/form-supplementalgroups-policy/template.hbs
+++ b/lib/global-admin/addon/components/form-supplementalgroups-policy/template.hbs
@@ -44,7 +44,7 @@
               </td>
               <td class="text-right">
                 {{#unless readOnly}}
-                  <button class="btn bg-primary btn-sm" {{action "remove" range}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+                  <button class="btn bg-primary btn-sm" type="button" {{action "remove" range}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
                 {{/unless}}
               </td>
             </tr>
@@ -54,7 +54,7 @@
 
       {{#unless readOnly}}
         <div>
-          <button class="btn bg-link icon-btn" {{action "add"}}>
+          <button class="btn bg-link icon-btn" type="button" {{action "add"}}>
             <span class="darken"><i class="icon icon-plus text-small"/></span>
             <span>{{t 'formSupplementalGroupsPodSecurityPolicy.range.addLabel'}}</span>
           </button>
diff --git a/lib/global-admin/addon/components/new-edit-role/component.js b/lib/global-admin/addon/components/new-edit-role/component.js
index e013b4c5d..deb9c34fd 100644
--- a/lib/global-admin/addon/components/new-edit-role/component.js
+++ b/lib/global-admin/addon/components/new-edit-role/component.js
@@ -95,7 +95,7 @@ export default Component.extend(ViewNewEdit, {
     return (get(this, 'roleType') || '').capitalize();
   }),
 
-  isDefault: computed('roleType', {
+  isDefault: computed('model.role', 'roleType', {
     get(/* key */) {
       const model = get(this, 'model.role');
       const type  = get(this, 'roleType');
diff --git a/lib/global-admin/addon/components/new-edit-role/template.hbs b/lib/global-admin/addon/components/new-edit-role/template.hbs
index 79b1e0cb3..c5d4bb9eb 100644
--- a/lib/global-admin/addon/components/new-edit-role/template.hbs
+++ b/lib/global-admin/addon/components/new-edit-role/template.hbs
@@ -160,7 +160,7 @@
 
     {{#unless readOnlyOrBuiltIn}}
       <div>
-        <button class="btn bg-primary icon-btn p-0" {{action "addRule"}}>
+        <button class="btn bg-primary icon-btn p-0" type="button" {{action "addRule"}}>
           <span class="darken"><i class="icon icon-plus text-small"/></span>
           <span>{{t "rolesPage.new.form.allow.addAction"}}</span>
         </button>
@@ -203,7 +203,7 @@
 
       {{#unless readOnlyOrBuiltIn}}
         <div>
-          <button class="btn bg-primary icon-btn p-0" {{action "addOtherRole"}}>
+          <button class="btn bg-primary icon-btn p-0" type="button" {{action "addOtherRole"}}>
             <span class="darken"><i class="icon icon-plus text-small"/></span>
             <span>{{t "rolesPage.new.form.otherRole.addAction"}}</span>
           </button>
diff --git a/lib/global-admin/addon/components/new-multi-cluster-app/component.js b/lib/global-admin/addon/components/new-multi-cluster-app/component.js
index 40616fa6e..b1608e280 100644
--- a/lib/global-admin/addon/components/new-multi-cluster-app/component.js
+++ b/lib/global-admin/addon/components/new-multi-cluster-app/component.js
@@ -88,9 +88,9 @@ export default Component.extend(NewOrEdit, CatalogApp, {
   editable:                  null,
   mcAppIsSaving:             false,
 
-  overridesHeaders:          OVERRIDE_HEADERS,
+  overridesHeaders: OVERRIDE_HEADERS,
 
-  isGKE:                     alias('scope.currentCluster.isGKE'),
+  isGKE: alias('scope.currentCluster.isGKE'),
 
   primaryResource:           alias('multiClusterApp'),
   editing:                   notEmpty('primaryResource.id'),
@@ -107,15 +107,8 @@ export default Component.extend(NewOrEdit, CatalogApp, {
     this.initAttrs();
     this.initUpgradeStrategy();
 
-    scheduleOnce('afterRender', () => {
-      if ( get(this, 'selectedTemplateUrl') ) {
-        this.templateChanged();
-      } else {
-        this.initSelectedTemplateModel();
-      }
+    scheduleOnce('afterRender', this, this.setupComponent);
 
-      set(this, 'editable.selectedTemplateUrl', get(this, 'selectedTemplateUrl'));
-    });
     if (get(this, 'multiClusterApp.targets')) {
       set(this, 'editable.multiClusterApp.targets', [...get(this, 'multiClusterApp.targets')]);
     }
@@ -415,7 +408,7 @@ export default Component.extend(NewOrEdit, CatalogApp, {
     return out;
   }),
 
-  answersArray: computed('selectedTemplateModel.questions', 'selectedTemplateModel.customAnswers', 'primaryResource.answers', function() {
+  answersArray: computed('primaryResource.answers.firstObject.values', 'selectedTemplateModel.{customAnswers,questions}', function() {
     const model = get(this, 'selectedTemplateModel');
 
     if (get(model, 'questions')) {
@@ -445,7 +438,7 @@ export default Component.extend(NewOrEdit, CatalogApp, {
     }
   }),
 
-  answersString: computed('answersArray.@each.{variable,answer}', function() {
+  answersString: computed('answersArray.@each.{answer,variable}', 'selectedTemplateModel', function() {
     const model = get(this, 'selectedTemplateModel');
 
     if (get(model, 'questions')) {
@@ -469,7 +462,7 @@ export default Component.extend(NewOrEdit, CatalogApp, {
     }
   }),
 
-  allProjectsAndClustersUngrouped: computed('projects.[]', 'primaryResource.targets.@each.projectId', function() {
+  allProjectsAndClustersUngrouped: computed('clusters', 'primaryResource.targets.@each.projectId', 'projects.[]', function() {
     let out = [];
 
     get(this, 'clusters').forEach( (c) => {
@@ -772,4 +765,14 @@ export default Component.extend(NewOrEdit, CatalogApp, {
     }
   },
 
+  setupComponent() {
+    if ( get(this, 'selectedTemplateUrl') ) {
+      this.templateChanged();
+    } else {
+      this.initSelectedTemplateModel();
+    }
+
+    set(this, 'editable.selectedTemplateUrl', get(this, 'selectedTemplateUrl'));
+  },
+
 });
diff --git a/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs b/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs
index 50aaef30a..9d677cbc3 100644
--- a/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs
+++ b/lib/global-admin/addon/components/new-multi-cluster-app/template.hbs
@@ -44,8 +44,7 @@
         <p>{{templateResource.description}}</p>
         <div class="row">
           <button
-            class="btn btn-sm bg-transparent pl-0"
-            {{action "toogleDetailedDescriptions"}}
+            class="btn btn-sm bg-transparent pl-0" type="button" {{action "toogleDetailedDescriptions"}}
           >
             {{t "newMultiClusterApp.seeMore"}}
           </button>
@@ -293,8 +292,7 @@
   }}
     <div class="right-buttons">
       <button
-        class="btn bg-primary btn-sm"
-        {{action "addAnswerOverride"}}
+        class="btn bg-primary btn-sm" type="button" {{action "addAnswerOverride"}}
       >
         <i class="icon icon-plus"></i>
         {{t "newMultiClusterApp.overrides.add.label"}}
@@ -416,8 +414,7 @@
 {{else}}
   <div class="footer-actions">
     <button
-      {{action "cancel"}}
-      class="btn bg-transparent"
+      class="btn bg-transparent" type="button" {{action "cancel"}}
     >
       {{t "saveCancel.cancel"}}
     </button>
diff --git a/lib/global-admin/addon/components/other-role-row/template.hbs b/lib/global-admin/addon/components/other-role-row/template.hbs
index 291cbeb57..2abaf75df 100644
--- a/lib/global-admin/addon/components/other-role-row/template.hbs
+++ b/lib/global-admin/addon/components/other-role-row/template.hbs
@@ -8,6 +8,6 @@
 <td>&nbsp;</td>
 {{#unless readOnly}}
   <div class="input-group-btn">
-    <button class="btn bg-primary btn-sm" {{action "remove"}}><i class="icon icon-minus"/></button>
+    <button class="btn bg-primary btn-sm" type="button" {{action "remove"}}><i class="icon icon-minus"/></button>
   </div>
 {{/unless}}
\ No newline at end of file
diff --git a/lib/global-admin/addon/components/policy-row/template.hbs b/lib/global-admin/addon/components/policy-row/template.hbs
index be1ca1666..a72370662 100644
--- a/lib/global-admin/addon/components/policy-row/template.hbs
+++ b/lib/global-admin/addon/components/policy-row/template.hbs
@@ -10,6 +10,6 @@
 <td>&nbsp;</td>
 {{#unless readOnly}}
   <div class="input-group-btn">
-    <button class="btn bg-primary btn-sm" {{action "remove"}}><i class="icon icon-minus"/></button>
+    <button class="btn bg-primary btn-sm" type="button" {{action "remove"}}><i class="icon icon-minus"/></button>
   </div>
 {{/unless}}
\ No newline at end of file
diff --git a/lib/global-admin/addon/components/registry-catalog/component.js b/lib/global-admin/addon/components/registry-catalog/component.js
index ae32bc628..851d9ce08 100644
--- a/lib/global-admin/addon/components/registry-catalog/component.js
+++ b/lib/global-admin/addon/components/registry-catalog/component.js
@@ -1,3 +1,5 @@
+/* eslint-disable  ember/no-arrow-function-computed-properties */
+// this route is never hit, if we ever introduce it again we should deal with these
 import Component from '@ember/component';
 import layout from './template';
 import {
@@ -294,7 +296,7 @@ export default Component.extend(CrudCatalog, ReservationCheck, {
     this.notifyPropertyChange('saveDisabled')
   }),
 
-  dockerLogin: computed('app.answers', function() {
+  dockerLogin: computed('app.answers', 'showForm', function() {
     const url = (get(this, 'app.answers') || HIDDEN_KEYS)[INGRESS_HOSTS_CORE];
     const username = get(this, 'showForm') ? 'admin' : 'USERNAME'
 
@@ -421,6 +423,8 @@ export default Component.extend(CrudCatalog, ReservationCheck, {
         action,
       })
     }
+
+    return;
   }),
 
   saveDisabled: computed('globalRegistryWarning', 'databaseWarning', 'redisWarning', 'registryWarning', 'clairWarning', 'notaryWarning', 'notarySignerWarning', 'notaryServerWarning', function() {
@@ -445,19 +449,19 @@ export default Component.extend(CrudCatalog, ReservationCheck, {
     }
   }),
 
-  insufficientNotaryCpu: computed(`notarySchedulableNodes.@each.{allocatable,requested}`, `config.notaryServerRequestCpu`, 'config.notarySignerRequestCpu', 'cluster.nodes.@each.{allocatable,requested}', function() {
+  insufficientNotaryCpu: computed(`notarySchedulableNodes.@each.{allocatable,requested}`, `config.notaryServerRequestCpu`, 'cluster.nodes.@each.{allocatable,requested}', 'config.{notaryServerRequestCpu,notarySignerRequestCpu}', function() {
     const reservation = Math.max(parseInt(get(this, 'config.notaryServerRequestCpu') || '0'), parseInt(get(this, 'config.notarySignerRequestCpu') || '0'))
 
     return this.getComponentInsufficient('notary', 'cpu', reservation)
   }),
 
-  insufficientNotaryMemory: computed(`notarySchedulableNodes.@each.{allocatable,requested}`, `config.notaryServerRequestMemory`, 'config.notarySignerRequestMemory', 'cluster.nodes.@each.{allocatable,requested}', function() {
+  insufficientNotaryMemory: computed(`notarySchedulableNodes.@each.{allocatable,requested}`, `config.notaryServerRequestMemory`, 'cluster.nodes.@each.{allocatable,requested}', 'config.{notaryServerRequestMemory,notarySignerRequestMemory}', function() {
     const reservation = Math.max(parseInt(get(this, 'config.notaryServerRequestMemory') || '0'), parseInt(get(this, 'config.notarySignerRequestMemory') || '0'))
 
     return this.getComponentInsufficient('notary', 'memory', reservation)
   }),
 
-  notaryWarning: computed(`insufficientNotaryCpu`, `insufficientNotaryMemory`, function() {
+  notaryWarning: computed(`insufficientNotaryCpu`, `insufficientNotaryMemory`, 'config.{notaryEnabled,notaryServerRequestCpu,notaryServerRequestMemory,notarySignerRequestCpu,notarySignerRequestMemory}', function() {
     if (!get(this, 'config.notaryEnabled')) {
       return
     }
diff --git a/lib/global-admin/addon/components/registry-catalog/template.hbs b/lib/global-admin/addon/components/registry-catalog/template.hbs
index 24ed51c74..e15c82f46 100644
--- a/lib/global-admin/addon/components/registry-catalog/template.hbs
+++ b/lib/global-admin/addon/components/registry-catalog/template.hbs
@@ -5,11 +5,11 @@
   {{#if (and enabled showForm)}}
     <div class="pull-right">
       {{#if confirmDisable}}
-        <button class="btn bg-error" {{action "disable"}}>
+        <button class="btn bg-error" type="button" {{action "disable"}}>
           <i class="icon icon-alert"></i> {{t "globalRegistryPage.confirmDisable"}}
         </button>
       {{else}}
-        <button class="btn bg-error" {{action "promptDisable"}}>
+        <button class="btn bg-error" type="button" {{action "promptDisable"}}>
           {{t "globalRegistryPage.disable"}}
         </button>
       {{/if}}
diff --git a/lib/global-admin/addon/components/role-rule-row/template.hbs b/lib/global-admin/addon/components/role-rule-row/template.hbs
index f691611bb..1b741af3c 100644
--- a/lib/global-admin/addon/components/role-rule-row/template.hbs
+++ b/lib/global-admin/addon/components/role-rule-row/template.hbs
@@ -59,7 +59,7 @@
 <td class="pt-5 pb-5">&nbsp;</td>
 {{#unless readOnly}}
   <div class="input-group-btn">
-    <button class="btn bg-primary btn-sm" {{action "remove"}}>
+    <button class="btn bg-primary btn-sm" type="button" {{action "remove"}}>
       <i class="icon icon-minus"/>
     </button>
   </div>
diff --git a/lib/global-admin/addon/components/saml-config/template.hbs b/lib/global-admin/addon/components/saml-config/template.hbs
index 9b274d672..e10d58893 100644
--- a/lib/global-admin/addon/components/saml-config/template.hbs
+++ b/lib/global-admin/addon/components/saml-config/template.hbs
@@ -496,10 +496,10 @@
       <section>
         <div class="clearfix">
           <div class="pull-right">
-            <button class="btn btn-sm bg-primary" {{action "edit"}}>
+            <button class="btn btn-sm bg-primary" type="button" {{action "edit"}}>
               {{t "generic.edit"}}
             </button>
-            <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
+            <button class="btn btn-sm right-divider-btn bg-error" type="button" {{action "disable"}}>
               {{t "authPage.saml.accessEnabled.disable"}}
             </button>
           </div>
diff --git a/lib/global-admin/addon/components/site-access/template.hbs b/lib/global-admin/addon/components/site-access/template.hbs
index 2cffd765b..c8b0a7df7 100644
--- a/lib/global-admin/addon/components/site-access/template.hbs
+++ b/lib/global-admin/addon/components/site-access/template.hbs
@@ -66,9 +66,7 @@
             <li>
               {{#identity-block principalId=id}}
                 <button
-                  class="btn bg-primary btn-sm pull-right gh-action mt-5"
-                  {{action "removeAuthorized" id}}
-                  disabled={{lte model.allowedPrincipalIds.length 1}}>
+                  class="btn bg-primary btn-sm pull-right gh-action mt-5" disabled={{lte model.allowedPrincipalIds.length 1}} type="button" {{action "removeAuthorized" id}}>
                   <i class="icon icon-minus"></i>
                 </button>
               {{/identity-block}}
diff --git a/lib/global-admin/addon/global-dns/entries/new/controller.js b/lib/global-admin/addon/global-dns/entries/new/controller.js
index 462fb37c2..39338f847 100644
--- a/lib/global-admin/addon/global-dns/entries/new/controller.js
+++ b/lib/global-admin/addon/global-dns/entries/new/controller.js
@@ -160,7 +160,7 @@ export default Controller.extend(ViewNewEdit, {
     return [...projectsToAddOnUpgrade, ...projectIds].filter((projectId) => !projectsToRemoveOnUpgrade.includes(projectId));
   }),
 
-  providers: computed('model.providers.[]', function() {
+  providers: computed('model.providers.[]', 'primaryResource', function() {
     let { providerId } = this.primaryResource;
     let { providers }  = this.model;
 
@@ -195,7 +195,7 @@ export default Controller.extend(ViewNewEdit, {
     }).sortBy('name');
   }),
 
-  multiClusterApps: computed('model.multiClusterApps.[]', function() {
+  multiClusterApps: computed('model.multiClusterApps.[]', 'primaryResource', function() {
     let { multiClusterApps }  = this.model;
     let { multiClusterAppId } = this.primaryResource;
 
@@ -230,7 +230,7 @@ export default Controller.extend(ViewNewEdit, {
     }).sortBy('name');
   }),
 
-  projectTargets: computed('combinedProjectIds.[]', 'projectsToRemoveOnUpgrade.[]', function() {
+  projectTargets: computed('combinedProjectIds.[]', 'model.allProjects', 'projectsToRemoveOnUpgrade.[]', function() {
     const allProjects = get(this, 'model.allProjects');
     const projectIds  = get(this, 'combinedProjectIds');
     const out         = [];
@@ -249,7 +249,7 @@ export default Controller.extend(ViewNewEdit, {
       } else {
         out.pushObject({
           projectId,
-          clusterId:   projectId.split(':')[0],
+          clusterId: projectId.split(':')[0],
         });
       }
     })
diff --git a/lib/global-admin/addon/global-dns/providers/new/controller.js b/lib/global-admin/addon/global-dns/providers/new/controller.js
index 9462f001e..4feabbf39 100644
--- a/lib/global-admin/addon/global-dns/providers/new/controller.js
+++ b/lib/global-admin/addon/global-dns/providers/new/controller.js
@@ -52,7 +52,7 @@ export default Controller.extend(ViewNewEdit, {
     },
   },
 
-  availableProviders: computed('isEdit', function() {
+  availableProviders: computed('activeProvider', 'isEdit', function() {
     if ( get(this, 'isEdit') ) {
       return [{ name: get(this, 'activeProvider') }];
     } else {
diff --git a/lib/global-admin/addon/initializers/app.js b/lib/global-admin/addon/initializers/app.js
index 26ed24052..992a54d40 100644
--- a/lib/global-admin/addon/initializers/app.js
+++ b/lib/global-admin/addon/initializers/app.js
@@ -7,6 +7,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'app',
+  name: 'app',
   initialize
 };
diff --git a/lib/global-admin/addon/mixins/saml-auth.js b/lib/global-admin/addon/mixins/saml-auth.js
index 3e7bde977..7305eb927 100644
--- a/lib/global-admin/addon/mixins/saml-auth.js
+++ b/lib/global-admin/addon/mixins/saml-auth.js
@@ -141,7 +141,7 @@ export default Mixin.create({
     return false;
   }),
 
-  numUsers: computed('authConfig.allowedIdentities.@each.externalIdType', 'wasRestricted', function() {
+  numUsers: computed('authConfig.allowedIdentities.@each.externalIdType', 'providerName', 'wasRestricted', function() {
     let type = `PROJECT.TYPE_${ get(this, 'providerName').capitalize() }_USER`;
 
     type = get(C, type);
@@ -149,7 +149,7 @@ export default Mixin.create({
     return (this.get('authConfig.allowedIdentities') || []).filterBy('externalIdType', type).get('length');
   }),
 
-  numOrgs: computed('authConfig.allowedIdentities.@each.externalIdType', 'wasRestricted', function() {
+  numOrgs: computed('authConfig.allowedIdentities.@each.externalIdType', 'providerName', 'wasRestricted', function() {
     let type = `PROJECT.TYPE_${ get(this, 'providerName').capitalize() }_GROUP`;
 
     type = get(C, type);
diff --git a/lib/global-admin/addon/multi-cluster-apps/catalog/launch/controller.js b/lib/global-admin/addon/multi-cluster-apps/catalog/launch/controller.js
index c36378ebb..7196ec05c 100644
--- a/lib/global-admin/addon/multi-cluster-apps/catalog/launch/controller.js
+++ b/lib/global-admin/addon/multi-cluster-apps/catalog/launch/controller.js
@@ -9,7 +9,7 @@ export default Controller.extend({
   appId:       null,
   clone:       null,
 
-  parentRoute:  'multi-cluster-apps.catalog.index',
+  parentRoute: 'multi-cluster-apps.catalog.index',
 
   actions: {
     cancel() {
diff --git a/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js b/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js
index badf9ea07..d6c4023df 100644
--- a/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js
+++ b/lib/global-admin/addon/multi-cluster-apps/catalog/launch/route.js
@@ -13,7 +13,7 @@ export default Route.extend({
   store:        service(),
   globalStore:  service(),
 
-  parentRoute:  'multi-cluster-apps.catalog',
+  parentRoute: 'multi-cluster-apps.catalog',
 
   model(params/* , transition*/) {
     var store = get(this, 'globalStore');
diff --git a/lib/global-admin/addon/multi-cluster-apps/index/controller.js b/lib/global-admin/addon/multi-cluster-apps/index/controller.js
index d3bd05ebe..d790d665e 100644
--- a/lib/global-admin/addon/multi-cluster-apps/index/controller.js
+++ b/lib/global-admin/addon/multi-cluster-apps/index/controller.js
@@ -14,7 +14,7 @@ export default Controller.extend({
   sortBy:  'name',
 
   templatesObsvr: observer('model.apps.[]', function() {
-    once(() => this.get('catalog').fetchAppTemplates(get(this, 'model.apps')));
+    once(this, this.catalog.fetchAppTemplates, get(this, 'model.apps'));
   }),
 
   filteredApps: computed('model.apps.@each.{type,isFromCatalog,state}', 'searchText', function() {
@@ -39,7 +39,7 @@ export default Controller.extend({
     return group;
   }),
 
-  showMultiClusterWarning: computed('scope.allClusters.@each.{id}', function() {
+  showMultiClusterWarning: computed('scope.allClusters.@each.id', function() {
     const localCluster = this.scope.allClusters.findBy('id', 'local');
 
     return !isEmpty(get(localCluster, 'id')) && get(localCluster, 'isReady');
diff --git a/lib/global-admin/addon/routes.js b/lib/global-admin/addon/routes.js
index 1d76fe68b..975b60da0 100644
--- a/lib/global-admin/addon/routes.js
+++ b/lib/global-admin/addon/routes.js
@@ -4,7 +4,7 @@ export default buildRoutes(function() {
   this.route('clusters', function() {
     this.route('index', { path: '/' });
     this.route('new', { path: '/add' }, function() {
-      this.route('select', { path: '/select' });
+      this.route('select' );
       this.route('launch', { path: '/launch/:provider' });
     });
   });
@@ -25,14 +25,14 @@ export default buildRoutes(function() {
 
   this.route('multi-cluster-apps', { path: '/apps' }, function() {
     this.route('index', { path: '/' });
-    this.route('catalog', { path: '/catalog' }, function() {
+    this.route('catalog',  function() {
       this.route('index');
       this.route('launch', { path: '/:template' });
     });
   });
 
   this.route('settings', function() {
-    this.route('advanced', { path: '/advanced' });
+    this.route('advanced' );
     this.route('features', { path: '/feature-flags' });
   });
 
@@ -40,8 +40,8 @@ export default buildRoutes(function() {
     this.route('index', { path: '/' });
 
     this.route('accounts', function() {
-      this.route('groups', { path: '/groups' });
-      this.route('users', { path: '/users' });
+      this.route('groups' );
+      this.route('users' );
       this.route('new', { path: '/add' });
       this.route('new-group', { path: '/add-group' });
       this.route('edit-group', { path: '/edit-group/:role_id' });
diff --git a/lib/global-admin/addon/security/accounts/detail/controller.js b/lib/global-admin/addon/security/accounts/detail/controller.js
index 60cfd1c9c..e3eb161c4 100644
--- a/lib/global-admin/addon/security/accounts/detail/controller.js
+++ b/lib/global-admin/addon/security/accounts/detail/controller.js
@@ -91,7 +91,7 @@ const GROUP_HEADERS = [
 
 
 export default Controller.extend({
-  router:         service(),
+  router: service(),
 
   globalHeaders:  GLOBAL_HEADERS,
   clusterHeaders: CLUSTER_HEADERS,
diff --git a/lib/global-admin/addon/security/accounts/groups/controller.js b/lib/global-admin/addon/security/accounts/groups/controller.js
index f807579eb..ec54d5e63 100644
--- a/lib/global-admin/addon/security/accounts/groups/controller.js
+++ b/lib/global-admin/addon/security/accounts/groups/controller.js
@@ -28,7 +28,7 @@ export default Controller.extend({
   hasRefreshProviderAccess: false,
   errors:                   null,
 
-  headers:    HEADERS,
+  headers: HEADERS,
 
   actions: {
     refreshAllTokens() {
@@ -53,7 +53,7 @@ export default Controller.extend({
     },
   },
 
-  parsedGroups: computed('model.globalRoleBindings.@each.{state,id,groupPrincipal}', 'model.groupPrincipals.@each.{groupPrincipalId}', function() {
+  parsedGroups: computed('model.globalRoleBindings.@each.{state,id,groupPrincipal}', 'model.groupPrincipals.@each.groupPrincipalId', function() {
     const { model: { globalRoleBindings, groupPrincipals } } = this;
     // Because we don't create a group when we associate a group with a GRB we have to individually fetch the groups from the auth provider
     // The list that is displayed on this page is a bit of a fudge and when you take an action on a "group" on this page the user will
diff --git a/lib/global-admin/addon/security/accounts/groups/template.hbs b/lib/global-admin/addon/security/accounts/groups/template.hbs
index ed3dafca3..03ffb7169 100644
--- a/lib/global-admin/addon/security/accounts/groups/template.hbs
+++ b/lib/global-admin/addon/security/accounts/groups/template.hbs
@@ -10,15 +10,14 @@
       {{#if refreshing}}
         <button
           class="btn bg-primary btn-sm btn-disabled"
-          disabled
+          disabled type="button"
         >
           <i class="icon icon-spinner icon-spin"></i>
           {{t "generic.loading"}}
         </button>
       {{else}}
         <button
-          {{action "refreshAllTokens"}}
-          class="btn bg-primary btn-sm"
+          class="btn bg-primary btn-sm" type="button" {{action "refreshAllTokens"}}
         >
           <i class="icon icon-refresh"></i>
           {{t "siteAccess.refreshGroups"}}
diff --git a/lib/global-admin/addon/security/accounts/new/controller.js b/lib/global-admin/addon/security/accounts/new/controller.js
index 962d14984..c2ccf0b69 100644
--- a/lib/global-admin/addon/security/accounts/new/controller.js
+++ b/lib/global-admin/addon/security/accounts/new/controller.js
@@ -25,12 +25,12 @@ export default Controller.extend(NewOrEdit, {
   settings:        service(),
   intl:            service(),
 
-  sortBy:          'name',
+  sortBy: 'name',
 
   globalRoleSave:  null,
   canUserLogIn:    null,
 
-  headers:         HEADERS,
+  headers: HEADERS,
 
   primaryResource: alias('model.account'),
 
diff --git a/lib/global-admin/addon/security/accounts/users/template.hbs b/lib/global-admin/addon/security/accounts/users/template.hbs
index 24238f080..b01f8b130 100644
--- a/lib/global-admin/addon/security/accounts/users/template.hbs
+++ b/lib/global-admin/addon/security/accounts/users/template.hbs
@@ -10,15 +10,14 @@
       {{#if refreshing}}
         <button
           class="btn bg-primary btn-sm btn-disabled"
-          disabled
+          disabled type="button"
         >
           <i class="icon icon-spinner icon-spin"></i>
           {{t "generic.loading"}}
         </button>
       {{else}}
         <button
-          {{action "refreshAllTokens"}}
-          class="btn bg-primary btn-sm"
+          class="btn bg-primary btn-sm" type="button" {{action "refreshAllTokens"}}
         >
           <i class="icon icon-refresh"></i>
           {{t "siteAccess.refreshGroups"}}
diff --git a/lib/global-admin/addon/security/authentication/activedirectory/controller.js b/lib/global-admin/addon/security/authentication/activedirectory/controller.js
index c2993ca34..69fd3cada 100644
--- a/lib/global-admin/addon/security/authentication/activedirectory/controller.js
+++ b/lib/global-admin/addon/security/authentication/activedirectory/controller.js
@@ -27,7 +27,7 @@ export default Controller.extend(AuthMixin, {
   password:          '',
   editing:           false,
 
-  authConfig:          alias('model.activeDirectory'),
+  authConfig: alias('model.activeDirectory'),
   init() {
     this._super(...arguments);
     if (get(this, 'authConfig')){
diff --git a/lib/global-admin/addon/security/authentication/azuread/controller.js b/lib/global-admin/addon/security/authentication/azuread/controller.js
index 8dcec821e..41e2ea266 100644
--- a/lib/global-admin/addon/security/authentication/azuread/controller.js
+++ b/lib/global-admin/addon/security/authentication/azuread/controller.js
@@ -20,7 +20,7 @@ export default Controller.extend(AuthMixin, {
   region:         null,
   _boundSucceed:  null,
 
-  authConfig:     alias('model.azureADConfig'),
+  authConfig: alias('model.azureADConfig'),
 
   actions: {
 
diff --git a/lib/global-admin/addon/security/authentication/azuread/template.hbs b/lib/global-admin/addon/security/authentication/azuread/template.hbs
index 7399dfdf9..96a04ff06 100644
--- a/lib/global-admin/addon/security/authentication/azuread/template.hbs
+++ b/lib/global-admin/addon/security/authentication/azuread/template.hbs
@@ -29,10 +29,10 @@
       <section class="">
         <div class="clearfix">
           <div class="pull-right">
-            <button class="btn btn-sm bg-primary" {{action "edit"}}>
+            <button class="btn btn-sm bg-primary" type="button" {{action "edit"}}>
               {{t 'generic.edit'}}
             </button>
-            <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
+            <button class="btn btn-sm right-divider-btn bg-error" type="button" {{action "disable"}}>
               {{t 'authPage.azuread.enabled.promptDisable'}}
             </button>
           </div>
@@ -115,14 +115,14 @@
           {{/if}}
           <div class="row mt-10 text-center">
             <div class="btn-group">
-              <button class="btn bg-primary" {{action "test"}}>
+              <button class="btn bg-primary" type="button" {{action "test"}}>
                 {{#if testing}}
                   <i class="icon icon-spinner icon-spin"></i> {{t 'authPage.azuread.test.post'}}
                 {{else}}
                   <i class="icon icon-azuread"></i> {{t 'authPage.azuread.test.pre'}}
                 {{/if}}
               </button>
-              <button {{action "cancel"}} class="btn bg-transparent">{{t 'saveCancel.cancel'}}</button>
+              <button class="btn bg-transparent" type="button" {{action "cancel"}}>{{t 'saveCancel.cancel'}}</button>
             </div>
           </div>
         </form>
diff --git a/lib/global-admin/addon/security/authentication/controller.js b/lib/global-admin/addon/security/authentication/controller.js
index 1a198e07e..d1d0e4f7f 100644
--- a/lib/global-admin/addon/security/authentication/controller.js
+++ b/lib/global-admin/addon/security/authentication/controller.js
@@ -6,7 +6,7 @@ export default Controller.extend({
   access:      service(),
   globalStore: service(),
 
-  lastRoute:   'global-admin.security.authentication.github',
+  lastRoute: 'global-admin.security.authentication.github',
 
   drivers:   computed(function() {
     return [
diff --git a/lib/global-admin/addon/security/authentication/github/controller.js b/lib/global-admin/addon/security/authentication/github/controller.js
index 25d9be51b..fa1491f16 100644
--- a/lib/global-admin/addon/security/authentication/github/controller.js
+++ b/lib/global-admin/addon/security/authentication/github/controller.js
@@ -84,6 +84,8 @@ export default Controller.extend(AuthMixin, {
     if ( get(this, 'testing') ) {
       return true;
     }
+
+    return false;
   }),
 
   providerName: computed('authConfig.hostname', function() {
@@ -94,11 +96,11 @@ export default Controller.extend(AuthMixin, {
     }
   }),
 
-  numUsers: computed('authConfig.allowedPrincipals.@each.externalIdType', 'wasRestricted', function() {
+  numUsers: computed('authConfig.allowedPrincipalIds', 'authConfig.allowedPrincipals.@each.externalIdType', 'wasRestricted', function() {
     return ( get(this, 'authConfig.allowedPrincipalIds') || []).filter((principal) => principal.includes(C.PROJECT.TYPE_GITHUB_USER)).get('length');
   }),
 
-  numOrgs: computed('authConfig.allowedPrincipals.@each.externalIdType', 'wasRestricted', function() {
+  numOrgs: computed('authConfig.allowedPrincipalIds', 'authConfig.allowedPrincipals.@each.externalIdType', 'wasRestricted', function() {
     return ( get(this, 'authConfig.allowedPrincipalIds') || []).filter((principal) => principal.includes(C.PROJECT.TYPE_GITHUB_ORG)).get('length');
   }),
 
diff --git a/lib/global-admin/addon/security/authentication/github/template.hbs b/lib/global-admin/addon/security/authentication/github/template.hbs
index 19833e93c..043518280 100644
--- a/lib/global-admin/addon/security/authentication/github/template.hbs
+++ b/lib/global-admin/addon/security/authentication/github/template.hbs
@@ -23,7 +23,7 @@
       <section class="">
         <div class="clearfix">
           <div class="pull-right">
-            <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
+            <button class="btn btn-sm right-divider-btn bg-error" type="button" {{action "disable"}}>
               {{t 'authPage.github.authenticated.disableAccess.disable'}}
             </button>
           </div>
@@ -131,7 +131,7 @@
 
           <div class="row text-center">
             <div class="btn-group">
-              <button class="btn bg-primary" {{action "save"}}>
+              <button class="btn bg-primary" type="button" {{action "save"}}>
                 {{#if saving}}
                   <i class="icon icon-spinner icon-spin"></i> {{t 'authPage.github.testAuth.buttonText.post'}}
                 {{else if doneSaving}}
@@ -140,7 +140,7 @@
                   <i class="icon icon-github"></i> {{t 'authPage.github.testAuth.buttonText.pre'}}
                 {{/if}}
               </button>
-              <button {{action "cancel"}} class="btn bg-transparent">{{t 'saveCancel.cancel'}}</button>
+              <button class="btn bg-transparent" type="button" {{action "cancel"}}>{{t 'saveCancel.cancel'}}</button>
             </div>
           </div>
         </section>
diff --git a/lib/global-admin/addon/security/authentication/googleoauth/template.hbs b/lib/global-admin/addon/security/authentication/googleoauth/template.hbs
index b632fd602..f63e41e1f 100644
--- a/lib/global-admin/addon/security/authentication/googleoauth/template.hbs
+++ b/lib/global-admin/addon/security/authentication/googleoauth/template.hbs
@@ -45,10 +45,10 @@
       <section class="">
         <div class="clearfix">
           <div class="pull-right">
-            <button class="btn btn-sm bg-primary" {{action "edit"}}>
+            <button class="btn btn-sm bg-primary" type="button" {{action "edit"}}>
               {{t "generic.edit"}}
             </button>
-            <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
+            <button class="btn btn-sm right-divider-btn bg-error" type="button" {{action "disable"}}>
               {{t "authPage.googleoauth.authenticated.disableAccess.disable"}}
             </button>
           </div>
diff --git a/lib/global-admin/addon/security/authentication/localauth/controller.js b/lib/global-admin/addon/security/authentication/localauth/controller.js
index bedb1cd44..32d1493b5 100644
--- a/lib/global-admin/addon/security/authentication/localauth/controller.js
+++ b/lib/global-admin/addon/security/authentication/localauth/controller.js
@@ -140,7 +140,7 @@ export default Controller.extend({
       });
     },
   },
-  createDisabled: computed('adminPublicValue', 'adminSecretValue', 'adminSecretValue2', function() {
+  createDisabled: computed('adminPublicValue.length', 'adminSecretValue.length', 'adminSecretValue2', function() {
     var ok = get(this, 'adminPublicValue.length') && get(this, 'adminSecretValue.length') && (get(this, 'adminSecretValue') === get(this, 'adminSecretValue2'));
 
     return !ok;
diff --git a/lib/global-admin/addon/security/cloud-credentials/index/controller.js b/lib/global-admin/addon/security/cloud-credentials/index/controller.js
index 32fcd15c4..15cc39fdc 100644
--- a/lib/global-admin/addon/security/cloud-credentials/index/controller.js
+++ b/lib/global-admin/addon/security/cloud-credentials/index/controller.js
@@ -26,7 +26,7 @@ const HEADERS = [
 ];
 
 export default Controller.extend({
-  modal:             service(),
+  modal: service(),
 
   layout,
   sortBy:            'name',
@@ -42,7 +42,7 @@ export default Controller.extend({
     }
   },
 
-  filteredContent: computed('model.@each.{id}', function() {
+  filteredContent: computed('model.@each.id', function() {
     return get(this, 'model').sortBy('id');
   }),
 });
diff --git a/lib/global-admin/addon/security/cloud-credentials/index/route.js b/lib/global-admin/addon/security/cloud-credentials/index/route.js
index 5e2270abd..ee71da206 100644
--- a/lib/global-admin/addon/security/cloud-credentials/index/route.js
+++ b/lib/global-admin/addon/security/cloud-credentials/index/route.js
@@ -3,7 +3,7 @@ import { inject as service } from '@ember/service';
 // import { get } from '@ember/object';
 
 export default Route.extend({
-  globalStore:         service(),
+  globalStore: service(),
 
   model(/* params */) {
     return this.globalStore.findAll('cloudcredential');
diff --git a/lib/global-admin/addon/security/cloud-credentials/index/template.hbs b/lib/global-admin/addon/security/cloud-credentials/index/template.hbs
index 40557317b..28cb6d702 100644
--- a/lib/global-admin/addon/security/cloud-credentials/index/template.hbs
+++ b/lib/global-admin/addon/security/cloud-credentials/index/template.hbs
@@ -8,9 +8,8 @@
       {{t "cloudCredentialsPage.rightButtons.nodeTemplates"}}
     {{/link-to-external}}
     <button
-      {{action "addCloudKey"}}
       class="btn btn-sm bg-primary right-divider-btn"
-      disabled={{rbac-prevents resource="cloudcredential" scope="global" permission="create"}}
+      disabled={{rbac-prevents resource="cloudcredential" scope="global" permission="create"}} type="button" {{action "addCloudKey"}}
     >
       {{t "cloudCredentialsPage.rightButtons.addKey"}}
     </button>
diff --git a/lib/global-admin/addon/security/roles/index/controller.js b/lib/global-admin/addon/security/roles/index/controller.js
index 3dc9bd600..e66c9e0e1 100644
--- a/lib/global-admin/addon/security/roles/index/controller.js
+++ b/lib/global-admin/addon/security/roles/index/controller.js
@@ -46,9 +46,9 @@ const HEADERS = [
 ];
 
 export default Controller.extend({
-  settings:         service(),
+  settings: service(),
 
-  queryParams:      ['context'],
+  queryParams: ['context'],
 
   sortBy:           'name',
   context:          'global',
diff --git a/lib/global-admin/addon/security/roles/index/route.js b/lib/global-admin/addon/security/roles/index/route.js
index 3a609de1d..021606c90 100644
--- a/lib/global-admin/addon/security/roles/index/route.js
+++ b/lib/global-admin/addon/security/roles/index/route.js
@@ -14,5 +14,5 @@ export default Route.extend({
     });
   },
 
-  queryParams:         { context: { refreshModel: true } },
+  queryParams: { context: { refreshModel: true } },
 });
diff --git a/lib/global-admin/addon/security/roles/new/route.js b/lib/global-admin/addon/security/roles/new/route.js
index 1216bd425..d39805a9f 100644
--- a/lib/global-admin/addon/security/roles/new/route.js
+++ b/lib/global-admin/addon/security/roles/new/route.js
@@ -40,7 +40,7 @@ export default Route.extend({
       } else {
         if (context === 'global') {
           role = store.createRecord({
-            type:           'globalRole',
+            type: 'globalRole',
             context
           });
         } else {
diff --git a/lib/global-admin/addon/templates/-ldap-config.hbs b/lib/global-admin/addon/templates/-ldap-config.hbs
index af9541755..3d6dcea70 100644
--- a/lib/global-admin/addon/templates/-ldap-config.hbs
+++ b/lib/global-admin/addon/templates/-ldap-config.hbs
@@ -24,10 +24,10 @@
       <section class="">
         <div class="clearfix">
           <div class="pull-right">
-            <button class="btn btn-sm bg-primary" {{action "edit"}}>
+            <button class="btn btn-sm bg-primary" type="button" {{action "edit"}}>
               {{t "generic.edit"}}
             </button>
-            <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
+            <button class="btn btn-sm right-divider-btn bg-error" type="button" {{action "disable"}}>
               {{t "ldap.accessEnabled.disable.confirmDisable.pre"}}
             </button>
           </div>
diff --git a/lib/global-admin/addon/templates/-saml-config.hbs b/lib/global-admin/addon/templates/-saml-config.hbs
index ead8d3099..a721d953a 100644
--- a/lib/global-admin/addon/templates/-saml-config.hbs
+++ b/lib/global-admin/addon/templates/-saml-config.hbs
@@ -210,10 +210,10 @@
       <section class="">
         <div class="clearfix">
           <div class="pull-right">
-            <button class="btn btn-sm bg-primary" {{action "edit"}}>
+            <button class="btn btn-sm bg-primary" type="button" {{action "edit"}}>
               {{t "generic.edit"}}
             </button>
-            <button class="btn btn-sm right-divider-btn bg-error" {{action "disable"}}>
+            <button class="btn btn-sm right-divider-btn bg-error" type="button" {{action "disable"}}>
               {{t "authPage.saml.accessEnabled.disable"}}
             </button>
           </div>
diff --git a/lib/global-admin/addon/templates/-shibboleth-config.hbs b/lib/global-admin/addon/templates/-shibboleth-config.hbs
index 35e0a239c..eb6189699 100644
--- a/lib/global-admin/addon/templates/-shibboleth-config.hbs
+++ b/lib/global-admin/addon/templates/-shibboleth-config.hbs
@@ -70,7 +70,7 @@
   <div class="row">
     <div class="inline-form">
       <label class="acc-label pb-5">&nbsp;</label>
-      <button class="btn bg-primary" style="display: block;margin: 0 auto;" {{action "save"}}>
+      <button class="btn bg-primary" style="display: block;margin: 0 auto;" type="button" {{action "save"}}>
         {{#if saving}}
           <i class="icon icon-spinner icon-spin"></i> {{t 'generic.saving'}}
         {{else if saved}}
@@ -88,7 +88,7 @@
   {{top-errors errors=errors}}
   <div class="row">
     <p>{{t 'authPage.github.testAuth.subtext'}}</p>
-    <button class="btn bg-primary" {{action "authTest"}} disabled={{disableAuth}}>
+    <button class="btn bg-primary" disabled={{disableAuth}} type="button" {{action "authTest"}}>
       {{#if testing}}
         <i class="icon icon-spinner icon-spin"></i> {{t 'generic.testing'}}
       {{else}}
diff --git a/lib/global-admin/addon/templates/-shibboleth-configured.hbs b/lib/global-admin/addon/templates/-shibboleth-configured.hbs
index 156c8db2b..eaa99bb5f 100644
--- a/lib/global-admin/addon/templates/-shibboleth-configured.hbs
+++ b/lib/global-admin/addon/templates/-shibboleth-configured.hbs
@@ -35,11 +35,11 @@
   </p>
 
   {{#if confirmDisable}}
-    <button class="btn bg-error" {{action "disable"}}>
+    <button class="btn bg-error" type="button" {{action "disable"}}>
       <i class="icon icon-alert"></i> {{t 'authPage.shibboleth.enabled.disableAccess.confirmDisable'}}
     </button>
   {{else}}
-    <button class="btn bg-error" {{action "promptDisable"}}>
+    <button class="btn bg-error" type="button" {{action "promptDisable"}}>
       <i class="icon icon-umbrella"></i> {{t 'authPage.shibboleth.enabled.disableAccess.disable'}}
     </button>
   {{/if}}
diff --git a/lib/istio/addon/cluster-setting/controller.js b/lib/istio/addon/cluster-setting/controller.js
index 858665698..89836b213 100644
--- a/lib/istio/addon/cluster-setting/controller.js
+++ b/lib/istio/addon/cluster-setting/controller.js
@@ -3,7 +3,7 @@ import { inject as service } from '@ember/service';
 import { get } from '@ember/object'
 
 export default Controller.extend({
-  router:          service(),
+  router: service(),
 
   actions: {
     cancel() {
diff --git a/lib/istio/addon/components/connection-pool/component.js b/lib/istio/addon/components/connection-pool/component.js
index a5f17004e..02422589f 100644
--- a/lib/istio/addon/components/connection-pool/component.js
+++ b/lib/istio/addon/components/connection-pool/component.js
@@ -25,7 +25,7 @@ export default Component.extend({
           maxRequestsPerConnection: 1024,
           maxRetries:               1024,
         },
-        tcp:  { maxConnections: 1024 }
+        tcp: { maxConnections: 1024 }
       });
     }
   },
diff --git a/lib/istio/addon/components/cru-destination-rule/component.js b/lib/istio/addon/components/cru-destination-rule/component.js
index 66e7ff8f4..26cf9b5b1 100644
--- a/lib/istio/addon/components/cru-destination-rule/component.js
+++ b/lib/istio/addon/components/cru-destination-rule/component.js
@@ -15,7 +15,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
 
   layout,
 
-  model:     null,
+  model: null,
 
   subsets:   alias('model.subsets'),
   namespace: alias('model.namespace'),
diff --git a/lib/istio/addon/components/cru-destination-rule/template.hbs b/lib/istio/addon/components/cru-destination-rule/template.hbs
index a52c12229..fd7ba2241 100644
--- a/lib/istio/addon/components/cru-destination-rule/template.hbs
+++ b/lib/istio/addon/components/cru-destination-rule/template.hbs
@@ -109,7 +109,7 @@
 
   {{#if editing}}
     <div class="row">
-      <button class="btn bg-link icon-btn pull-right" {{action "addSubset"}}>
+      <button class="btn bg-link icon-btn pull-right" type="button" {{action "addSubset"}}>
         <span class="darken">
           <i class="icon icon-plus text-small"></i>
         </span>
diff --git a/lib/istio/addon/components/cru-gateway/component.js b/lib/istio/addon/components/cru-gateway/component.js
index ae68b2ad0..9b95cfe68 100644
--- a/lib/istio/addon/components/cru-gateway/component.js
+++ b/lib/istio/addon/components/cru-gateway/component.js
@@ -12,7 +12,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
 
   layout,
 
-  model:     null,
+  model: null,
 
   servers:   alias('model.servers'),
   namespace: alias('model.namespace'),
diff --git a/lib/istio/addon/components/cru-gateway/template.hbs b/lib/istio/addon/components/cru-gateway/template.hbs
index 0da8ab730..694f6113b 100644
--- a/lib/istio/addon/components/cru-gateway/template.hbs
+++ b/lib/istio/addon/components/cru-gateway/template.hbs
@@ -108,7 +108,7 @@
 
   {{#if editing}}
     <div class="row">
-      <button class="btn bg-link icon-btn pull-right" {{action "addServer"}}>
+      <button class="btn bg-link icon-btn pull-right" type="button" {{action "addServer"}}>
         <span class="darken">
           <i class="icon icon-plus text-small"></i>
         </span>
diff --git a/lib/istio/addon/components/cru-virtual-service/component.js b/lib/istio/addon/components/cru-virtual-service/component.js
index 9a7cbd03a..8aaebfefd 100644
--- a/lib/istio/addon/components/cru-virtual-service/component.js
+++ b/lib/istio/addon/components/cru-virtual-service/component.js
@@ -13,7 +13,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
 
   layout,
 
-  model:     null,
+  model: null,
 
   httpRoutes: alias('model.http'),
   namespace:  alias('model.namespace'),
diff --git a/lib/istio/addon/components/cru-virtual-service/template.hbs b/lib/istio/addon/components/cru-virtual-service/template.hbs
index 4aecea3a9..8761644ec 100644
--- a/lib/istio/addon/components/cru-virtual-service/template.hbs
+++ b/lib/istio/addon/components/cru-virtual-service/template.hbs
@@ -154,7 +154,7 @@
 
   {{#if editing}}
     <div class="row">
-      <button class="btn bg-link icon-btn pull-right" {{action "addHttpRoute"}}>
+      <button class="btn bg-link icon-btn pull-right" type="button" {{action "addHttpRoute"}}>
         <span class="darken">
           <i class="icon icon-plus text-small"></i>
         </span>
diff --git a/lib/istio/addon/components/destination-rule-subset-row/template.hbs b/lib/istio/addon/components/destination-rule-subset-row/template.hbs
index a4779732e..98781a0ce 100644
--- a/lib/istio/addon/components/destination-rule-subset-row/template.hbs
+++ b/lib/istio/addon/components/destination-rule-subset-row/template.hbs
@@ -2,7 +2,7 @@
   {{#if (and editing)}}
     <div class="row">
       <div class="pull-right">
-        <button class="btn bg-transparent text-small vertical-middle" {{action "removeSubset" subset}}>
+        <button class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeSubset" subset}}>
           {{t "cruDestinationRule.subsets.removeSubsetLabel"}}
         </button>
       </div>
diff --git a/lib/istio/addon/components/form-labels/template.hbs b/lib/istio/addon/components/form-labels/template.hbs
index 6f5057821..15e6a8ca4 100644
--- a/lib/istio/addon/components/form-labels/template.hbs
+++ b/lib/istio/addon/components/form-labels/template.hbs
@@ -45,9 +45,7 @@
 
           <td class="text-right">
             <button
-              class="btn bg-primary btn-sm"
-              {{action "removeLabel" label}}
-              disabled={{eq label.readonly true}}
+              class="btn bg-primary btn-sm" disabled={{eq label.readonly true}} type="button" {{action "removeLabel" label}}
             >
               <i class="icon icon-minus"/>
               <span class="sr-only">
@@ -64,8 +62,7 @@
     </div>
   {{/if}}
   <button
-    class="btn bg-link icon-btn"
-    {{action "addUserLabel"}}
+    class="btn bg-link icon-btn" type="button" {{action "addUserLabel"}}
   >
     <span class="darken">
       <i class="icon icon-plus text-small"/>
diff --git a/lib/istio/addon/components/gateway-server/template.hbs b/lib/istio/addon/components/gateway-server/template.hbs
index 34e07583b..adf3fceec 100644
--- a/lib/istio/addon/components/gateway-server/template.hbs
+++ b/lib/istio/addon/components/gateway-server/template.hbs
@@ -3,8 +3,7 @@
     <div class="row">
       <div class="pull-right">
         <button
-          class="btn bg-transparent text-small vertical-middle"
-          {{action "removeServer" server}}
+          class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeServer" server}}
         >
           {{t "cruGateway.servers.removeServerLabel"}}
         </button>
diff --git a/lib/istio/addon/components/http-route-destination/template.hbs b/lib/istio/addon/components/http-route-destination/template.hbs
index 499dfc05d..cba3d5ded 100644
--- a/lib/istio/addon/components/http-route-destination/template.hbs
+++ b/lib/istio/addon/components/http-route-destination/template.hbs
@@ -91,8 +91,7 @@
           {{#if editing}}
             <td class="text-right">
               <button
-                class="btn bg-primary btn-sm"
-                {{action "removeDestination" destination}}
+                class="btn bg-primary btn-sm" type="button" {{action "removeDestination" destination}}
               >
                 <i class="icon icon-minus"/>
                 <span class="sr-only">
@@ -115,8 +114,7 @@
 {{#if editing}}
   <div class="row mt-20">
     <button
-      class="btn bg-link icon-btn pull-left"
-      {{action "addDestination"}}
+      class="btn bg-link icon-btn pull-left" type="button" {{action "addDestination"}}
     >
       <span class="darken">
         <i class="icon icon-plus text-small"></i>
diff --git a/lib/istio/addon/components/http-route-match/template.hbs b/lib/istio/addon/components/http-route-match/template.hbs
index 3dcd95cb8..d35ecabbf 100644
--- a/lib/istio/addon/components/http-route-match/template.hbs
+++ b/lib/istio/addon/components/http-route-match/template.hbs
@@ -2,8 +2,7 @@
   <div class="row">
     <div class="pull-right">
       <button
-        class="btn bg-transparent text-small vertical-middle"
-        {{action "removeRouteMatch" model}}
+        class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeRouteMatch" model}}
       >
         {{t "cruVirtualService.http.routes.matches.removeLabel"}}
       </button>
@@ -102,8 +101,7 @@
           {{#if editing}}
             <td class="text-right">
               <button
-                class="btn bg-primary btn-sm"
-                {{action "removeMatch" match}}
+                class="btn bg-primary btn-sm" type="button" {{action "removeMatch" match}}
               >
                 <i class="icon icon-minus"/>
                 <span class="sr-only">
@@ -126,8 +124,7 @@
 {{#if editing}}
   <div class="row mt-20">
     <button
-      class="btn bg-link icon-btn pull-left"
-      {{action "addMatch"}}
+      class="btn bg-link icon-btn pull-left" type="button" {{action "addMatch"}}
     >
       <span class="darken">
         <i class="icon icon-plus text-small"></i>
diff --git a/lib/istio/addon/components/istio-catalog/component.js b/lib/istio/addon/components/istio-catalog/component.js
index d54639423..8ba873b26 100644
--- a/lib/istio/addon/components/istio-catalog/component.js
+++ b/lib/istio/addon/components/istio-catalog/component.js
@@ -1,3 +1,4 @@
+/* eslint-disable  ember/no-arrow-function-computed-properties */
 import Component from '@ember/component';
 import layout from './template';
 import {
@@ -408,6 +409,8 @@ export default Component.extend(CrudCatalog, ReservationCheck, CatalogUpgrade, {
         action,
       })
     }
+
+    return;
   }),
 
   enabled: computed('app.state', function() {
@@ -477,7 +480,7 @@ export default Component.extend(CrudCatalog, ReservationCheck, CatalogUpgrade, {
     return this.getComponentInsufficient('mixer', 'memory', reservation)
   }),
 
-  mixerWarning: computed('insufficientMixerCpu', 'insufficientMixerMemory', 'insufficientMixerTelemetryMemory', 'insufficientMixerTelemetryCpu', 'mixerNodeSelectors.[]', 'config.mixerPolicyEnabled', function() {
+  mixerWarning: computed('config.{mixerPolicyEnabled,mixerPolicyRequestCpu,mixerPolicyRequestMemory,mixerTelemetryRequestCpu,mixerTelemetryRequestMemory}', 'insufficientMixerCpu', 'insufficientMixerMemory', 'insufficientMixerTelemetryCpu', 'insufficientMixerTelemetryMemory', 'mixerNodeSelectors.[]', function() {
     if ((get(this, 'mixerNodeSelectors') || []).length === 0 ) {
       return
     }
@@ -514,7 +517,7 @@ export default Component.extend(CrudCatalog, ReservationCheck, CatalogUpgrade, {
     return [get(this, 'monitoringApp')]
   }),
 
-  clusterLevelMinCpu: computed('cluster.enableClusterMonitoring', function() {
+  clusterLevelMinCpu: computed('cluster.{enableClusterMonitoring,nodes}', 'enableClusterMonitoring', function() {
     if (get(this, 'enableClusterMonitoring')) {
       return ISTIO_CLUSTER_CPU
     } else {
@@ -525,7 +528,7 @@ export default Component.extend(CrudCatalog, ReservationCheck, CatalogUpgrade, {
     }
   }),
 
-  clusterLevelMinMemory: computed('cluster.enableClusterMonitoring', function() {
+  clusterLevelMinMemory: computed('cluster.enableClusterMonitoring', 'enableClusterMonitoring', 'scope.currentCluster.nodes', function() {
     if (get(this, 'enableClusterMonitoring')) {
       return ISTIO_CLUSTER_MEMORY
     } else {
@@ -653,7 +656,7 @@ export default Component.extend(CrudCatalog, ReservationCheck, CatalogUpgrade, {
 
     setProperties(this, {
       config,
-      allowSystemGroup:          false,
+      allowSystemGroup: false,
     });
   },
 
diff --git a/lib/istio/addon/components/istio-catalog/template.hbs b/lib/istio/addon/components/istio-catalog/template.hbs
index 9de676b18..2d4f49fed 100644
--- a/lib/istio/addon/components/istio-catalog/template.hbs
+++ b/lib/istio/addon/components/istio-catalog/template.hbs
@@ -510,7 +510,7 @@
      cancelDisabled=true
   }}
     {{#if (and enabled canEnable)}}
-      <button class="btn bg-error" {{action "disable"}}>
+      <button class="btn bg-error" type="button" {{action "disable"}}>
         {{t "clusterIstioPage.disable"}}
       </button>
     {{/if}}
diff --git a/lib/istio/addon/components/istio-gateway-select/component.js b/lib/istio/addon/components/istio-gateway-select/component.js
index 11722ecc7..46710dd15 100644
--- a/lib/istio/addon/components/istio-gateway-select/component.js
+++ b/lib/istio/addon/components/istio-gateway-select/component.js
@@ -9,7 +9,7 @@ export default Component.extend({
   value:        null,
   showLabel:    true,
 
-  gateways:     null,
+  gateways: null,
 
   init() {
     this._super(...arguments);
diff --git a/lib/istio/addon/components/istio-host-select/component.js b/lib/istio/addon/components/istio-host-select/component.js
index b8eff4077..719a070d4 100644
--- a/lib/istio/addon/components/istio-host-select/component.js
+++ b/lib/istio/addon/components/istio-host-select/component.js
@@ -10,7 +10,7 @@ export default Component.extend({
   value:        null,
   showLabel:    true,
 
-  hosts:        null,
+  hosts: null,
 
   init() {
     this._super(...arguments);
diff --git a/lib/istio/addon/components/istio-nav/component.js b/lib/istio/addon/components/istio-nav/component.js
index b04fd5c31..d06962d2c 100644
--- a/lib/istio/addon/components/istio-nav/component.js
+++ b/lib/istio/addon/components/istio-nav/component.js
@@ -43,7 +43,7 @@ export default Component.extend({
     return `/k8s/clusters/${ get(this, 'cluster.id') }/api/v1/namespaces/istio-system/services/http:tracing:80/proxy/jaeger/search`
   }),
 
-  grafanaUrl: computed('cluster.id', 'project.id', function() {
+  grafanaUrl: computed('cluster.id', 'grafana.istioUrl', 'pageScope', 'project.id', function() {
     if (get(this, 'pageScope') === 'cluster') {
       return get(this, 'grafana.istioUrl')
     } else if (get(this, 'pageScope') === 'project') {
@@ -53,9 +53,11 @@ export default Component.extend({
         return `/k8s/clusters/${ get(this, 'cluster.id') }/api/v1/namespaces/cattle-prometheus-${ (get(this, 'project.id') || '').split(':').get('lastObject') }/services/http:access-grafana:80/proxy/`
       }
     }
+
+    return '#';
   }),
 
-  prometheusUrl: computed('cluster.id', function() {
+  prometheusUrl: computed('cluster.id', 'grafana.istioUrl', 'pageScope', 'project.id', function() {
     if (get(this, 'pageScope') === 'cluster') {
       return `/k8s/clusters/${ get(this, 'cluster.id') }/api/v1/namespaces/cattle-prometheus/services/http:access-prometheus:80/proxy/`
     } else if (get(this, 'pageScope') === 'project') {
@@ -65,5 +67,7 @@ export default Component.extend({
         return `/k8s/clusters/${ get(this, 'cluster.id') }/api/v1/namespaces/cattle-prometheus-${ (get(this, 'project.id') || '').split(':').get('lastObject') }/services/http:access-prometheus:80/proxy/`
       }
     }
+
+    return '#';
   }),
 });
diff --git a/lib/istio/addon/components/istio-yaml/template.hbs b/lib/istio/addon/components/istio-yaml/template.hbs
index 127a1f11a..421b39220 100644
--- a/lib/istio/addon/components/istio-yaml/template.hbs
+++ b/lib/istio/addon/components/istio-yaml/template.hbs
@@ -1,8 +1,7 @@
 <section class="header has-tabs clearfix pb-0">
   <ul class="tab-nav">
     {{#each options as |option|}}
-      <button class="no-outline bg-transparent {{if (eq option selectedType) "tab-selected"}}"
-        {{action "select" option}}
+      <button class="no-outline bg-transparent {{if (eq option selectedType) "tab-selected"}}" type="button" {{action "select" option}}
       >
         <span class="{{if (not-eq option selectedType) "text-gray"}}">
           {{t (concat "ruleDetailPage.rules." option)}}
diff --git a/lib/istio/addon/components/modal-delete-istio/component.js b/lib/istio/addon/components/modal-delete-istio/component.js
index b918540e2..73488d154 100644
--- a/lib/istio/addon/components/modal-delete-istio/component.js
+++ b/lib/istio/addon/components/modal-delete-istio/component.js
@@ -14,7 +14,7 @@ export default Component.extend(ModalBase, {
   growl:          service(),
 
   layout,
-  classNames:     ['medium-modal'],
+  classNames: ['medium-modal'],
 
   onlyIstio: true,
 
diff --git a/lib/istio/addon/components/traffic-monitoring/component.js b/lib/istio/addon/components/traffic-monitoring/component.js
index 050fea001..77e7af655 100644
--- a/lib/istio/addon/components/traffic-monitoring/component.js
+++ b/lib/istio/addon/components/traffic-monitoring/component.js
@@ -9,7 +9,7 @@ export default Component.extend({
   scope:       service(),
   istio:       service(),
 
-  classNames:  ['istio-graph'],
+  classNames: ['istio-graph'],
   layout,
 
   namespaces:     null,
diff --git a/lib/istio/addon/components/traffic-monitoring/template.hbs b/lib/istio/addon/components/traffic-monitoring/template.hbs
index e15431cb5..23bb5da79 100644
--- a/lib/istio/addon/components/traffic-monitoring/template.hbs
+++ b/lib/istio/addon/components/traffic-monitoring/template.hbs
@@ -14,8 +14,7 @@
         }}
       </div>
       <button
-        class="btn btn-sm bg-default"
-        {{action "refreshGraph"}}
+        class="btn btn-sm bg-default" type="button" {{action "refreshGraph"}}
       >
         {{t "istio.refreshGraph"}}
       </button>
@@ -29,7 +28,7 @@
     </div>
   {{/if}}
   <div id="kiali-div" class="{{if loading 'loading'}}">
-    <iframe src={{url}} id="kiali-iframe" scrolling="no"></iframe>
+    <iframe src={{url}} id="kiali-iframe" title="kiali-iframe" scrolling="no"></iframe>
   </div>
   {{#unless loading}}
     <div class="powered-by-kiali">
diff --git a/lib/istio/addon/components/virtual-service-http-route-row/template.hbs b/lib/istio/addon/components/virtual-service-http-route-row/template.hbs
index 77c73b14e..56292e1c0 100644
--- a/lib/istio/addon/components/virtual-service-http-route-row/template.hbs
+++ b/lib/istio/addon/components/virtual-service-http-route-row/template.hbs
@@ -3,8 +3,7 @@
     <div class="row">
       <div class="pull-right">
         <button
-          class="btn bg-transparent text-small vertical-middle"
-          {{action "removeRoute" route}}
+          class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeRoute" route}}
         >
           {{t "cruVirtualService.http.routes.removeRouteLabel"}}
         </button>
@@ -13,8 +12,7 @@
       {{#unless isFirst}}
         <div class="pull-right">
           <button
-            class="btn bg-transparent text-small vertical-middle"
-            {{action "moveUpRoute" route}}
+            class="btn bg-transparent text-small vertical-middle" type="button" {{action "moveUpRoute" route}}
           >
             {{t "cruVirtualService.http.routes.moveUp"}}
           </button>
@@ -24,8 +22,7 @@
       {{#unless isLast}}
         <div class="pull-right">
           <button
-            class="btn bg-transparent text-small vertical-middle"
-            {{action "moveDownRoute" route}}
+            class="btn bg-transparent text-small vertical-middle" type="button" {{action "moveDownRoute" route}}
           >
             {{t "cruVirtualService.http.routes.moveDown"}}
           </button>
@@ -44,8 +41,7 @@
     {{#if (and editing showMatch)}}
       <div class="inline-block">
         <button
-          class="pt-0 pb-0 btn bg-transparent text-small vertical-middle"
-          {{action "addMatch"}}
+          class="pt-0 pb-0 btn bg-transparent text-small vertical-middle" type="button" {{action "addMatch"}}
         >
           {{t "cruVirtualService.http.routes.matches.addLabel"}}
         </button>
diff --git a/lib/istio/addon/initializers/app.js b/lib/istio/addon/initializers/app.js
index 26ed24052..992a54d40 100644
--- a/lib/istio/addon/initializers/app.js
+++ b/lib/istio/addon/initializers/app.js
@@ -7,6 +7,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'app',
+  name: 'app',
   initialize
 };
diff --git a/lib/istio/addon/project-istio/destination-rules/index/controller.js b/lib/istio/addon/project-istio/destination-rules/index/controller.js
index 31ce86dc0..f81fbf968 100644
--- a/lib/istio/addon/project-istio/destination-rules/index/controller.js
+++ b/lib/istio/addon/project-istio/destination-rules/index/controller.js
@@ -3,9 +3,9 @@ import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
-  sortBy:            'name',
+  sortBy: 'name',
 
   headers: [
     {
diff --git a/lib/istio/addon/project-istio/gateways/index/controller.js b/lib/istio/addon/project-istio/gateways/index/controller.js
index 102f147bd..b2b4c7b9d 100644
--- a/lib/istio/addon/project-istio/gateways/index/controller.js
+++ b/lib/istio/addon/project-istio/gateways/index/controller.js
@@ -3,9 +3,9 @@ import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
-  sortBy:            'name',
+  sortBy: 'name',
 
   headers: [
     {
diff --git a/lib/istio/addon/project-istio/gateways/index/route.js b/lib/istio/addon/project-istio/gateways/index/route.js
index 13778efa2..bd26c92c3 100644
--- a/lib/istio/addon/project-istio/gateways/index/route.js
+++ b/lib/istio/addon/project-istio/gateways/index/route.js
@@ -5,7 +5,7 @@ import Route from '@ember/routing/route';
 import C from 'ui/utils/constants';
 
 export default Route.extend({
-  session:      service(),
+  session: service(),
 
   model() {
     const store = this.store;
diff --git a/lib/istio/addon/project-istio/metrics/route.js b/lib/istio/addon/project-istio/metrics/route.js
index b17f7b565..05ca0a714 100644
--- a/lib/istio/addon/project-istio/metrics/route.js
+++ b/lib/istio/addon/project-istio/metrics/route.js
@@ -5,7 +5,7 @@ import { on } from '@ember/object/evented';
 import C from 'ui/utils/constants';
 
 export default Route.extend({
-  session:     service(),
+  session: service(),
 
   setDefaultRoute: on('activate', function() {
     setProperties(this, {
diff --git a/lib/istio/addon/project-istio/template.hbs b/lib/istio/addon/project-istio/template.hbs
index 2d6fb190d..8eae2ed41 100644
--- a/lib/istio/addon/project-istio/template.hbs
+++ b/lib/istio/addon/project-istio/template.hbs
@@ -3,9 +3,8 @@
     iconDisabled=model.iconDisabled
   }}
     <button
-      {{action "importYaml"}}
       class="btn btn-sm bg-default mr-10"
-      disabled={{or (rbac-prevents resource="virtualservice" scope="project" permission="create") (rbac-prevents resource="destinationrule" scope="project" permission="create")}}
+      disabled={{or (rbac-prevents resource="virtualservice" scope="project" permission="create") (rbac-prevents resource="destinationrule" scope="project" permission="create")}} type="button" {{action "importYaml"}}
     >
       {{t "nav.containers.importCompose"}}
     </button>
diff --git a/lib/istio/addon/project-istio/virtual-services/index/controller.js b/lib/istio/addon/project-istio/virtual-services/index/controller.js
index d63656202..8ab6e9804 100644
--- a/lib/istio/addon/project-istio/virtual-services/index/controller.js
+++ b/lib/istio/addon/project-istio/virtual-services/index/controller.js
@@ -3,9 +3,9 @@ import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-  scope:             service(),
+  scope: service(),
 
-  sortBy:            'name',
+  sortBy: 'name',
 
   headers: [
     {
diff --git a/lib/logging/addon/components/logging/form-log-format/component.js b/lib/logging/addon/components/logging/form-log-format/component.js
index 1ac3984d0..e0cdf2426 100644
--- a/lib/logging/addon/components/logging/form-log-format/component.js
+++ b/lib/logging/addon/components/logging/form-log-format/component.js
@@ -5,9 +5,9 @@ import { reads } from '@ember/object/computed';
 import $ from 'jquery';
 
 export default Component.extend({
-  scope:                   service(),
+  scope: service(),
 
-  pageScope:               reads('scope.currentPageScope'),
+  pageScope: reads('scope.currentPageScope'),
 
   outputTagsChanged: observer('model.outputTags', function() {
     this.setCodeBlockHeight();
diff --git a/lib/logging/addon/components/logging/form-test/template.hbs b/lib/logging/addon/components/logging/form-test/template.hbs
index 7b34058c6..7d91e078c 100644
--- a/lib/logging/addon/components/logging/form-test/template.hbs
+++ b/lib/logging/addon/components/logging/form-test/template.hbs
@@ -2,8 +2,7 @@
   <span>
     {{#if testing}}
       <button
-        class="btn bg-info btn-disabled"
-        {{action test}}
+        class="btn bg-info btn-disabled" type="button" {{action test}}
       >
         <i class="icon icon-spinner icon-spin"></i>
         <span class="text-white">
@@ -17,8 +16,7 @@
     {{else}}
       {{#if tested}}
         <button
-          {{action test}}
-          class="btn  btn-disabled {{if testOk "bg-success" "bg-error"}}"
+          class="btn  btn-disabled {{if testOk "bg-success" "bg-error"}}" type="button" {{action test}}
         >
           <span class="text-white">
             {{#if testOk}}
@@ -34,8 +32,7 @@
         </button>
       {{else}}
         <button
-          {{action test}}
-          class="btn bg-info"
+          class="btn bg-info" type="button" {{action test}}
         >
           <span class="text-white">
             {{#if isCustom}}
diff --git a/lib/logging/addon/components/logging/input-logging-config/component.js b/lib/logging/addon/components/logging/input-logging-config/component.js
index a9ef876f8..5c0e1274c 100644
--- a/lib/logging/addon/components/logging/input-logging-config/component.js
+++ b/lib/logging/addon/components/logging/input-logging-config/component.js
@@ -38,7 +38,7 @@ export default Component.extend(ThrottledResize, {
   showDownload:     true,
   deepStr:          null,
 
-  config:        alias('model.config'),
+  config: alias('model.config'),
 
   init() {
     this._super(...arguments);
@@ -173,7 +173,7 @@ ${ fieldsStr }
     return Object.keys(keyValueMap).map((key) => `    "${ key }": "${ keyValueMap[key] }"`).join(',\n');
   }),
 
-  clientKeyPath: computed('config.clientKey', 'customType', function() {
+  clientKeyPath: computed('config.clientKey', 'customType', 'pageScope', 'scope.currentCluster.id', 'scope.currentProject.id', function() {
     const pageScope = get(this, 'pageScope')
     const customType = get(this, 'customType')
     let name
@@ -203,9 +203,11 @@ ${ fieldsStr }
 
       return `${ key } /fluentd/etc/config/ssl/${ pageScope }_${ name }_client-key.pem`
     }
+
+    return null;
   }),
 
-  clientCertPath: computed('config.clientCert', 'customType', function() {
+  clientCertPath: computed('config.clientCert', 'customType', 'pageScope', 'scope.currentCluster.id', 'scope.currentProject.id', function() {
     const pageScope = get(this, 'pageScope')
     const customType = get(this, 'customType')
     let name
@@ -232,9 +234,11 @@ ${ fieldsStr }
 
       return `${ key } /fluentd/etc/config/ssl/${ pageScope }_${ name }_client-cert.pem`
     }
+
+    return null;
   }),
 
-  certificatePath: computed('config.certificate', 'customType', function() {
+  certificatePath: computed('config.certificate', 'customType', 'pageScope', 'scope.currentCluster.id', 'scope.currentProject.id', function() {
     const pageScope = get(this, 'pageScope')
     const customType = get(this, 'customType')
     let name
@@ -261,6 +265,8 @@ ${ fieldsStr }
 
       return `${ key } /fluentd/etc/config/ssl/${ pageScope }_${ name }_ca.pem`
     }
+
+    return null;
   }),
 
   onResize() {
diff --git a/lib/logging/addon/components/logging/new-edit/component.js b/lib/logging/addon/components/logging/new-edit/component.js
index 21571001d..1fe7580ab 100644
--- a/lib/logging/addon/components/logging/new-edit/component.js
+++ b/lib/logging/addon/components/logging/new-edit/component.js
@@ -430,7 +430,7 @@ export default Component.extend(NewOrEdit, {
       }
 
       setProperties(kafkaConfig, {
-        zookeeperEndpoint:  null,
+        zookeeperEndpoint: null,
         brokerEndpoints,
       });
     } else if (kt === 'zookeeper') {
diff --git a/lib/logging/addon/components/logging/new-edit/template.hbs b/lib/logging/addon/components/logging/new-edit/template.hbs
index 461c7294d..def1ad2cc 100644
--- a/lib/logging/addon/components/logging/new-edit/template.hbs
+++ b/lib/logging/addon/components/logging/new-edit/template.hbs
@@ -60,9 +60,7 @@
       {{#if (eq targetType "customTarget")}}
         <li>
           <button
-            class={{concat (if testing "btn-disabled-transparent") " btn bg-transparent"}}
-            {{action "cancel"}}
-            disabled={{testing}}
+            class={{concat (if testing "btn-disabled-transparent") " btn bg-transparent"}} disabled={{testing}} type="button" {{action "cancel"}}
           >
             {{t "loggingPage.advanced.cancel"}}
           </button>
@@ -70,8 +68,7 @@
       {{else}}
         <li>
           <button
-            class="btn bg-transparent"
-            {{action "showPaste"}}
+            class="btn bg-transparent" type="button" {{action "showPaste"}}
           >
             {{t "loggingPage.advanced.file"}} <span class="icon icon-copy"></span>
           </button>
diff --git a/lib/logging/addon/components/logging/target-flentd/template.hbs b/lib/logging/addon/components/logging/target-flentd/template.hbs
index d1d28032a..bc7211d2f 100644
--- a/lib/logging/addon/components/logging/target-flentd/template.hbs
+++ b/lib/logging/addon/components/logging/target-flentd/template.hbs
@@ -8,7 +8,7 @@
       <div class="row box mb-20">
         {{#if canRemove}}
           <div class="pull-right">
-            <button class="btn bg-transparent text-small vertical-middle" {{action "remove" item idx}}>
+            <button class="btn bg-transparent text-small vertical-middle" type="button" {{action "remove" item idx}}>
               {{t "loggingPage.fluentd.removeFluentServers"}}
             </button>
           </div>
@@ -113,7 +113,7 @@
       </div>
     {{/each}}
     <div>
-      <button class="btn bg-link icon-btn p-0" {{action "add"}}>
+      <button class="btn bg-link icon-btn p-0" type="button" {{action "add"}}>
         <span class="darken">
           <i class="icon icon-plus text-small"/>
         </span>
diff --git a/lib/logging/addon/components/logging/target-kafka/component.js b/lib/logging/addon/components/logging/target-kafka/component.js
index 7485decba..d21401ff7 100644
--- a/lib/logging/addon/components/logging/target-kafka/component.js
+++ b/lib/logging/addon/components/logging/target-kafka/component.js
@@ -7,7 +7,7 @@ import { inject as service } from '@ember/service';
 import $ from 'jquery';
 
 export default Component.extend({
-  scope:            service(),
+  scope: service(),
 
   brokerType:              'zookeeper',
   brokerEndpoints:         null,
@@ -102,7 +102,7 @@ export default Component.extend({
     set(this, 'config.brokerEndpoints', nue);
   }),
 
-  enableSSLConfig: computed('brokerType', 'config.brokerEndpoints.[].endpoint', function() {
+  enableSSLConfig: computed('brokerType', 'config.brokerEndpoints.@each.endpoint', function() {
     const { brokerType, config = {} } = this
 
     if (brokerType === 'broker') {
diff --git a/lib/logging/addon/components/logging/target-kafka/template.hbs b/lib/logging/addon/components/logging/target-kafka/template.hbs
index 124c17c99..1b2d0b2fb 100644
--- a/lib/logging/addon/components/logging/target-kafka/template.hbs
+++ b/lib/logging/addon/components/logging/target-kafka/template.hbs
@@ -69,7 +69,7 @@
             }}
           </div>
           <div class="col span-1" style="padding-top: 29px">
-            <button class="btn bg-primary icon-btn {{if canRemove "" "disabled"}}" {{action "remove" item}}>
+            <button class="btn bg-primary icon-btn {{if canRemove "" "disabled"}}" type="button" {{action "remove" item}}>
               <span class="darken">
                 <i class="icon icon-minus"></i>
               </span>
@@ -81,7 +81,7 @@
         {{t "loggingPage.kafka.brokerHelpText"}}
       </p>
       <div class="mt-20">
-        <button class="btn bg-link icon-btn p-0" {{action "add"}}>
+        <button class="btn bg-link icon-btn p-0" type="button" {{action "add"}}>
           <span class="darken">
             <i class="icon icon-plus text-small"/>
           </span>
diff --git a/lib/logging/addon/components/logging/target-splunk/component.js b/lib/logging/addon/components/logging/target-splunk/component.js
index 60fb69aa2..6ed9f02e5 100644
--- a/lib/logging/addon/components/logging/target-splunk/component.js
+++ b/lib/logging/addon/components/logging/target-splunk/component.js
@@ -6,7 +6,7 @@ import $ from 'jquery';
 export default Component.extend({
   showAdvanced: false,
 
-  config:        alias('model.config'),
+  config: alias('model.config'),
   didInsertElement() {
     $('#splunk-endpoint').focus()
   },
diff --git a/lib/logging/addon/components/logging/target-syslog/component.js b/lib/logging/addon/components/logging/target-syslog/component.js
index f56a1c465..071b4fa63 100644
--- a/lib/logging/addon/components/logging/target-syslog/component.js
+++ b/lib/logging/addon/components/logging/target-syslog/component.js
@@ -48,7 +48,7 @@ export default Component.extend({
   showAdvanced: false,
   preSSlConfig: null,
 
-  config:        alias('model.config'),
+  config: alias('model.config'),
   init(...args) {
     this._super(...args);
     this.set('severities', SEVERITIES);
@@ -69,7 +69,7 @@ export default Component.extend({
       set(this, 'config.protocol', protocol);
     },
   },
-  enableSSLConfig: computed('config.protocol', function() {
+  enableSSLConfig: computed('config.protocol', 'preSSlConfig', function() {
     const protocol = get(this, 'config.protocol') || ''
     const preSSlConfig = get(this, 'preSSlConfig') || {}
     const config = get(this, 'config')
diff --git a/lib/logging/addon/components/logging/target-syslog/template.hbs b/lib/logging/addon/components/logging/target-syslog/template.hbs
index 37f6b5c21..fcb01b582 100644
--- a/lib/logging/addon/components/logging/target-syslog/template.hbs
+++ b/lib/logging/addon/components/logging/target-syslog/template.hbs
@@ -1,8 +1,13 @@
-<h2 class="mt-30">{{t "loggingPage.syslog.header"}}</h2>
-<hr/>
+<h2 class="mt-30">
+  {{t "loggingPage.syslog.header"}}
+</h2>
+<hr />
 <section class="box">
   <div class="row">
-    <label class="acc-label">{{t "loggingPage.endpoint"}}{{field-required}}</label>
+    <label class="acc-label">
+      {{t "loggingPage.endpoint"}}
+      {{field-required}}
+    </label>
     <div class="input-group">
       {{input
         type="text"
@@ -12,38 +17,51 @@
         id="syslog-endpoint"
       }}
       <div class="input-group-btn bg-primary">
-        {{#basic-dropdown
-           horizontalPosition="right"
-           as |dd|}}
-          {{#dd.trigger class="btn bg-default text-uppercase"}}
-            <span class="pr-5">{{config.protocol}}</span><i class="icon icon-chevron-down"></i>
-          {{/dd.trigger}}
-
-          {{#dd.content}}
-            <li><a {{action "changeProtocol" "tcp"}}>TCP</a></li>
-            <li><a {{action "changeProtocol" "udp"}}>UDP</a></li>
-          {{/dd.content}}
-
-        {{/basic-dropdown}}
+        <BasicDropdown @horizontalPosition="left" as |dd|>
+          <dd.Trigger class="btn bg-default text-uppercase">
+            <span class="pr-5">
+              {{config.protocol}}
+            </span>
+            <i class="icon icon-chevron-down"></i>
+          </dd.Trigger>
+          <dd.Content>
+            <li {{action dd.actions.close}}>
+              <a {{action "changeProtocol" "tcp"}}>
+                TCP
+              </a>
+            </li>
+            <li {{action dd.actions.close}}>
+              <a {{action "changeProtocol" "udp"}}>
+                UDP
+              </a>
+            </li>
+          </dd.Content>
+        </BasicDropdown>
       </div>
     </div>
-    <p class="text-info text-small mb-0">{{t "loggingPage.syslog.endpointHelpText"}}</p>
+    <p class="text-info text-small mb-0">
+      {{t "loggingPage.syslog.endpointHelpText"}}
+    </p>
   </div>
-
   <div class="row">
     <div class="col span-6 mt-0 pt-0">
-      <label class="acc-label" for="">{{t "loggingPage.syslog.program"}}</label>
+      <label class="acc-label" for="">
+        {{t "loggingPage.syslog.program"}}
+      </label>
       {{input
         type="text"
         value=config.program
         classNames="form-control"
         placeholder=(t "loggingPage.syslog.programPlaceholder")
       }}
-      <p class="text-info text-small">{{t "loggingPage.syslog.programHelpText"}}</p>
+      <p class="text-info text-small">
+        {{t "loggingPage.syslog.programHelpText"}}
+      </p>
     </div>
-
     <div class="col span-6 mt-0 pt-0">
-      <label class="acc-label" for="">{{t "loggingPage.splunk.token"}}</label>
+      <label class="acc-label" for="">
+        {{t "loggingPage.splunk.token"}}
+      </label>
       {{input
         type="text"
         value=config.token
@@ -55,25 +73,24 @@
       </p>
     </div>
   </div>
-
   <div>
-    <span class="mr-10">Log Severity:</span>
+    <span class="mr-10">
+      Log Severity:
+    </span>
     {{#each severities as |item|}}
       <label class="mr-10 text-capitalize">
-        {{radio-button selection=config.severity value=item.value }}
+        {{radio-button selection=config.severity value=item.value}}
         {{t item.label}}
       </label>
     {{/each}}
     {{t "loggingPage.syslog.severityHelpText" htmlSafe=true}}
   </div>
 </section>
-
 {{logging/form-log-ssl
   config=config
   targetType=targetType
   disabled=(or (not enableSSLConfig) (not config.enableTls))
 }}
-
 {{logging/form-log-format
   logPreview=logPreview
   model=model
@@ -82,4 +99,4 @@
 {{!--
 {{#advanced-section advanced=showAdvanced}}
 {{logging/form-log-docker model=model parentModel=parentModel}}
-{{/advanced-section}} --}}
+{{/advanced-section}} --}}
\ No newline at end of file
diff --git a/lib/logging/addon/components/logging/targets-nav/component.js b/lib/logging/addon/components/logging/targets-nav/component.js
index 7cb620441..443b1f613 100644
--- a/lib/logging/addon/components/logging/targets-nav/component.js
+++ b/lib/logging/addon/components/logging/targets-nav/component.js
@@ -15,7 +15,7 @@ export default Component.extend({
     return targetType === 'fluentForwarder' ? 'fluentd output forward' : targetType
   }),
 
-  hasCurrentTarget: computed('currentTarget', function() {
+  hasCurrentTarget: computed('currentTarget', 'originalModel', function() {
     const ol = this.get('originalModel');
 
     if (!ol) {
diff --git a/lib/logging/addon/components/logging/targets-nav/template.hbs b/lib/logging/addon/components/logging/targets-nav/template.hbs
index b38138ccb..b451b6ab9 100644
--- a/lib/logging/addon/components/logging/targets-nav/template.hbs
+++ b/lib/logging/addon/components/logging/targets-nav/template.hbs
@@ -19,10 +19,10 @@
 <section>
   <div class="text-center text-muted">
     {{#if (eq targetTypeName 'none')}}
-      {{#if (not hasCurrentTarget)}}
-        {{t 'loggingPage.targetNav.tips.caseA' pageScope=pageScope}}
-      {{else}}
+      {{#if hasCurrentTarget}}
         {{t 'loggingPage.targetNav.tips.caseB' pageScope=pageScope currentTarget=currentTarget htmlSafe=true}}
+      {{else}}
+        {{t 'loggingPage.targetNav.tips.caseA' pageScope=pageScope}}
       {{/if}}
     {{else if hasCurrentTarget}}
         {{t 'loggingPage.targetNav.tips.caseC' currentTarget=currentTarget htmlSafe=true}}
diff --git a/lib/logging/addon/initializers/app.js b/lib/logging/addon/initializers/app.js
index 26ed24052..992a54d40 100644
--- a/lib/logging/addon/initializers/app.js
+++ b/lib/logging/addon/initializers/app.js
@@ -7,6 +7,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'app',
+  name: 'app',
   initialize
 };
diff --git a/lib/logging/addon/mixins/target-elasticsearch.js b/lib/logging/addon/mixins/target-elasticsearch.js
index 7887b6e76..e2eb7e997 100644
--- a/lib/logging/addon/mixins/target-elasticsearch.js
+++ b/lib/logging/addon/mixins/target-elasticsearch.js
@@ -20,7 +20,7 @@ export default Mixin.create({
     }
   },
 
-  defaultIndexPrefix: computed('project.name', 'cluster.name', function() {
+  defaultIndexPrefix: computed('cluster.{id,name}', 'pageScope', 'project.name', function() {
     const pageScope = get(this, 'pageScope')
     const prefix = get(this, 'cluster.name') || get(this, 'cluster.id');
 
diff --git a/lib/login/addon/components/login-azure/template.hbs b/lib/login/addon/components/login-azure/template.hbs
index 2d0442ae9..8f03c1b5f 100644
--- a/lib/login/addon/components/login-azure/template.hbs
+++ b/lib/login/addon/components/login-azure/template.hbs
@@ -1,5 +1,5 @@
 <form {{action "authenticate" on="submit"}} class="row pt-10 pb-10">
-  <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
+  <button disabled={{waiting}} class="btn bg-primary" type="button" {{action "authenticate"}}>
     <i class="icon icon-azuread"></i> {{t 'loginAzure.buttonText'}}
   </button>
 </form>
diff --git a/lib/login/addon/components/login-github/template.hbs b/lib/login/addon/components/login-github/template.hbs
index 709e81ef2..bdacb8252 100644
--- a/lib/login/addon/components/login-github/template.hbs
+++ b/lib/login/addon/components/login-github/template.hbs
@@ -1,5 +1,5 @@
 <form {{action "authenticate" on="submit"}} class="row pt-10 pb-10">
-  <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
+  <button disabled={{waiting}} class="btn bg-primary" type="button" {{action "authenticate"}}>
     <i class="icon icon-github"></i> {{t 'loginGithub.buttonText'}}
   </button>
 </form>
diff --git a/lib/login/addon/components/login-google/template.hbs b/lib/login/addon/components/login-google/template.hbs
index 1309264ea..a2d0a9096 100644
--- a/lib/login/addon/components/login-google/template.hbs
+++ b/lib/login/addon/components/login-google/template.hbs
@@ -1,5 +1,5 @@
 <form {{action "authenticate" on="submit"}} class="row pt-10 pb-10">
-  <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
+  <button disabled={{waiting}} class="btn bg-primary" type="button" {{action "authenticate"}}>
     <i class="icon icon-google"></i> {{t 'loginGoogle.buttonText'}}
   </button>
 </form>
diff --git a/lib/login/addon/components/login-saml/template.hbs b/lib/login/addon/components/login-saml/template.hbs
index e55ab8638..5daebe88d 100644
--- a/lib/login/addon/components/login-saml/template.hbs
+++ b/lib/login/addon/components/login-saml/template.hbs
@@ -1,5 +1,5 @@
 <form {{action "authenticate" on="submit"}} class="row pt-10 pb-10">
-  <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
+  <button disabled={{waiting}} class="btn bg-primary" type="button" {{action "authenticate"}}>
     <i class="icon icon-ping"></i> {{t (concat "loginSaml." provider ".buttonText")}}
   </button>
   <TopErrors @errors={{errors}} />
diff --git a/lib/login/addon/components/login-shibboleth/template.hbs b/lib/login/addon/components/login-shibboleth/template.hbs
index 26c17439a..7a7a8166d 100644
--- a/lib/login/addon/components/login-shibboleth/template.hbs
+++ b/lib/login/addon/components/login-shibboleth/template.hbs
@@ -1,6 +1,6 @@
 <form {{action "authenticate" on="submit"}} class="text-left">
   <p class="text-center">
-    <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
+    <button disabled={{waiting}} class="btn bg-primary" type="button" {{action "authenticate"}}>
       {{t 'loginShibboleth.buttonText'}}
     </button>
     <a href="{{outRoute}}/v1-auth/saml/logout" target="_blank" class="inline-block mt-15">IDP Logout</a>
diff --git a/lib/login/addon/components/login-user-pass/template.hbs b/lib/login/addon/components/login-user-pass/template.hbs
index 4f38ed35f..c831c8424 100644
--- a/lib/login/addon/components/login-user-pass/template.hbs
+++ b/lib/login/addon/components/login-user-pass/template.hbs
@@ -19,7 +19,7 @@
   </div>
 
   <p class="text-center">
-    <button disabled={{waiting}} class="btn bg-primary" {{action "authenticate"}}>
+    <button disabled={{waiting}} class="btn bg-primary" type="submit" {{action "authenticate"}}>
       {{#if waiting}}
         <i class="icon icon-spinner icon-spin"></i> {{t 'loginUserPass.loggingInLabel'}}
       {{else if readableProvider}}
diff --git a/lib/login/addon/components/reload-btn/template.hbs b/lib/login/addon/components/reload-btn/template.hbs
index 9131c8161..0e5131ece 100644
--- a/lib/login/addon/components/reload-btn/template.hbs
+++ b/lib/login/addon/components/reload-btn/template.hbs
@@ -1,3 +1,3 @@
-<button class="btn bg-primary reload-btn" {{action "reload"}}>
+<button class="btn bg-primary reload-btn" type="button" {{action "reload"}}>
   <i class="icon icon-refresh text-small"/> Reload
 </button>
diff --git a/lib/login/addon/initializers/app.js b/lib/login/addon/initializers/app.js
index 26ed24052..992a54d40 100644
--- a/lib/login/addon/initializers/app.js
+++ b/lib/login/addon/initializers/app.js
@@ -7,6 +7,6 @@ export function initialize(application) {
 }
 
 export default {
-  name:       'app',
+  name: 'app',
   initialize
 };
diff --git a/lib/login/addon/login/controller.js b/lib/login/addon/login/controller.js
index af9ffc99e..b406903cb 100644
--- a/lib/login/addon/login/controller.js
+++ b/lib/login/addon/login/controller.js
@@ -185,15 +185,15 @@ export default Controller.extend({
     return !!get(this, 'access.providers').findBy('id', 'okta');
   }),
 
-  isActiveDirectory: computed('access.provider', function() {
+  isActiveDirectory: computed('access.{provider,providers}', function() {
     return !!get(this, 'access.providers').findBy('id', 'activedirectory');
   }),
 
-  isOpenLdap: computed('access.provider',  function() {
+  isOpenLdap: computed('access.{provider,providers}',  function() {
     return !!get(this, 'access.providers').findBy('id', 'openldap');
   }),
 
-  isFreeIpa: computed('access.provider',  function() {
+  isFreeIpa: computed('access.{provider,providers}',  function() {
     return !!get(this, 'access.providers').findBy('id', 'freeipa');
   }),
 
@@ -213,11 +213,11 @@ export default Controller.extend({
     return providers[0] && providers[0].id;
   }),
 
-  isAzureAd: computed('access.provider', function() {
+  isAzureAd: computed('access.{provider,providers}', function() {
     return !!get(this, 'access.providers').findBy('id', 'azuread');
   }),
 
-  isShibboleth: computed('access.provider', function() {
+  isShibboleth: computed('access.{provider,providers}', function() {
     return !!get(this, 'access.providers').findBy('id', 'shibboleth');
   }),
 
@@ -225,7 +225,7 @@ export default Controller.extend({
     schedule('afterRender', this, 'focusSomething');
   }),
 
-  infoMsg: computed('errorMsg', 'errorCode', 'intl.locale', function() {
+  infoMsg: computed('errorCode', 'errorMsg', 'intl.locale', 'isForbidden', function() {
     let { errorMsg: errorMessageKey } = this;
 
 
diff --git a/lib/monitoring/addon/components/cluster-basic-info/component.js b/lib/monitoring/addon/components/cluster-basic-info/component.js
index c6a0422a6..9ce230a1c 100644
--- a/lib/monitoring/addon/components/cluster-basic-info/component.js
+++ b/lib/monitoring/addon/components/cluster-basic-info/component.js
@@ -4,5 +4,5 @@ import layout from './template';
 export default Component.extend({
   layout,
 
-  cluster:    null,
+  cluster: null,
 });
\ No newline at end of file
diff --git a/lib/monitoring/addon/components/cluster-dashboard/template.hbs b/lib/monitoring/addon/components/cluster-dashboard/template.hbs
index 5b7946c00..858a3ad37 100644
--- a/lib/monitoring/addon/components/cluster-dashboard/template.hbs
+++ b/lib/monitoring/addon/components/cluster-dashboard/template.hbs
@@ -21,7 +21,7 @@
     {{else}}
       <div class="row mt-0 mb-0">
         <div class="pull-right text-small">
-          <button class="btn bg-transparent p-0" {{action "enableMonitoring"}}>
+          <button class="btn bg-transparent p-0" type="button" {{action "enableMonitoring"}}>
             {{t "clusterDashboard.enableMonitoring"}}
           </button>
         </div>
@@ -30,7 +30,7 @@
   {{else if (and monitoringEnabled (eq toUpgrade.firstObject.name "cluster-monitoring"))}}
     <div class="row mt-0 mb-0">
       <div class="pull-right text-small">
-        <button class="btn bg-warning pt-0 pb-0 pl-5 pr-5" {{action "enableMonitoring"}}>
+        <button class="btn bg-warning pt-0 pb-0 pl-5 pr-5" type="button" {{action "enableMonitoring"}}>
           {{t "clusterDashboard.upgradeAvailable" version=latestVersion}}
         </button>
       </div>
diff --git a/lib/monitoring/addon/components/enable-monitoring/component.js b/lib/monitoring/addon/components/enable-monitoring/component.js
index 820db68b0..dc9b055dd 100644
--- a/lib/monitoring/addon/components/enable-monitoring/component.js
+++ b/lib/monitoring/addon/components/enable-monitoring/component.js
@@ -206,14 +206,14 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
     return get(this, 'level') === 'cluster' ? get(this, 'cluster.canSaveMonitor') : get(this, 'project.canSaveMonitor');
   }),
 
-  clusterLevelMinCpu: computed('cluster.enableClusterMonitoring', 'project.enableProjectMonitoring', 'level', function() {
+  clusterLevelMinCpu: computed('cluster.enableClusterMonitoring', 'level', 'project.enableProjectMonitoring', 'scope.currentCluster.nodes', function() {
     const allNodes = get(this, 'scope.currentCluster.nodes') || [];
     const schedulableNodes = allNodes.filterBy('isUnschedulable', false);
 
     return  CLUSTER_CPU + get(schedulableNodes, 'length') * NODE_EXPORTER_CPU;
   }),
 
-  clusterLevelMinMemory: computed('cluster.enableClusterMonitoring', 'project.enableProjectMonitoring', 'level', function() {
+  clusterLevelMinMemory: computed('cluster.enableClusterMonitoring', 'level', 'project.enableProjectMonitoring', 'scope.currentCluster.nodes', function() {
     const allNodes = get(this, 'scope.currentCluster.nodes') || [];
     const schedulableNodes = allNodes.filterBy('isUnschedulable', false);
 
@@ -224,7 +224,7 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
     return !get(this, 'canSaveMonitor') || get(this, 'insufficient') || get(this, 'insufficientPrometheusCpu') || get(this, 'insufficientPrometheusMemory');
   }),
 
-  insufficientPrometheusCpu: computed('schedulableNodes.@each.{allocatable,requested}', 'requestsCpu', 'scope.currentCluster.nodes.@each.{allocatable,requested}', function() {
+  insufficientPrometheusCpu: computed('enabled', 'prometheusRequestCpu', 'requestsCpu', 'schedulableNodes.@each.{allocatable,requested}', 'scope.currentCluster.nodes.@each.{allocatable,requested}', function() {
     const allNodes = get(this, 'scope.currentCluster.nodes') || [];
 
     if ( get(allNodes, 'length') === 0 ) {
@@ -252,7 +252,7 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
     return parseInt(get(this, 'requestsMemory'), 10) + NODE_EXPORTER_MEMORY + 200;
   }),
 
-  insufficientPrometheusMemory: computed('schedulableNodes.@each.{allocatable,requested}', 'requestsMemory', 'scope.currentCluster.nodes.@each.{allocatable,requested}', function() {
+  insufficientPrometheusMemory: computed('enabled', 'prometheusRequestMemory', 'requestsMemory', 'schedulableNodes.@each.{allocatable,requested}', 'scope.currentCluster.nodes.@each.{allocatable,requested}', function() {
     const allNodes = get(this, 'scope.currentCluster.nodes') || [];
 
     if ( get(allNodes, 'length') === 0 ) {
diff --git a/lib/monitoring/addon/components/enable-monitoring/template.hbs b/lib/monitoring/addon/components/enable-monitoring/template.hbs
index 0370ad76c..f2bf9a0c5 100644
--- a/lib/monitoring/addon/components/enable-monitoring/template.hbs
+++ b/lib/monitoring/addon/components/enable-monitoring/template.hbs
@@ -366,7 +366,7 @@
     }}
       {{#if (and enabled canDisableMonitor)}}
         {{#if confirmDisable}}
-          <button class="btn bg-error" {{action "disable"}}>
+          <button class="btn bg-error" type="button" {{action "disable"}}>
             <i class="icon icon-alert"></i> {{t "monitoringPage.confirmDisable"}}
           </button>
         {{else}}
@@ -379,12 +379,12 @@
               inlineBlock=true
               placement="top"
             }}
-              <button class="btn bg-error" {{action "promptDisable"}}>
+              <button class="btn bg-error" type="button" {{action "promptDisable"}}>
                 {{t "monitoringPage.disable"}}
               </button>
             {{/tooltip-element}}
           {{else}}
-            <button class="btn bg-error" {{action "promptDisable"}}>
+            <button class="btn bg-error" type="button" {{action "promptDisable"}}>
               {{t "monitoringPage.disable"}}
             </button>
           {{/if}}
diff --git a/lib/monitoring/addon/components/nodes-live/component.js b/lib/monitoring/addon/components/nodes-live/component.js
index deb32afe3..1d17b8dbd 100644
--- a/lib/monitoring/addon/components/nodes-live/component.js
+++ b/lib/monitoring/addon/components/nodes-live/component.js
@@ -22,7 +22,7 @@ export default NodesReservation.extend(Metrics, {
   filters:           { resourceType: 'cluster' },
   isGotMetrics:      false,
 
-  cluster:           reads('scope.currentCluster'),
+  cluster: reads('scope.currentCluster'),
 
   isMonitoringReady: alias('scope.currentCluster.isMonitoringReady'),
 
@@ -99,7 +99,7 @@ export default NodesReservation.extend(Metrics, {
     this.fetchMetrics();
   }),
 
-  cpuTicks: computed('graphs.[]', 'nodes.[]', function() {
+  cpuTicks: computed('graphs.[]', 'nodes.[]', 'showTicks', function() {
     if (!get(this, 'graphs') || !get(this, 'showTicks')) {
       return
     }
@@ -122,7 +122,7 @@ export default NodesReservation.extend(Metrics, {
     })
   }),
 
-  memoryTicks: computed('graphs.[]', function() {
+  memoryTicks: computed('graphs.[]', 'showTicks', function() {
     if (!get(this, 'graphs') || !get(this, 'showTicks')) {
       return
     }
@@ -183,11 +183,11 @@ export default NodesReservation.extend(Metrics, {
 
     return get(this, 'intl').t('clusterDashboard.liveTitle', {
       total,
-      used:  formatSi(used, 1000, '', '', 0, exponentNeeded(total), 1).replace(/\s.*$/, ''),
+      used: formatSi(used, 1000, '', '', 0, exponentNeeded(total), 1).replace(/\s.*$/, ''),
     })
   }),
 
-  meomoryLiveTitle: computed('nodes.@each.{memory}', 'memoryLive', 'intl.locale', function() {
+  meomoryLiveTitle: computed('nodes.@each.memory', 'memoryLive', 'intl.locale', function() {
     const { graphs, nodes = [] } = this
 
     if (!graphs) {
@@ -226,7 +226,7 @@ export default NodesReservation.extend(Metrics, {
     })
   }),
 
-  nodeCapcity: computed('nodes.@each.{capacity}', function() {
+  nodeCapcity: computed('nodes.@each.capacity', function() {
     const { nodes = [] } = this
     let out = {}
 
diff --git a/lib/monitoring/addon/index/controller.js b/lib/monitoring/addon/index/controller.js
index fba55bc87..bb10c2e39 100644
--- a/lib/monitoring/addon/index/controller.js
+++ b/lib/monitoring/addon/index/controller.js
@@ -12,7 +12,7 @@ export default Controller.extend({
   k8s:               service(),
   prefs:             service(),
 
-  cluster:           alias('scope.currentCluster'),
+  cluster: alias('scope.currentCluster'),
 
   actions: {
     kubectl() {
@@ -32,7 +32,7 @@ export default Controller.extend({
     }
   },
 
-  currentClusterNodes: computed('model.nodes.@each.{capacity,allocatable,state,isUnschedulable}', function() {
+  currentClusterNodes: computed('model.nodes.@each.{allocatable,capacity,isUnschedulable,state}', 'scope.currentCluster.id', function() {
     const clusterId = get(this, 'scope.currentCluster.id');
 
     return get(this, 'model.nodes').filter((n) => n.clusterId === clusterId && !n.isUnschedulable);
diff --git a/lib/monitoring/addon/index/template.hbs b/lib/monitoring/addon/index/template.hbs
index 03c3146d1..1f64092d4 100644
--- a/lib/monitoring/addon/index/template.hbs
+++ b/lib/monitoring/addon/index/template.hbs
@@ -5,7 +5,7 @@
     <button
       class="btn bg-primary btn-sm icon-btn ml-10"
       disabled={{not cluster.isReady}}
-      onClick={{action "kubectl" allowedKeys="meta"}}
+      onClick={{action "kubectl" allowedKeys="meta"}} type="button"
     >
       <span class="darken"><i class="icon icon-terminal"></i></span>
       <span>{{t "k8sPage.shell.button"}}</span>
@@ -13,8 +13,7 @@
 
     <button
       class="btn bg-primary btn-sm icon-btn ml-10"
-      disabled={{not cluster.isReady}}
-      {{action "kubeconfig"}}
+      disabled={{not cluster.isReady}} type="button" {{action "kubeconfig"}}
     >
       <span class="darken"><i class="icon icon-file"></i></span>
       <span>{{t "k8sPage.configFile.button"}}</span>
diff --git a/lib/nodes/addon/components/driver-amazonec2/component.js b/lib/nodes/addon/components/driver-amazonec2/component.js
index f0f417dcd..4a10f140d 100644
--- a/lib/nodes/addon/components/driver-amazonec2/component.js
+++ b/lib/nodes/addon/components/driver-amazonec2/component.js
@@ -41,7 +41,7 @@ export default Component.extend(NodeDriver, {
 
   config: alias('model.amazonec2Config'),
 
-  isCustomSecurityGroup:    equal('whichSecurityGroup', 'custom'),
+  isCustomSecurityGroup: equal('whichSecurityGroup', 'custom'),
 
   init() {
     this._super(...arguments);
@@ -305,9 +305,7 @@ export default Component.extend(NodeDriver, {
   }),
 
   stepDidChange: observer('context.step', function() {
-    scheduleOnce('afterRender', this, () => {
-      document.body.scrollTop = document.body.scrollHeight;
-    });
+    scheduleOnce('afterRender', this, this.setScroll);
   }),
 
   selectedZone: computed('config.{region,zone}', {
@@ -348,7 +346,7 @@ export default Component.extend(NodeDriver, {
     }
   }),
 
-  zoneChoices: computed('allSubnets.@each.{zone}', function() {
+  zoneChoices: computed('allSubnets.@each.zone', 'config.region', 'config.zone.length', function() {
     const choices = (get(this, 'allSubnets') || []).map((subnet) => {
       return get(subnet, 'zone');
     }).sort().uniq();
@@ -500,5 +498,8 @@ export default Component.extend(NodeDriver, {
     });
   },
 
+  setScroll() {
+    document.body.scrollTop = document.body.scrollHeight;
+  },
 
 });
diff --git a/lib/nodes/addon/components/driver-azure/component.js b/lib/nodes/addon/components/driver-azure/component.js
index 794d1372b..f7ff69298 100644
--- a/lib/nodes/addon/components/driver-azure/component.js
+++ b/lib/nodes/addon/components/driver-azure/component.js
@@ -43,7 +43,7 @@ const DISK_CHOICES = [
 ];
 
 export default Component.extend(NodeDriver, {
-  intl:  service(),
+  intl: service(),
 
   layout,
   environments,
@@ -62,17 +62,7 @@ export default Component.extend(NodeDriver, {
   init() {
     this._super(...arguments);
 
-    scheduleOnce('afterRender', () => {
-      setProperties(this, {
-        publicIpChoice: this.initPublicIpChoices(get(this, 'config.staticPublicIp'), get(this, 'config.noPublicIp')),
-        openPorts:      this.initOpenPorts(get(this, 'config.openPort')),
-        managedDisks:   get(this, 'config.managedDisks') ? MANAGED : UNMANAGED
-      });
-
-      if (!this.editing) {
-        set(this, 'config.nsg', `rancher-managed-${ randomStr(8, 8) }`);
-      }
-    });
+    scheduleOnce('afterRender', this, this.setupComponent);
   },
 
   actions: {
@@ -129,7 +119,7 @@ export default Component.extend(NodeDriver, {
     return regions[environment];
   }),
 
-  privateSet: computed('publicIpChoice', function() {
+  privateSet: computed('publicIpChoice', 'publicIpChoices', function() {
     let publicIpChoice = get(this, 'publicIpChoice');
 
     if (publicIpChoice && get(this, 'publicIpChoices').findBy('value', publicIpChoice).name === 'None') {
@@ -139,7 +129,7 @@ export default Component.extend(NodeDriver, {
     return false;
   }),
 
-  setUsePrivateIp: computed('publicIpChoice', function() {
+  setUsePrivateIp: computed('publicIpChoice', 'publicIpChoices', function() {
     let publicIpChoice = get(this, 'publicIpChoice');
 
     if (publicIpChoice && get(this, 'publicIpChoices').findBy('value', publicIpChoice).name === 'None') {
@@ -195,4 +185,16 @@ export default Component.extend(NodeDriver, {
     return true;
   },
 
+  setupComponent() {
+    setProperties(this, {
+      publicIpChoice: this.initPublicIpChoices(get(this, 'config.staticPublicIp'), get(this, 'config.noPublicIp')),
+      openPorts:      this.initOpenPorts(get(this, 'config.openPort')),
+      managedDisks:   get(this, 'config.managedDisks') ? MANAGED : UNMANAGED
+    });
+
+    if (!this.editing) {
+      set(this, 'config.nsg', `rancher-managed-${ randomStr(8, 8) }`);
+    }
+  },
+
 });
diff --git a/lib/nodes/addon/components/driver-digitalocean/component.js b/lib/nodes/addon/components/driver-digitalocean/component.js
index 48107f2d8..b74d64f28 100644
--- a/lib/nodes/addon/components/driver-digitalocean/component.js
+++ b/lib/nodes/addon/components/driver-digitalocean/component.js
@@ -38,7 +38,7 @@ export default Component.extend(NodeDriver, {
   imageChoices:  null,
   tags:          null,
 
-  config:        alias('primaryResource.digitaloceanConfig'),
+  config: alias('primaryResource.digitaloceanConfig'),
 
   init() {
     this._super(...arguments);
@@ -133,7 +133,7 @@ export default Component.extend(NodeDriver, {
     set(this, 'config.tags', get(this, 'tags').join(','));
   }),
 
-  filteredSizeChoices: computed('config.region', function(){
+  filteredSizeChoices: computed('config.region', 'regionChoices', 'sizeChoices', function(){
     let region = get(this, 'regionChoices').findBy('slug', get(this, 'config.region'));
     let sizes = get(this, 'sizeChoices');
     let out = sizes.filter((size) => {
diff --git a/lib/nodes/addon/components/driver-oci/component.js b/lib/nodes/addon/components/driver-oci/component.js
index fd044ab7e..7cd937b06 100644
--- a/lib/nodes/addon/components/driver-oci/component.js
+++ b/lib/nodes/addon/components/driver-oci/component.js
@@ -30,12 +30,12 @@ export default Component.extend(NodeDriver, {
     },
   },
 
-  regionChoices: computed('model.cloudCredentialId', async function() {
+  regionChoices: computed('model.cloudCredentialId', 'primaryResource.cloudCredentialId', async function() {
     let token = get(this, 'primaryResource.cloudCredentialId');
 
     if ( token !== null && token !== '') {
       const auth = {
-        type:  'cloud',
+        type: 'cloud',
         token
       };
 
@@ -49,13 +49,13 @@ export default Component.extend(NodeDriver, {
       label: '',
     };
   }),
-  adChoices: computed('config.region', 'model.cloudCredentialId', async function() {
+  adChoices: computed('config.region', 'model.cloudCredentialId', 'primaryResource.cloudCredentialId', async function() {
     let token = get(this, 'primaryResource.cloudCredentialId');
     let region = get(this, 'config.region');
 
     if (token !== null && token !== '' && region !== null && region !== '') {
       const auth = {
-        type:  'cloud',
+        type: 'cloud',
         token
       };
 
@@ -69,20 +69,20 @@ export default Component.extend(NodeDriver, {
       label: '',
     };
   }),
-  nodeShapeChoices: computed('config.nodeCompartmentId', 'config.region', 'model.cloudCredentialId', async function() {
+  nodeShapeChoices: computed('config.{nodeCompartmentId,region}', 'model.cloudCredentialId', 'primaryResource.cloudCredentialId', async function() {
     let token = get(this, 'primaryResource.cloudCredentialId');
     let compartment = get(this, 'config.nodeCompartmentId');
 
     if (token !== null && token !== '' && compartment !== null && compartment !== ''
     && (compartment.startsWith('ocid1.compartment') || compartment.startsWith('ocid1.tenancy'))) {
       const auth = {
-        type:  'cloud',
+        type: 'cloud',
         token
       };
       const options = await this.oci.request(auth, 'nodeShapes', {
         params: {
           compartment,
-          region:      get(this, 'config.region')
+          region: get(this, 'config.region')
         }
       });
 
@@ -94,20 +94,20 @@ export default Component.extend(NodeDriver, {
       label: '',
     };
   }),
-  imageChoices: computed('config.nodeCompartmentId', 'config.region', 'model.cloudCredentialId', async function() {
+  imageChoices: computed('config.{nodeCompartmentId,region}', 'model.cloudCredentialId', 'primaryResource.cloudCredentialId', async function() {
     let token = get(this, 'primaryResource.cloudCredentialId');
     let compartment = get(this, 'config.nodeCompartmentId');
 
     if (token !== null && token !== '' && compartment !== null && compartment !== ''
     && (compartment.startsWith('ocid1.compartment') || compartment.startsWith('ocid1.tenancy'))) {
       const auth = {
-        type:  'cloud',
+        type: 'cloud',
         token
       };
       const options = await this.oci.request(auth, 'nodeImages', {
         params: {
           compartment,
-          region:      get(this, 'config.region')
+          region: get(this, 'config.region')
         }
       });
 
diff --git a/lib/nodes/addon/components/driver-other/component.js b/lib/nodes/addon/components/driver-other/component.js
index 1c41ece6b..cbae62281 100644
--- a/lib/nodes/addon/components/driver-other/component.js
+++ b/lib/nodes/addon/components/driver-other/component.js
@@ -21,7 +21,7 @@ export default Component.extend(NodeDriver, {
     }
   },
 
-  schema: computed('driverName', function() {
+  schema: computed('driverName', 'globalStore', function() {
     const configName = `${ get(this, 'driverName') }Config`;
 
     return get(this, 'globalStore').getById('schema', configName.toLowerCase());
diff --git a/lib/nodes/addon/components/driver-packet/component.js b/lib/nodes/addon/components/driver-packet/component.js
index 0b788bfce..a49e03cea 100644
--- a/lib/nodes/addon/components/driver-packet/component.js
+++ b/lib/nodes/addon/components/driver-packet/component.js
@@ -27,7 +27,7 @@ export default Component.extend(NodeDriver, {
   osChoices:        null,
   step:             1,
 
-  config:     alias('model.packetConfig'),
+  config: alias('model.packetConfig'),
 
   init() {
     this._super(...arguments);
@@ -76,7 +76,7 @@ export default Component.extend(NodeDriver, {
     },
   },
 
-  planChoiceDetails: computed('config.plan', function() {
+  planChoiceDetails: computed('allPlans', 'config.plan', function() {
     let planSlug = get(this, 'config.plan');
     let plan     = get(this, 'allPlans').findBy('slug', planSlug);
 
diff --git a/lib/nodes/addon/components/driver-vmwarevsphere/component.js b/lib/nodes/addon/components/driver-vmwarevsphere/component.js
index 7e2752f6d..cf9782796 100644
--- a/lib/nodes/addon/components/driver-vmwarevsphere/component.js
+++ b/lib/nodes/addon/components/driver-vmwarevsphere/component.js
@@ -126,7 +126,7 @@ export default Component.extend(NodeDriver, {
   vappMode:             VAPP_MODE_DISABLED,
   cache:                {},
 
-  config:  alias(`model.${ CONFIG }`),
+  config: alias(`model.${ CONFIG }`),
 
   init() {
     this._super(...arguments);
@@ -222,7 +222,7 @@ export default Component.extend(NodeDriver, {
     return this.mapCustomAttributesToContent(options);
   }),
 
-  hostContent: computed('config.datacenter', async function() {
+  hostContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'hosts',
       get(this, 'model.cloudCredentialId'),
@@ -232,7 +232,7 @@ export default Component.extend(NodeDriver, {
     return this.mapHostOptionsToContent(options);
   }),
 
-  resourcePoolContent: computed('config.datacenter', async function() {
+  resourcePoolContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'resource-pools',
       get(this, 'model.cloudCredentialId'),
@@ -242,7 +242,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPoolOptionsToContent(options);
   }),
 
-  dataStoreContent: computed('config.datacenter', async function() {
+  dataStoreContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'data-stores',
       get(this, 'model.cloudCredentialId'),
@@ -252,7 +252,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPathOptionsToContent(options);
   }),
 
-  dataStoreClusterContent: computed('config.datacenter', async function() {
+  dataStoreClusterContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'data-store-clusters',
       get(this, 'model.cloudCredentialId'),
@@ -262,7 +262,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPathOptionsToContent(options);
   }),
 
-  folderContent: computed('config.datacenter', async function() {
+  folderContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'folders',
       get(this, 'model.cloudCredentialId'),
@@ -272,7 +272,7 @@ export default Component.extend(NodeDriver, {
     return this.mapFolderOptionsToContent(options);
   }),
 
-  networkContent: computed('config.datacenter', async function() {
+  networkContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'networks',
       get(this, 'model.cloudCredentialId'),
@@ -282,7 +282,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPathOptionsToContent(options);
   }),
 
-  contentLibraryContent: computed('config.datacenter', async function() {
+  contentLibraryContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'content-libraries',
       get(this, 'model.cloudCredentialId'),
@@ -292,7 +292,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPathOptionsToContent(options);
   }),
 
-  libraryTemplateContent: computed('config.contentLibrary', async function() {
+  libraryTemplateContent: computed('config.contentLibrary', 'model.cloudCredentialId', async function() {
     const contentLibrary = get(this, 'config.contentLibrary');
 
     if (!contentLibrary) {
@@ -309,7 +309,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPathOptionsToContent(options);
   }),
 
-  virtualMachineContent: computed('config.datacenter', async function() {
+  virtualMachineContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'virtual-machines',
       get(this, 'model.cloudCredentialId'),
@@ -319,7 +319,7 @@ export default Component.extend(NodeDriver, {
     return this.mapPathOptionsToContent(options);
   }),
 
-  templateContent: computed('config.datacenter', async function() {
+  templateContent: computed('config.datacenter', 'model.cloudCredentialId', async function() {
     const options = await this.requestOptions(
       'templates',
       get(this, 'model.cloudCredentialId'),
diff --git a/lib/nodes/addon/components/modal-edit-node-template/component.js b/lib/nodes/addon/components/modal-edit-node-template/component.js
index 5e8a5c7e0..93217e356 100644
--- a/lib/nodes/addon/components/modal-edit-node-template/component.js
+++ b/lib/nodes/addon/components/modal-edit-node-template/component.js
@@ -31,7 +31,7 @@ export default Component.extend(ModalBase, Preload, {
   customDrivers:     null,
   rejectedDriverIds: null,
 
-  showPicker:        empty('model.id'),
+  showPicker: empty('model.id'),
 
   didReceiveAttrs() {
     const opts          = get(this, 'modalService.modalOpts') || {};
@@ -54,7 +54,7 @@ export default Component.extend(ModalBase, Preload, {
 
     if ( originalModel ) {
       setProperties(this, {
-        model:   newModel,
+        model: newModel,
         originalModel,
         editing,
         cloning,
@@ -148,7 +148,7 @@ export default Component.extend(ModalBase, Preload, {
     return group;
   }),
 
-  driverObj: computed('driver', function() {
+  driverObj: computed('availableDrivers', 'driver', function() {
     return get(this, 'availableDrivers').filterBy('name', get(this, 'driver'))[0];
   }),
 
diff --git a/lib/nodes/addon/custom-drivers/cluster-drivers/controller.js b/lib/nodes/addon/custom-drivers/cluster-drivers/controller.js
index 3313ed691..1aaf50eb1 100644
--- a/lib/nodes/addon/custom-drivers/cluster-drivers/controller.js
+++ b/lib/nodes/addon/custom-drivers/cluster-drivers/controller.js
@@ -53,7 +53,7 @@ export default Controller.extend({
     },
   },
 
-  rows: computed('model.drivers.@each.{state,id,version,externalId}', function() {
+  rows: computed('model.drivers.@each.{externalId,id,state,version}', 'model.drivers.content', function() {
     // possibly add some search here
     let drivers    = get(this, 'model.drivers.content');
 
diff --git a/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs b/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs
index e10dfe783..f6d240973 100644
--- a/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs
+++ b/lib/nodes/addon/custom-drivers/cluster-drivers/template.hbs
@@ -14,8 +14,7 @@
   <div class="right-buttons">
     <button
       disabled={{or refreshing (rbac-prevents resource="kontainerdriver" scope="global" permission="create")}}
-      class="btn btn-sm bg-primary right-divider-btn"
-      {{action "refreshMetadata"}}>
+      class="btn btn-sm bg-primary right-divider-btn" type="button" {{action "refreshMetadata"}}>
         {{#if refreshing}}
          <i class="icon icon-spinner icon-spin"></i>
         {{/if}}
@@ -24,8 +23,7 @@
 
     <button
       disabled={{rbac-prevents resource="kontainerdriver" scope="global" permission="create"}}
-      class="btn btn-sm bg-primary right-divider-btn"
-      {{action "addNewDriver"}}>
+      class="btn btn-sm bg-primary right-divider-btn" type="button" {{action "addNewDriver"}}>
         {{t "clusterDrivers.add"}}
     </button>
   </div>
diff --git a/lib/nodes/addon/custom-drivers/node-drivers/controller.js b/lib/nodes/addon/custom-drivers/node-drivers/controller.js
index 5d5fc1042..a5351eee2 100644
--- a/lib/nodes/addon/custom-drivers/node-drivers/controller.js
+++ b/lib/nodes/addon/custom-drivers/node-drivers/controller.js
@@ -63,7 +63,7 @@ export default Controller.extend({
     }
   },
 
-  rows: computed('model.drivers.@each.{state,id,version,externalId}', function() {
+  rows: computed('model.drivers.@each.{externalId,id,state,version}', 'model.drivers.content', function() {
     // possibly add some search here
     let drivers    = this.get('model.drivers.content');
 
diff --git a/lib/nodes/addon/custom-drivers/node-drivers/template.hbs b/lib/nodes/addon/custom-drivers/node-drivers/template.hbs
index f1a0a698b..56d8caeb6 100644
--- a/lib/nodes/addon/custom-drivers/node-drivers/template.hbs
+++ b/lib/nodes/addon/custom-drivers/node-drivers/template.hbs
@@ -8,7 +8,7 @@
     </li>
   </ul>
   <div class="right-buttons">
-    <button disabled={{rbac-prevents resource="nodedriver" scope="global" permission="create"}} class="btn btn-sm bg-primary right-divider-btn" {{action 'addNewDriver'}}>{{t 'machinePage.add'}}</button>
+    <button disabled={{rbac-prevents resource="nodedriver" scope="global" permission="create"}} class="btn btn-sm bg-primary right-divider-btn" type="button" {{action 'addNewDriver'}}>{{t 'machinePage.add'}}</button>
   </div>
 </section>
 
diff --git a/lib/nodes/addon/node-templates/template.hbs b/lib/nodes/addon/node-templates/template.hbs
index 2ed3aa5da..5a2d97955 100644
--- a/lib/nodes/addon/node-templates/template.hbs
+++ b/lib/nodes/addon/node-templates/template.hbs
@@ -8,8 +8,7 @@
       {{t "nodeTemplatesPage.rightButtons.cloudCredentials"}}
     {{/link-to-external}}
     <button
-      class="btn btn-sm bg-primary"
-      {{action "newTemplate"}}
+      class="btn btn-sm bg-primary" type="button" {{action "newTemplate"}}
     >
       {{t "nodeTemplatesPage.rightButtons.actionButton"}}
     </button>
diff --git a/lib/pipeline/addon/components/build-detail/component.js b/lib/pipeline/addon/components/build-detail/component.js
index a7566ab59..4e237ea11 100644
--- a/lib/pipeline/addon/components/build-detail/component.js
+++ b/lib/pipeline/addon/components/build-detail/component.js
@@ -4,20 +4,22 @@ import { get, computed } from '@ember/object';
 import { scheduleOnce } from '@ember/runloop';
 
 export default Component.extend({
-  router:  service(),
+  router: service(),
 
   init() {
     this._super(...arguments);
 
-    scheduleOnce('afterRender', () => {
-      if ( !get(this, 'build') ) {
-        get(this, 'router').transitionTo('authenticated.project.pipeline.pipelines');
-      }
-    });
+    scheduleOnce('afterRender', this, this.handleReroute);
   },
 
-  build: computed('model.executions.@each.run', 'model.run', function() {
+  build: computed('model.executions.@each.run', 'model.pipeline.id', 'model.run', function() {
     return get(this, 'model.executions').find((exe) => get(exe, 'pipelineId') === get(this, 'model.pipeline.id') && get(exe, 'run') === parseInt(get(this, 'model.run'), 10));
   }),
 
+  handleReroute() {
+    if ( !get(this, 'build') ) {
+      get(this, 'router').transitionTo('authenticated.project.pipeline.pipelines');
+    }
+  },
+
 });
diff --git a/lib/pipeline/addon/components/build-step/component.js b/lib/pipeline/addon/components/build-step/component.js
index e8c612824..53ea245ba 100644
--- a/lib/pipeline/addon/components/build-step/component.js
+++ b/lib/pipeline/addon/components/build-step/component.js
@@ -9,13 +9,7 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
-    once(() => {
-      var interval = window.setInterval(() => {
-        set(this, 'dateNow', Date.now())
-      }, 1000);
-
-      set(this, 'dateInterval', interval);
-    });
+    once(this, this.setupInterval);
   },
 
   willDestroyElement() {
@@ -47,4 +41,11 @@ export default Component.extend({
     return get(this, 'activity.executionState') === C.STATES.FAILED && !get(this, 'step.state');
   }),
 
+  setupInterval() {
+    var interval = window.setInterval(() => {
+      set(this, 'dateNow', Date.now())
+    }, 1000);
+
+    set(this, 'dateInterval', interval);
+  },
 });
diff --git a/lib/pipeline/addon/components/edit-pipeline-config/template.hbs b/lib/pipeline/addon/components/edit-pipeline-config/template.hbs
index 070d92575..f73e8f13d 100644
--- a/lib/pipeline/addon/components/edit-pipeline-config/template.hbs
+++ b/lib/pipeline/addon/components/edit-pipeline-config/template.hbs
@@ -65,7 +65,7 @@
                 <p>{{t "newPipelineStep.stepType.scm.noYaml" htmlSafe=true}}</p>
               </div>
             </div>
-            <button class="btn bg-transparent" {{action "enableBranch"}}>
+            <button class="btn bg-transparent" type="button" {{action "enableBranch"}}>
               <i class="icon icon-edit"/>
               {{t "newPipelineStep.stepType.enableBranch"}}
             </button>
diff --git a/lib/pipeline/addon/components/enable-repositories/component.js b/lib/pipeline/addon/components/enable-repositories/component.js
index 99d469ae6..446c1ba54 100644
--- a/lib/pipeline/addon/components/enable-repositories/component.js
+++ b/lib/pipeline/addon/components/enable-repositories/component.js
@@ -141,7 +141,7 @@ export default Component.extend({
     return profile;
   }),
 
-  accountsInfo: computed('accounts.@each.logout', function() {
+  accountsInfo: computed('accounts.@each.logout', 'pipeline.sourceCodeCredential', function() {
     const accounts = get(this, 'accounts').filter((account) => !account.logout);
 
     if ( get(accounts, 'length') === 0 ) {
diff --git a/lib/pipeline/addon/components/enable-repositories/template.hbs b/lib/pipeline/addon/components/enable-repositories/template.hbs
index b01c9b8f1..2c6b3f790 100644
--- a/lib/pipeline/addon/components/enable-repositories/template.hbs
+++ b/lib/pipeline/addon/components/enable-repositories/template.hbs
@@ -126,5 +126,5 @@
 {{top-errors errors=errors}}
 
 <div style="text-align: center" class="mt-20 text-center">
-  <button {{action "cancel"}} class="btn bg-primary">{{t "generic.done"}}</button>
+  <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t "generic.done"}}</button>
 </div>
\ No newline at end of file
diff --git a/lib/pipeline/addon/components/form-recipient-item/template.hbs b/lib/pipeline/addon/components/form-recipient-item/template.hbs
index e6d81052e..3bbf0d361 100644
--- a/lib/pipeline/addon/components/form-recipient-item/template.hbs
+++ b/lib/pipeline/addon/components/form-recipient-item/template.hbs
@@ -31,7 +31,7 @@
   </div>
 
   <div class="col mt-0 span-1-of-24" style="padding-top:2px;">
-    <button class="btn bg-link icon-btn {{if disableRemove 'disabled' ''}}" {{action "remove"}}>
+    <button class="btn bg-link icon-btn {{if disableRemove 'disabled' ''}}" type="button" {{action "remove"}}>
       <span class="darken"><i class="icon icon-minus text-small"/></span>
     </button>
   </div>
diff --git a/lib/pipeline/addon/components/github-setting/template.hbs b/lib/pipeline/addon/components/github-setting/template.hbs
index 21186ba6e..13e050a71 100644
--- a/lib/pipeline/addon/components/github-setting/template.hbs
+++ b/lib/pipeline/addon/components/github-setting/template.hbs
@@ -32,7 +32,7 @@
 
     {{top-errors errors=errors}}
     <div class="row text-center">
-      <button class="btn bg-primary" {{action "githubAuthConfigAuthenticate"}}>
+      <button class="btn bg-primary" type="button" {{action "githubAuthConfigAuthenticate"}}>
         {{#if testing}}
           <i class="icon icon-spinner icon-spin"></i> {{t "authPage.testAuth.buttonText.post"}}
         {{else}}
diff --git a/lib/pipeline/addon/components/log-view/template.hbs b/lib/pipeline/addon/components/log-view/template.hbs
index 2b59dad54..1df324ab7 100644
--- a/lib/pipeline/addon/components/log-view/template.hbs
+++ b/lib/pipeline/addon/components/log-view/template.hbs
@@ -1,15 +1,15 @@
 <div class="anchor-top"></div>
 <div class="log-actions">
   <div class="btn-group btn-group-xs p-0">
-    <button class="btn btn-xs" {{action "toggleLogMode"}}>
+    <button class="btn btn-xs" type="button" {{action "toggleLogMode"}}>
       {{#if fullscreen}}
         <i class="icon icon-chevron-end icon-fw"/>
       {{else}}
         <i class="icon icon-chevron-beginning icon-fw"/>
       {{/if}}
     </button>
-    <button class="btn btn-xs" {{action "scrollToTop"}}><i class="icon icon-chevron-up icon-fw"/></button>
-    <button style="margin-left: -1px;" {{action "scrollToBottom"}} class="btn btn-xs"><i class="icon icon-chevron-down icon-fw"/></button>
+    <button class="btn btn-xs" type="button" {{action "scrollToTop"}}><i class="icon icon-chevron-up icon-fw"/></button>
+    <button style="margin-left: -1px;" class="btn btn-xs" type="button" {{action "scrollToBottom"}}><i class="icon icon-chevron-down icon-fw"/></button>
   </div>
 </div>
 <pre class="log-body" style="margin:0; font-size: 80%; color: whitesmoke;margin-top: -24px;"></pre>
diff --git a/lib/pipeline/addon/components/modal-pipeline-enable/template.hbs b/lib/pipeline/addon/components/modal-pipeline-enable/template.hbs
index dbaac366d..c95dfceaa 100644
--- a/lib/pipeline/addon/components/modal-pipeline-enable/template.hbs
+++ b/lib/pipeline/addon/components/modal-pipeline-enable/template.hbs
@@ -15,7 +15,7 @@
     {{t "enablePipeline.noPermission"}}
   </div>
   <div class="text-center">
-    <button class="btn bg-transparent" {{action "cancel"}}>
+    <button class="btn bg-transparent" type="button" {{action "cancel"}}>
       {{t "generic.cancel"}}
     </button>
   </div>
diff --git a/lib/pipeline/addon/components/modal-pipeline-new-stage/template.hbs b/lib/pipeline/addon/components/modal-pipeline-new-stage/template.hbs
index d82202567..8fcfe2e7e 100644
--- a/lib/pipeline/addon/components/modal-pipeline-new-stage/template.hbs
+++ b/lib/pipeline/addon/components/modal-pipeline-new-stage/template.hbs
@@ -6,7 +6,7 @@
   </div>
   {{#if editing}}
     <div class="right-buttons pb-0 pt-0">
-      <button class="btn bg-error" {{action "remove"}}>
+      <button class="btn bg-error" type="button" {{action "remove"}}>
         {{t "generic.remove"}}
       </button>
     </div>
diff --git a/lib/pipeline/addon/components/modal-pipeline-new-step/template.hbs b/lib/pipeline/addon/components/modal-pipeline-new-step/template.hbs
index db7e382c3..01731006e 100644
--- a/lib/pipeline/addon/components/modal-pipeline-new-step/template.hbs
+++ b/lib/pipeline/addon/components/modal-pipeline-new-step/template.hbs
@@ -9,7 +9,7 @@
     </div>
     {{#if editing}}
       <div class="right-buttons">
-        <button class="btn bg-error" {{action 'remove'}}>
+        <button class="btn bg-error" type="button" {{action 'remove'}}>
           {{t 'generic.remove'}}
         </button>
       </div>
diff --git a/lib/pipeline/addon/components/modal-pipeline-run/template.hbs b/lib/pipeline/addon/components/modal-pipeline-run/template.hbs
index 95cde130d..b98435734 100644
--- a/lib/pipeline/addon/components/modal-pipeline-run/template.hbs
+++ b/lib/pipeline/addon/components/modal-pipeline-run/template.hbs
@@ -29,7 +29,7 @@
     {{t "runPipeline.noBranch" htmlSafe=true}}
   </div>
   <div class="footer-actions">
-    <button {{action "cancel"}} class="btn bg-primary">
+    <button class="btn bg-primary" type="button" {{action "cancel"}}>
       {{t "generic.closeModal"}}
     </button>
   </div>
diff --git a/lib/pipeline/addon/components/pipeline-detail/component.js b/lib/pipeline/addon/components/pipeline-detail/component.js
index 93c72da8f..e1e7b7cde 100644
--- a/lib/pipeline/addon/components/pipeline-detail/component.js
+++ b/lib/pipeline/addon/components/pipeline-detail/component.js
@@ -4,7 +4,7 @@ import { get, computed } from '@ember/object';
 
 export default Component.extend({
   pipeline:   alias('model.pipeline'),
-  executions: computed('model.executions.[]', function() {
+  executions: computed('model.executions.[]', 'pipeline.id', function() {
     return get(this, 'model.executions').filterBy('pipelineId', get(this, 'pipeline.id'));
   }),
 
diff --git a/lib/pipeline/addon/components/pipeline-jobs-table/component.js b/lib/pipeline/addon/components/pipeline-jobs-table/component.js
index ae68e807e..a3b34700e 100644
--- a/lib/pipeline/addon/components/pipeline-jobs-table/component.js
+++ b/lib/pipeline/addon/components/pipeline-jobs-table/component.js
@@ -24,6 +24,6 @@ export const headers =  [
 ];
 
 export default Component.extend({
-  sortBy:  'name',
+  sortBy: 'name',
   headers,
 });
diff --git a/lib/pipeline/addon/components/pipeline-notifier/component.js b/lib/pipeline/addon/components/pipeline-notifier/component.js
index 0274b1b07..5c4a3d79b 100644
--- a/lib/pipeline/addon/components/pipeline-notifier/component.js
+++ b/lib/pipeline/addon/components/pipeline-notifier/component.js
@@ -15,7 +15,7 @@ export default Component.extend({
   scope:            service(),
   layout,
 
-  config:     null,
+  config: null,
 
   conditionContent:     CONDITION_CHOICES,
   recipients:           [],
@@ -25,7 +25,7 @@ export default Component.extend({
   customizeMessage:     false,
   togglingNotification: null,
 
-  clusterId:   reads('scope.currentCluster.id'),
+  clusterId: reads('scope.currentCluster.id'),
 
   init() {
     this._super(...arguments);
diff --git a/lib/pipeline/addon/components/pipeline-notifier/template.hbs b/lib/pipeline/addon/components/pipeline-notifier/template.hbs
index 02ea7e667..3716e9bea 100644
--- a/lib/pipeline/addon/components/pipeline-notifier/template.hbs
+++ b/lib/pipeline/addon/components/pipeline-notifier/template.hbs
@@ -2,13 +2,13 @@
 <div class="mb-20 mt-20">
   {{#if notificationEnabled}}
     <div class="btn-group no-inline-space">
-      <button class="btn btn-link btn-sm bg-default" {{action "disableNotification"}}>{{t "generic.disable"}}</button>
-      <button class="btn btn-link btn-sm bg-success">{{t "generic.enabled"}}</button>
+      <button class="btn btn-link btn-sm bg-default" type="button" {{action "disableNotification"}}>{{t "generic.disable"}}</button>
+      <button class="btn btn-link btn-sm bg-success" type="button">{{t "generic.enabled"}}</button>
     </div>
   {{else}}
     <div class="btn-group no-inline-space">
-      <button class="btn btn-link btn-sm bg-primary">{{t "generic.disabled"}}</button>
-      <button class="btn btn-link btn-sm bg-defualt" {{action "enableNotification"}}>{{t "generic.enable"}}</button>
+      <button class="btn btn-link btn-sm bg-primary" type="button">{{t "generic.disabled"}}</button>
+      <button class="btn btn-link btn-sm bg-defualt" type="button" {{action "enableNotification"}}>{{t "generic.enable"}}</button>
     </div>
   {{/if}}
 </div>
@@ -68,7 +68,7 @@
           }}
         {{/each}}
         <div class="mt-15">
-          <button class="btn bg-link icon-btn p-0" {{action "add"}} disabled={{not haveNotifiers}}>
+          <button class="btn bg-link icon-btn p-0" disabled={{not haveNotifiers}} type="button" {{action "add"}}>
             <span class="darken"><i class="icon icon-plus text-small"/></span>
             <span>{{t "alertPage.newOrEdit.addRecipient"}}</span>
           </button>
diff --git a/lib/pipeline/addon/components/pipeline-selector-row/template.hbs b/lib/pipeline/addon/components/pipeline-selector-row/template.hbs
index d103ba823..d8b0fabd2 100644
--- a/lib/pipeline/addon/components/pipeline-selector-row/template.hbs
+++ b/lib/pipeline/addon/components/pipeline-selector-row/template.hbs
@@ -27,5 +27,5 @@
 </td>
 <td>&nbsp;</td>
 <div class="input-group-btn">
-  <button class="btn bg-primary btn-sm" {{action "removeRule" rule}}><i class="icon icon-minus"/></button>
+  <button class="btn bg-primary btn-sm" type="button" {{action "removeRule" rule}}><i class="icon icon-minus"/></button>
 </div>
\ No newline at end of file
diff --git a/lib/pipeline/addon/components/pipeline-selector/template.hbs b/lib/pipeline/addon/components/pipeline-selector/template.hbs
index 4278a9b09..b6c1421e6 100644
--- a/lib/pipeline/addon/components/pipeline-selector/template.hbs
+++ b/lib/pipeline/addon/components/pipeline-selector/template.hbs
@@ -31,7 +31,7 @@
   </table>
 {{/if}}
 
-<button class="btn bg-link icon-btn" {{action "addRule"}}>
+<button class="btn bg-link icon-btn" type="button" {{action "addRule"}}>
   <span class="darken"><i class="icon icon-plus text-small"/></span>
   <span>{{t 'pipelineSelector.addRule'}}</span>
 </button>
\ No newline at end of file
diff --git a/lib/pipeline/addon/components/pipeline-steps/component.js b/lib/pipeline/addon/components/pipeline-steps/component.js
index 08a1f21b2..a24b34c06 100644
--- a/lib/pipeline/addon/components/pipeline-steps/component.js
+++ b/lib/pipeline/addon/components/pipeline-steps/component.js
@@ -37,7 +37,7 @@ export default Component.extend({
     }
   },
 
-  isScm: computed('steps.[]', function() {
+  isScm: computed('steps.[]', 'steps.firstObject.sourceCodeConfig', function() {
     return !!get(this, 'steps.firstObject.sourceCodeConfig');
   }),
 
diff --git a/lib/pipeline/addon/components/repository-row/template.hbs b/lib/pipeline/addon/components/repository-row/template.hbs
index 6ecd59260..e448d9bf9 100644
--- a/lib/pipeline/addon/components/repository-row/template.hbs
+++ b/lib/pipeline/addon/components/repository-row/template.hbs
@@ -4,13 +4,13 @@
 <td data-title="actions:" >
   {{#if row.pipeline}}
     <div class="btn-group no-inline-space">
-      <button class="btn btn-link btn-sm bg-default" {{action "disable"}} disabled={{toggling}} style="width: 80px;">{{#if toggling}}<i class="icon icon-spinner icon-spin"></i> {{/if}}{{t 'generic.disable'}}</button>
-      <button class="btn btn-link btn-sm bg-success" style="cursor: not-allowed;width: 80px;">{{t "generic.enabled"}}</button>
+      <button class="btn btn-link btn-sm bg-default" disabled={{toggling}} style="width: 80px;" type="button" {{action "disable"}}>{{#if toggling}}<i class="icon icon-spinner icon-spin"></i> {{/if}}{{t 'generic.disable'}}</button>
+      <button class="btn btn-link btn-sm bg-success" style="cursor: not-allowed;width: 80px;" type="button">{{t "generic.enabled"}}</button>
     </div>
   {{else}}
     <div class="btn-group no-inline-space">
-      <button class="btn btn-link btn-sm bg-primary" style="cursor: not-allowed;width: 80px;">{{t 'generic.disabled'}}</button>
-      <button class="btn btn-link btn-sm bg-defualt" {{action "enable"}} disabled={{toggling}} style="width: 80px;">{{#if toggling}}<i class="icon icon-spinner icon-spin"></i> {{/if}}{{t 'generic.enable'}}</button>
+      <button class="btn btn-link btn-sm bg-primary" style="cursor: not-allowed;width: 80px;" type="button">{{t 'generic.disabled'}}</button>
+      <button class="btn btn-link btn-sm bg-defualt" disabled={{toggling}} style="width: 80px;" type="button" {{action "enable"}}>{{#if toggling}}<i class="icon icon-spinner icon-spin"></i> {{/if}}{{t 'generic.enable'}}</button>
     </div>
   {{/if}}
 </td>
\ No newline at end of file
diff --git a/lib/pipeline/addon/components/settings-git/component.js b/lib/pipeline/addon/components/settings-git/component.js
index 3e9ceacda..96b0de126 100644
--- a/lib/pipeline/addon/components/settings-git/component.js
+++ b/lib/pipeline/addon/components/settings-git/component.js
@@ -11,7 +11,7 @@ export default Component.extend({
   intl:       service(),
   classNames: ['accordion-wrapper'],
 
-  selectedOauthType:    'github',
+  selectedOauthType: 'github',
 
   oauthModel:     {},
   scale:          null,
diff --git a/lib/pipeline/addon/components/settings-git/template.hbs b/lib/pipeline/addon/components/settings-git/template.hbs
index d1370e9be..4231d4c31 100644
--- a/lib/pipeline/addon/components/settings-git/template.hbs
+++ b/lib/pipeline/addon/components/settings-git/template.hbs
@@ -55,10 +55,10 @@
           {{scale.value}}
         </span>
         <div class="btn-group btn-group-xs p-0">
-          <button class="btn btn-xs bg-primary" {{action "scaleDown"}}>
+          <button class="btn btn-xs bg-primary" type="button" {{action "scaleDown"}}>
             <i class="icon icon-minus icon-fw"/>
           </button>
-          <button style="margin-left: -1px;" class="btn btn-xs bg-primary" {{action "scaleUp"}}>
+          <button style="margin-left: -1px;" class="btn btn-xs bg-primary" type="button" {{action "scaleUp"}}>
             <i class="icon icon-plus icon-fw"/>
           </button>
         </div>
@@ -208,16 +208,16 @@
       <div class="row mt-30 text-center">
         {{#if confirmDisable}}
           {{#if disabling}}
-            <button class="btn bg-disabled" disabled="disabled">
+            <button class="btn bg-disabled" disabled="disabled" type="button">
               <i class="icon icon-spinner icon-spin"></i> {{t "generic.saving"}}
             </button>
           {{else}}
-            <button class="btn bg-primary" {{action "disable"}}>
+            <button class="btn bg-primary" type="button" {{action "disable"}}>
               <i class="icon icon-alert"></i> {{t "pipelinesSetting.sureToDisableOAuth"}}
             </button>
           {{/if}}
         {{else}}
-          <button class="btn bg-primary" {{action "promptDisable"}}>
+          <button class="btn bg-primary" type="button" {{action "promptDisable"}}>
             <i class="icon icon-umbrella"></i> {{t "pipelinesSetting.disableOAuth"}}
           </button>
         {{/if}}
diff --git a/lib/pipeline/addon/components/steps/step-scm/component.js b/lib/pipeline/addon/components/steps/step-scm/component.js
index 378d2b4c0..4492c2ee4 100644
--- a/lib/pipeline/addon/components/steps/step-scm/component.js
+++ b/lib/pipeline/addon/components/steps/step-scm/component.js
@@ -17,7 +17,7 @@ export default Component.extend({
   errors: null,
 
   // Internal
-  url:          alias('pipeline.url'),
+  url: alias('pipeline.url'),
   init() {
     this._super(...arguments);
 
@@ -112,7 +112,7 @@ export default Component.extend({
     return profile;
   }),
 
-  accountsInfo: computed('accounts.@each.logout', function() {
+  accountsInfo: computed('accounts.@each.logout', 'pipeline.sourceCodeCredential', function() {
     const accounts = get(this, 'accounts').filter((account) => !account.logout);
 
     if ( get(accounts, 'length') === 0 ) {
diff --git a/lib/pipeline/addon/routes.js b/lib/pipeline/addon/routes.js
index 44c331950..a7d8a6ed4 100644
--- a/lib/pipeline/addon/routes.js
+++ b/lib/pipeline/addon/routes.js
@@ -3,11 +3,11 @@ import buildRoutes from 'ember-engines/routes';
 export default buildRoutes(function() {
   // Define your engine's route map here
   this.route('settings', { path: '/' });
-  this.route('pipelines', { path: '/pipelines' }, function() {
+  this.route('pipelines',  function() {
     this.route('index', { path: '/' });
     this.route('detail', { path: '/:pipeline_id' });
     this.route('edit', { path: '/:pipeline_id/edit' });
     this.route('run', { path: '/:pipeline_id/run/:run_id' });
   });
-  this.route('repositories', { path: '/repositories' });
+  this.route('repositories' );
 });
diff --git a/lib/shared/addon/all-workloads/service.js b/lib/shared/addon/all-workloads/service.js
index 3fc566b9b..ca337d100 100644
--- a/lib/shared/addon/all-workloads/service.js
+++ b/lib/shared/addon/all-workloads/service.js
@@ -47,7 +47,7 @@ export default Service.extend({
 
   list: alias('workloads'),
 
-  listWithPods: computed('workloads', 'pods', function() {
+  listWithPods: computed('_allPods', '_allWorkloads', 'pods', 'workloads', function() {
     const intl = get(this, 'intl');
     const out = get(this, '_allWorkloads').map((x) => convert(x, intl));
 
diff --git a/lib/shared/addon/capabilities/service.js b/lib/shared/addon/capabilities/service.js
index a04190a04..2f4f7a6ea 100644
--- a/lib/shared/addon/capabilities/service.js
+++ b/lib/shared/addon/capabilities/service.js
@@ -4,7 +4,7 @@ import { alias } from '@ember/object/computed';
 import { get, computed } from '@ember/object';
 
 export default Service.extend({
-  scope:        service(),
+  scope: service(),
 
   cluster:      alias('scope.currentCluster'),
   capabilities: alias('cluster.capabilities'),
diff --git a/lib/shared/addon/catalog/service.js b/lib/shared/addon/catalog/service.js
index 750dac36f..32338042d 100644
--- a/lib/shared/addon/catalog/service.js
+++ b/lib/shared/addon/catalog/service.js
@@ -14,7 +14,7 @@ export default Service.extend({
   scope:           service(),
   app:             service(),
 
-  catalogs:        null,
+  catalogs: null,
 
   _allCatalogs:    union('globalCatalogs', 'clusterCatalogs', 'projectCatalogs'),
   _allTemplates:    null,
diff --git a/lib/shared/addon/cis-helpers/service.js b/lib/shared/addon/cis-helpers/service.js
index 35a0e4824..3543c19eb 100644
--- a/lib/shared/addon/cis-helpers/service.js
+++ b/lib/shared/addon/cis-helpers/service.js
@@ -53,7 +53,7 @@ export default Service.extend({
       .join('');
   },
 
-  defaultClusterScanConfig: computed(function() {
+  defaultClusterScanConfig: computed('defaultCisScanProfileOption', function() {
     return this.profileToClusterScanConfig(this.defaultCisScanProfileOption);
   }),
 
diff --git a/lib/shared/addon/components/accordion-list-item/component.js b/lib/shared/addon/components/accordion-list-item/component.js
index 5bccc06f6..8811e9010 100644
--- a/lib/shared/addon/components/accordion-list-item/component.js
+++ b/lib/shared/addon/components/accordion-list-item/component.js
@@ -3,9 +3,8 @@ import Component from '@ember/component';
 import layout from './template'
 import { inject as service } from '@ember/service'
 import { get, set, observer } from '@ember/object'
-import { run } from '@ember/runloop';
+import { scheduleOnce, next } from '@ember/runloop';
 import $ from 'jquery';
-import { next } from '@ember/runloop';
 
 const NONE            = 'none';
 const INCOMPLETE      = 'incomplete';
@@ -51,10 +50,10 @@ export function classForStatus(status) {
 }
 
 export default Component.extend({
-  scope:     service(),
+  scope: service(),
 
   layout,
-  classNames:   ['accordion'],
+  classNames: ['accordion'],
 
   name:         null,
   title:        null,
@@ -73,31 +72,7 @@ export default Component.extend({
 
   init() {
     this._super(...arguments);
-    run.scheduleOnce('render', () => {
-      let eoi = get(this, 'expandOnInit');
-
-      if (eoi) {
-        if (!get(this, 'everExpanded')) {
-          next(() => {
-            set(this, 'everExpanded', true);
-          });
-        }
-
-        run.next(() => {
-          if ( this.isDestroyed || this.isDestroying ) {
-            return;
-          }
-
-          next(() => {
-            set(this, 'expanded', eoi);
-          });
-        });
-      }
-
-      if ( $('.accordion-detail-text a').length ) {
-        $('.accordion-detail-text a').attr('onclick', 'event.stopPropagation();');
-      }
-    });
+    scheduleOnce('render', this, this.setupExpandOnInit);
   },
 
   actions: {
@@ -119,7 +94,7 @@ export default Component.extend({
         });
       }
 
-      run.next(() => {
+      next(() => {
         if ( this.isDestroyed || this.isDestroying ) {
           return;
         }
@@ -142,7 +117,33 @@ export default Component.extend({
       });
     }
   })),
-  expand() {
+
+  expand() {},
+
+  setupExpandOnInit() {
+    let eoi = get(this, 'expandOnInit');
+
+    if (eoi) {
+      if (!get(this, 'everExpanded')) {
+        next(() => {
+          set(this, 'everExpanded', true);
+        });
+      }
+
+      next(() => {
+        if ( this.isDestroyed || this.isDestroying ) {
+          return;
+        }
+
+        next(() => {
+          set(this, 'expanded', eoi);
+        });
+      });
+    }
+
+    if ( $('.accordion-detail-text a').length ) {
+      $('.accordion-detail-text a').attr('onclick', 'event.stopPropagation();');
+    }
   },
 
 });
diff --git a/lib/shared/addon/components/accordion-list/template.hbs b/lib/shared/addon/components/accordion-list/template.hbs
index 15880d65d..dc6033bf2 100644
--- a/lib/shared/addon/components/accordion-list/template.hbs
+++ b/lib/shared/addon/components/accordion-list/template.hbs
@@ -1,6 +1,6 @@
 {{#if showExpandAll}}
   <div class="row">
-    <button class="btn btn-sm bg-transparent pull-right" {{action 'expandAll'}}>{{t (if expandAll 'generic.collapseAll' 'generic.expandAll')}}</button>
+    <button class="btn btn-sm bg-transparent pull-right" type="button" {{action 'expandAll'}}>{{t (if expandAll 'generic.collapseAll' 'generic.expandAll')}}</button>
   </div>
 {{/if}}
 {{yield this expand}}
diff --git a/lib/shared/addon/components/action-menu/component.js b/lib/shared/addon/components/action-menu/component.js
index df30fb564..143240b39 100644
--- a/lib/shared/addon/components/action-menu/component.js
+++ b/lib/shared/addon/components/action-menu/component.js
@@ -45,6 +45,8 @@ export default Component.extend({
     if ( size && size !== 'md' ) {
       return `btn-${ size }`;
     }
+
+    return '';
   }),
 
 
diff --git a/lib/shared/addon/components/action-menu/template.hbs b/lib/shared/addon/components/action-menu/template.hbs
index 0f586e879..768f33473 100644
--- a/lib/shared/addon/components/action-menu/template.hbs
+++ b/lib/shared/addon/components/action-menu/template.hbs
@@ -1,50 +1,45 @@
-{{#basic-dropdown
-     horizontalPosition="right"
-     calculatePosition=(action "calculatePosition" )
-     onOpen=(action 'actionsOpen')
-     onClose=(action 'actionsClosed')
-     as |dd|
-}}
-
-  {{#dd.trigger
-       ariaLabel=(t 'generic.moreActions')
-       class=(concat "btn bg-transparent more-actions " sizeClass)
-       onMouseEnter=(action "preload")
-  }}
+<BasicDropdown
+  @horizontalPosition="right"
+  @calculatePosition={{action "calculatePosition"}}
+  @onOpen={{action "actionsOpen"}}
+  @onClose={{action "actionsClosed"}} as |dd|
+>
+  <dd.Trigger
+    ariaLabel={{t "generic.moreActions"}}
+    class={{concat "btn bg-transparent more-actions " sizeClass}}
+    {{on "onMouseEnter" (action "preload")}}
+  >
     <i class="icon icon-fw icon-vertical-ellipsis"></i>
-  {{/dd.trigger}}
-
-  {{#dd.content class="resource-actions global-actions"}}
-
-    <li class="resource-actions-tabbable"><a tabindex="-1" id="resource-actions-first" aria-label="Select an Action below"></a></li>
-
+  </dd.Trigger>
+  <dd.Content class="resource-actions global-actions">
+    <li class="resource-actions-tabbable">
+      <a
+        tabindex="-1"
+        id="resource-actions-first"
+        aria-label="Select an Action below"
+      ></a>
+    </li>
     {{#each resourceActions.activeActions as |item|}}
-
       {{#if item.divider}}
-
         <li class="divider"></li>
-
       {{else}}
-
-        {{!-- the close action is on the LI in this case because the action menu item is capturing the click action --}}
+        {{! the close action is on the LI in this case because the action menu item is capturing the click action }}
         <li {{action dd.actions.close}}>
           {{action-menu-item
-              label=item.label
-              icon=item.icon
-              action=(action "clickedAction")
-              actionArg=item.action
-              altActionArg=item.altAction
+            label=item.label
+            icon=item.icon
+            action=(action "clickedAction")
+            actionArg=item.action
+            altActionArg=item.altAction
           }}
         </li>
-
       {{/if}}
-
     {{else}}
-
-      <li><a href="#" onclick="return false;" disabled="true">No actions available</a></li>
-
+      <li>
+        <a href="#" onclick="return false;" disabled="true">
+          No actions available
+        </a>
+      </li>
     {{/each}}
-
-  {{/dd.content}}
-
-{{/basic-dropdown}}
+  </dd.Content>
+</BasicDropdown>
\ No newline at end of file
diff --git a/lib/shared/addon/components/advanced-section/template.hbs b/lib/shared/addon/components/advanced-section/template.hbs
index 048e432f0..2b591af73 100644
--- a/lib/shared/addon/components/advanced-section/template.hbs
+++ b/lib/shared/addon/components/advanced-section/template.hbs
@@ -2,5 +2,5 @@
   {{yield advanced}}
 </div>
 <div class="text-right text-small">
-  <button class="btn bg-transparent p-0" {{action "toggle"}}>{{t (if advanced "advancedSection.hideText" "advancedSection.showText")}}</button>
+  <button class="btn bg-transparent p-0" type="button" {{action "toggle"}}>{{t (if advanced "advancedSection.hideText" "advancedSection.showText")}}</button>
 </div>
diff --git a/lib/shared/addon/components/annotations-section/component.js b/lib/shared/addon/components/annotations-section/component.js
index 149d0ba50..af9ad9dfc 100644
--- a/lib/shared/addon/components/annotations-section/component.js
+++ b/lib/shared/addon/components/annotations-section/component.js
@@ -24,7 +24,7 @@ export default Component.extend(ManageLabels, {
     },
   ],
 
-  annotationSource:    alias('model.annotations'),
+  annotationSource: alias('model.annotations'),
 
   didReceiveAttrs() {
     this.initLabels(this.get('annotationSource'), null, null, this.k3sLabelsToIgnore);
diff --git a/lib/shared/addon/components/answer-override-row/component.js b/lib/shared/addon/components/answer-override-row/component.js
index c2c508a28..1f60fb944 100644
--- a/lib/shared/addon/components/answer-override-row/component.js
+++ b/lib/shared/addon/components/answer-override-row/component.js
@@ -63,7 +63,7 @@ export default Component.extend({
     return out;
   }),
 
-  allQuestions: computed('selectedTemplateModel.questions.[]', 'answer.answer', function() {
+  allQuestions: computed('answer.answer', 'primaryResource.answers.firstObject.values', 'selectedTemplateModel.questions.[]', 'subquestionAnswers.length', function() {
     let allQuestions = get(this, 'selectedTemplateModel.questions');
     const { answer } = this;
     let questionMatch;
diff --git a/lib/shared/addon/components/answer-override-row/template.hbs b/lib/shared/addon/components/answer-override-row/template.hbs
index 7517b0722..04bab4d74 100644
--- a/lib/shared/addon/components/answer-override-row/template.hbs
+++ b/lib/shared/addon/components/answer-override-row/template.hbs
@@ -56,8 +56,7 @@
   </td>
   <td data-title="{{t "generic.actions"}}:" class="actions">
     <button
-      class="btn bg-primary btn-sm"
-      {{action "removeOverride" answer}}
+      class="btn bg-primary btn-sm" type="button" {{action "removeOverride" answer}}
     >
       <i class="icon icon-minus"></i>
     </button>
diff --git a/lib/shared/addon/components/api-field/component.js b/lib/shared/addon/components/api-field/component.js
index d16dcbb1c..58bb557a8 100644
--- a/lib/shared/addon/components/api-field/component.js
+++ b/lib/shared/addon/components/api-field/component.js
@@ -51,7 +51,7 @@ export default Component.extend({
     return out;
   }),
 
-  fieldType: computed('fieldDef', function() {
+  fieldType: computed('fieldDef.type', function() {
     return get(this, 'fieldDef.type');
   }),
 
diff --git a/lib/shared/addon/components/authorized-endpoint/component.js b/lib/shared/addon/components/authorized-endpoint/component.js
index 7cd3da730..55f7e22fb 100644
--- a/lib/shared/addon/components/authorized-endpoint/component.js
+++ b/lib/shared/addon/components/authorized-endpoint/component.js
@@ -4,7 +4,7 @@ import { computed, set, observer } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default Component.extend({
-  globalStore:                    service(),
+  globalStore: service(),
 
   layout,
 
diff --git a/lib/shared/addon/components/banner-message/component.js b/lib/shared/addon/components/banner-message/component.js
index fa1e9c99b..5c36bb6f7 100644
--- a/lib/shared/addon/components/banner-message/component.js
+++ b/lib/shared/addon/components/banner-message/component.js
@@ -39,11 +39,13 @@ export default Component.extend({
     return title;
   }),
 
-  titleStyle: computed('width', function() {
+  titleStyle: computed('titleWidth', 'width', function() {
     let width = this.get('titleWidth');
 
     if ( width) {
       return htmlSafe(`width: ${  width  }px`);
     }
+
+    return '';
   }),
 });
diff --git a/lib/shared/addon/components/catalog-index/component.js b/lib/shared/addon/components/catalog-index/component.js
index 79c6f7ac9..b895b0bd9 100644
--- a/lib/shared/addon/components/catalog-index/component.js
+++ b/lib/shared/addon/components/catalog-index/component.js
@@ -76,11 +76,11 @@ export default Component.extend({
     }
   }),
 
-  projectCatalogs: computed('model.catalogs.projecCatalogs', function() {
+  projectCatalogs: computed('model.catalogs.{projecCatalogs,projectCatalogs}', 'scope.currentProject.id', function() {
     return (get(this, 'model.catalogs.projectCatalogs') || []).filter( (c) => c.projectId === get(this, 'scope.currentProject.id'));
   }),
 
-  clusterCatalogs: computed('model.catalogs.clusterCatalogs', function() {
+  clusterCatalogs: computed('model.catalogs.clusterCatalogs', 'scope.currentCluster.id', function() {
     return (get(this, 'model.catalogs.clusterCatalogs') || []).filter( (c) => c.clusterId === get(this, 'scope.currentCluster.id'));
   }),
 
diff --git a/lib/shared/addon/components/catalog-index/template.hbs b/lib/shared/addon/components/catalog-index/template.hbs
index e1caddb5d..54d53744b 100644
--- a/lib/shared/addon/components/catalog-index/template.hbs
+++ b/lib/shared/addon/components/catalog-index/template.hbs
@@ -5,7 +5,6 @@
         {{t (if istio "catalogPage.istio.header" "catalogPage.index.header")}}
       </h1>
     </div>
-
     <div class="right-buttons">
       <div class="search-group input-group pull-right ml-20">
         {{input
@@ -16,22 +15,20 @@
         }}
         {{#if search}}
           <span class="input-group-btn">
-            <button class="btn bg-transparent text-info pl-10 pr-10" {{action "clearSearch"}}>
-              <i class="icon icon-close"/>
+            <button
+              class="btn bg-transparent text-info pl-10 pr-10" type="button" {{action "clearSearch"}}
+            >
+              <i class="icon icon-close"></i>
             </button>
           </span>
         {{/if}}
       </div>
-
       <div class="dropdown filter-group pull-right ml-20">
-        {{#basic-dropdown
-           horizontalPosition="right"
-           verticalPosition="below"
-           as |dd|
-        }}
-          {{#dd.trigger
-             class="btn bg-default btn-md pt-5 pb-5 "
-          }}
+        <BasicDropdown
+          @horizontalPosition="right"
+          @verticalPosition="below" as |dd|
+        >
+          <dd.Trigger class="btn bg-default btn-md pt-5 pb-5">
             <i class="icon icon-chevron-down pull-right ml-10"></i>
             <span class="text-capitalize">
               {{#if (eq category "")}}
@@ -40,29 +37,37 @@
                 {{category}}
               {{/if}}
             </span>
-          {{/dd.trigger}}
-
-          {{#dd.content
-             class="text-right"
-          }}
-            <li class="text-capitalize {{if (eq category "") "active"}}">
+          </dd.Trigger>
+          <dd.Content class="text-right">
+            <li
+              class="text-capitalize {{if (eq category "") "active"}}"
+              {{action dd.actions.close}}
+            >
               <a href="#" {{action "filterCatalog" "" dd}}>
-                {{t "catalogPage.index.allCategories"}} ({{matchingSearch.length}})
+                {{t "catalogPage.index.allCategories"}}
+                (
+                {{matchingSearch.length}}
+                )
               </a>
             </li>
             {{#each categories as |opt|}}
-              <li class="{{if (eq category opt.category) "active"}}">
+              <li
+                class="{{if (eq category opt.category) "active"}}"
+                {{action dd.actions.close}}
+              >
                 <a href="#" {{action "filterCatalog" opt.category dd}}>
-                  <div class="text-capitalize">{{opt.name}} ({{opt.count}})</div>
+                  <div class="text-capitalize">
+                    {{opt.name}}
+                    (
+                    {{opt.count}}
+                    )
+                  </div>
                 </a>
               </li>
             {{/each}}
-          {{/dd.content}}
-
-        {{/basic-dropdown}}
-
+          </dd.Content>
+        </BasicDropdown>
       </div>
-
       <div class="pull-right">
         <button
           type="button"
@@ -71,21 +76,26 @@
           {{action "update"}}
         >
           {{#if (eq updating "yes")}}
-            <span class="darken"><i class="icon icon-spinner icon-spin"></i></span>
+            <span class="darken">
+              <i class="icon icon-spinner icon-spin"></i>
+            </span>
+          {{else if (eq updating "error")}}
+            <span class="darken">
+              <i class="icon icon-spinner icon-alert"></i>
+            </span>
           {{else}}
-            {{#if (eq updating "error")}}
-              <span class="darken"><i class="icon icon-spinner icon-alert"></i></span>
-            {{else}}
-              <span class="darken"><i class="icon icon-refresh"></i></span>
-            {{/if}}
+            <span class="darken">
+              <i class="icon icon-refresh"></i>
+            </span>
           {{/if}}
-          <span>{{t "catalogPage.index.refreshBtn"}}</span>
+          <span>
+            {{t "catalogPage.index.refreshBtn"}}
+          </span>
         </button>
       </div>
     </div>
   </section>
 {{/if}}
-
 {{#if scope.currentCluster.isWindows}}
   {{banner-message
     icon="icon-info"
@@ -93,39 +103,40 @@
     message=(t "catalogPage.index.windowsWarning" htmlSafe=true)
   }}
 {{/if}}
-
 {{#each groupedContent as |group|}}
   <div class="catalog-group">
     <div class="clearfix">
-      <button class="btn btn-sm bg-transparent mt-10 pull-right" {{action "toggleCollapse" group}}>
+      <button
+        class="btn btn-sm bg-transparent mt-10 pull-right" type="button" {{action "toggleCollapse" group}}
+      >
         {{t (if group.collapsed "generic.expand" "generic.collapse")}}
       </button>
       <p>
         <span class="group-name-container">
           {{group.name}}
           {{#if group.isHelm3}}
-            <img class="helm-version-3" src="{{app.baseAssets}}assets/images/logos/helm-v3.svg" />
+            <img
+              class="helm-version-3"
+              src="{{app.baseAssets}}assets/images/logos/helm-v3.svg"
+            />
           {{/if}}
         </span>
       </p>
     </div>
-    {{#if (not group.collapsed) }}
+    {{#unless group.collapsed}}
       <div class="clearfix">
         {{#each group.items as |catalogItem|}}
-          {{catalog-box
-            model=catalogItem
-            launchAction=(action launch)
-          }}
+          {{catalog-box model=catalogItem launchAction=(action launch)}}
         {{else}}
           <div class="text-muted mt-20">
             {{t "catalogPage.index.noData.singular"}}
           </div>
         {{/each}}
       </div>
-    {{/if}}
+    {{/unless}}
   </div>
 {{else}}
   <div class="text-muted mt-20">
     {{t "catalogPage.index.noData.plural"}}
   </div>
-{{/each}}
+{{/each}}
\ No newline at end of file
diff --git a/lib/shared/addon/components/check-computed-override/component.js b/lib/shared/addon/components/check-computed-override/component.js
index ffb875161..04aa33aed 100644
--- a/lib/shared/addon/components/check-computed-override/component.js
+++ b/lib/shared/addon/components/check-computed-override/component.js
@@ -4,7 +4,7 @@ import layout from './template';
 export default Component.extend({
   layout,
 
-  tagName:               '',
+  tagName: '',
 
   applyClusterTemplate:  null,
   clusterTemplateCreate: null,
diff --git a/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js b/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
index 8651abead..8f65ab621 100644
--- a/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-amazoneks/component.js
@@ -279,7 +279,7 @@ export default Component.extend(ClusterDriver, {
     }
   }),
 
-  versionChoices: computed('versions', function() {
+  versionChoices: computed('editing', 'versions', function() {
     const {
       config : { kubernetesVersion: initialVersion },
       intl,
@@ -313,7 +313,7 @@ export default Component.extend(ClusterDriver, {
     return get(this, 'allKeyPairs').sortBy('KeyName');
   }),
 
-  filteredSubnets: computed('allSubnets', function() {
+  filteredSubnets: computed('allSubnets', 'config.virtualNetwork', function() {
     return get(this, 'allSubnets').filterBy('VpcId', get(this, 'config.virtualNetwork')).map( (subnet) => {
       return {
         subnetName:  nameFromResource(subnet, 'SubnetId'),
@@ -332,11 +332,11 @@ export default Component.extend(ClusterDriver, {
     }).sortBy('label');
   }),
 
-  filteredSecurityGroups: computed('allSecurityGroups', function() {
+  filteredSecurityGroups: computed('allSecurityGroups', 'config.virtualNetwork', function() {
     return get(this, 'allSecurityGroups').filterBy('VpcId', get(this, 'config.virtualNetwork')).sortBy('GroupName');
   }),
 
-  readableServiceRole: computed('config.serviceRole', function() {
+  readableServiceRole: computed('config.serviceRole', 'serviceRoles', function() {
     const roles        = get(this, 'serviceRoles');
     const selectedRole = get(this, 'config.serviceRole');
     const match        = roles.findBy('RoleName', selectedRole);
diff --git a/lib/shared/addon/components/cluster-driver/driver-azureaks/component.js b/lib/shared/addon/components/cluster-driver/driver-azureaks/component.js
index 0bb39bd6e..9a3bfe485 100644
--- a/lib/shared/addon/components/cluster-driver/driver-azureaks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-azureaks/component.js
@@ -39,7 +39,7 @@ export default Component.extend(ClusterDriver, {
   versionChoiceService: service('version-choices'),
   layout,
 
-  configField:  'azureKubernetesServiceConfig',
+  configField: 'azureKubernetesServiceConfig',
 
   zones:                  aksRegions,
   versions:               null,
diff --git a/lib/shared/addon/components/cluster-driver/driver-eks/component.js b/lib/shared/addon/components/cluster-driver/driver-eks/component.js
index a285e6506..69a7d3800 100644
--- a/lib/shared/addon/components/cluster-driver/driver-eks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-eks/component.js
@@ -337,17 +337,17 @@ export default Component.extend(ClusterDriver, {
     return subnets;
   }),
 
-  disableVersionSelect: computed('config.kubernetesVersion', '', function() {
+  disableVersionSelect: computed('', 'config.kubernetesVersion', 'nodeGroupsVersionCollection', function() {
     const kubernetesVersion = get(this, 'config.kubernetesVersion');
 
     return get(this, 'nodeGroupsVersionCollection').any((version) => lt(coerce(version), coerce(kubernetesVersion)));
   }),
 
-  nodeGroupsVersionCollection: computed('config.nodeGroups.@.each{version}', function() {
+  nodeGroupsVersionCollection: computed('config.nodeGroups.@.eachversion', function() {
     return (get(this, 'config.nodeGroups') || []).map((ng) => ng.version).uniq();
   }),
 
-  versionChoices: computed('kubernetesVersionContent', 'nodeGroupsVersionCollection.[]', function() {
+  versionChoices: computed('editing', 'kubernetesVersionContent', 'nodeGroupsVersionCollection.[]', function() {
     const {
       config,
       intl,
@@ -442,7 +442,7 @@ export default Component.extend(ClusterDriver, {
     }).sortBy('GroupName');
   }),
 
-  readableServiceRole: computed('config.serviceRole', function() {
+  readableServiceRole: computed('config.serviceRole', 'serviceRoles', function() {
     const roles        = get(this, 'serviceRoles');
     const selectedRole = get(this, 'config.serviceRole');
     const match        = roles.findBy('RoleName', selectedRole);
diff --git a/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js b/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js
index 6635e17e1..cc1dd1ec1 100644
--- a/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-googlegke/component.js
@@ -185,7 +185,7 @@ export default Component.extend(ClusterDriver, {
   versionChoiceService: service('version-choices'),
 
   layout,
-  configField:            'googleKubernetesEngineConfig',
+  configField: 'googleKubernetesEngineConfig',
 
   step:                   1,
   zones:                  null,
@@ -554,7 +554,7 @@ export default Component.extend(ClusterDriver, {
     return out.sortBy('sortName')
   }),
 
-  editedMachineChoice: computed('machineChoices', 'config', function() {
+  editedMachineChoice: computed('config.machineType', 'machineChoices', function() {
     return get(this, 'machineChoices').findBy('name', get(this, 'config.machineType'));
   }),
 
@@ -568,7 +568,7 @@ export default Component.extend(ClusterDriver, {
     return this.versionChoiceService.parseCloudProviderVersionChoices(validMasterVersions, masterVersion, mode);
   }),
 
-  locationContent: computed('config.zone', function() {
+  locationContent: computed('config.zone', 'zoneChoices', function() {
     const zone = get(this, 'config.zone')
 
     if ( !zone ) {
diff --git a/lib/shared/addon/components/cluster-driver/driver-huaweicce/component.js b/lib/shared/addon/components/cluster-driver/driver-huaweicce/component.js
index 5c42f1fcb..c73a9b39b 100644
--- a/lib/shared/addon/components/cluster-driver/driver-huaweicce/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-huaweicce/component.js
@@ -156,7 +156,7 @@ export default Component.extend(ClusterDriver, {
   authConfigred:           false,
   publicCloud:             null,
 
-  editing:                 equal('mode', 'edit'),
+  editing: equal('mode', 'edit'),
   init() {
     this._super(...arguments);
 
@@ -630,7 +630,7 @@ export default Component.extend(ClusterDriver, {
     })
   }),
 
-  editedVpcName: computed('config.vpcId', function() {
+  editedVpcName: computed('config.vpcId', 'vpcs', function() {
     const vpcId = get(this, 'config.vpcId')
     const vpcs = get(this, 'vpcs') || []
     const filter = vpcs.filter((v) => v.id === vpcId)[0] || {}
@@ -649,7 +649,7 @@ export default Component.extend(ClusterDriver, {
     return filter
   }),
 
-  editedSubnetName: computed('config.subnetId', function() {
+  editedSubnetName: computed('config.subnetId', 'subnets', function() {
     const subnetId = get(this, 'config.subnetId')
     const subnets = get(this, 'subnets') || []
     const filter = subnets.filter((s) => s.id === subnetId)[0] || {}
@@ -666,7 +666,7 @@ export default Component.extend(ClusterDriver, {
     }))
   }),
 
-  clusterEipName: computed('config.clusterEipId', function() {
+  clusterEipName: computed('config.clusterEipId', 'eipIds', function() {
     const eipIds = get(this, 'eipIds') || []
     const clusterEipId = get(this, 'config.clusterEipId')
     const filter = eipIds.filter((e) => e.id === clusterEipId)[0] || {}
@@ -709,7 +709,7 @@ export default Component.extend(ClusterDriver, {
     })
   }),
 
-  editedSshName: computed('config.sshKey', function() {
+  editedSshName: computed('config.sshKey', 'keypairs', function() {
     const sshKey = get(this, 'config.sshKey')
     const keypairs = get(this, 'keypairs')
     const filter = keypairs.filter((k) => k.keypair.name === sshKey)[0] || {}
@@ -730,7 +730,7 @@ export default Component.extend(ClusterDriver, {
     return 1000
   }),
 
-  managementScaleDisplay: computed('managementScale', function() {
+  managementScaleDisplay: computed('managementScale', 'managementScaleContent', function() {
     const managementScale = get(this, 'managementScale')
     const managementScaleContent = get(this, 'managementScaleContent') || []
     const filter = managementScaleContent.filter((m) => m.value === managementScale)[0] || {}
@@ -738,7 +738,7 @@ export default Component.extend(ClusterDriver, {
     return filter.label
   }),
 
-  networkContent: computed('networks.[]', function() {
+  networkContent: computed('config.projectId', 'networks.[]', 'publicCloud', function() {
     const networks = get(this, 'networks')
     const publicCloud = get(this, 'publicCloud')
     let arr = []
diff --git a/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js b/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
index 2aa88b892..46092c927 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
@@ -33,7 +33,7 @@ export default Component.extend(ClusterDriver, {
   isEdit:       equal('mode', 'edit'),
   clusterState: alias('model.originalCluster.state'),
 
-  allErrors:    union('errors', 'otherErrors', 'clusterErrors'),
+  allErrors: union('errors', 'otherErrors', 'clusterErrors'),
 
   init() {
     this._super(...arguments);
diff --git a/lib/shared/addon/components/cluster-driver/driver-import/component.js b/lib/shared/addon/components/cluster-driver/driver-import/component.js
index f80c7e950..f0173517b 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-import/component.js
@@ -26,6 +26,8 @@ export default Component.extend(ClusterDriver, {
   isK3sCluster:  equal('model.cluster.driver', 'k3s'),
   isRke2Cluster: equal('model.cluster.driver', 'rke2'),
 
+  nodes: computed.reads('model.cluster.masterNodes'),
+
   didReceiveAttrs() {
     if ( get(this, 'isEdit') &&
          get(this, 'clusterState') === 'pending'
@@ -106,11 +108,7 @@ export default Component.extend(ClusterDriver, {
     },
   }),
 
-  nodes: computed('model.cluster.masterNodes.@each.{state}',  function() {
-    return this.model.cluster.masterNodes;
-  }),
-
-  nodesOptions: computed('nodes.@each.{state}', function() {
+  nodesOptions: computed('nodes.@each.state', function() {
     return this.nodes.map((node) => ( {
       id:          node.id,
       displayName: node.displayName
diff --git a/lib/shared/addon/components/cluster-driver/driver-import/template.hbs b/lib/shared/addon/components/cluster-driver/driver-import/template.hbs
index 8e96b2a8c..3b72ca18a 100644
--- a/lib/shared/addon/components/cluster-driver/driver-import/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-import/template.hbs
@@ -108,7 +108,7 @@
     }}
   {{else}}
     <div class="footer-actions">
-      <button {{action "close"}} class="btn bg-primary">
+      <button class="btn bg-primary" type="button" {{action "close"}}>
         {{t "clusterNew.rke.done"}}
       </button>
     </div>
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
index 5ece7621c..254631687 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
@@ -197,10 +197,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
       },
     });
     // This needs to be scheduled after render in order to wait for initTemplateCluster to setup the rkeconfig defaults.
-    scheduleOnce('afterRender', () => {
-      this.initUpgradeStrategy();
-      this.initScheduledClusterScan();
-    });
+    scheduleOnce('afterRender', this, this.setupComponent);
   },
 
   didReceiveAttrs() {
@@ -582,7 +579,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     ];
   }),
 
-  filteredTemplateRevisions: computed('selectedClusterTemplateId', 'model.clusterTemplateRevisions.@each.{id,state,name,members}', function() {
+  filteredTemplateRevisions: computed('cluster.type', 'isEdit', 'model.clusterTemplateRevisions.@each.{id,members,name,state}', 'selectedClusterTemplateId', 'setDefaultRevisionId', function() {
     let {
       selectedClusterTemplateId,
       clusterTemplateRevisionId = null,
@@ -633,9 +630,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     })
 
     if (clusterTemplate && clusterTemplateRevisionId === null ) {
-      once(() => {
-        set(this, 'clusterTemplateRevisionId', clusterTemplate.defaultRevisionId);
-      });
+      once(this, this.setDefaultRevisionId, clusterTemplate);
     }
 
     return mapped.sortBy('created').reverse();
@@ -742,7 +737,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     }
   }),
 
-  versionChoices: computed(`settings.${ C.SETTING.VERSIONS_K8S }`, function() {
+  versionChoices: computed(`settings.${ C.SETTING.VERSIONS_K8S }`, 'clusterTemplateCreate', function() {
     let out = JSON.parse(get(this, `settings.${ C.SETTING.VERSIONS_K8S }`) || '{}');
 
     out = Object.keys(out);
@@ -772,11 +767,11 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     }
   }),
 
-  isAddressValid: computed('address', function() {
+  isAddressValid: computed('address.length', function() {
     return get(this, 'address') === undefined || get(this, 'address.length') === 0 || validateEndpoint(get(this, 'address'));
   }),
 
-  isInternalAddressValid: computed('internalAddress', function() {
+  isInternalAddressValid: computed('internalAddress.length', function() {
     return get(this, 'internalAddress') === undefined || get(this, 'internalAddress.length') === 0 || validateEndpoint(get(this, 'internalAddress'));
   }),
 
@@ -848,7 +843,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     return out;
   }),
 
-  yamlValue: computed('pasteOrUpload', {
+  yamlValue: computed('isEdit', 'pasteOrUpload', 'primaryResource', {
     get() {
       // On edit we should get the cluster fields that are updateable, any fields added during the creation would need the cluster fields at the time
       const intl     = get(this, 'intl');
@@ -1471,9 +1466,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
 
     this.initBackupConfigs();
 
-    scheduleOnce('afterRender', () => {
-      this.initRootDockerDirectory();
-    });
+    scheduleOnce('afterRender', this, this.initRootDockerDirectory);
   },
 
   initTemplateCluster() {
@@ -1594,11 +1587,14 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
       }));
     }
 
-    scheduleOnce('afterRender', () => {
-      setProperties(this.primaryResource, out);
+    scheduleOnce('afterRender', this, this.notifyConfigUpdate, out);
+  },
 
-      this.notifyPropertyChange('config');
-    });
+  notifyConfigUpdate(out) {
+    setProperties(this.primaryResource, out);
+
+    this.notifyPropertyChange('config');
+    console.log('config updated');
   },
 
   migrateLegacyEtcdSnapshotSettings() {
@@ -1742,4 +1738,13 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
 
     return question;
   },
+
+  setupComponent() {
+    this.initUpgradeStrategy();
+    this.initScheduledClusterScan();
+  },
+
+  setDefaultRevisionId(clusterTemplate) {
+    set(this, 'clusterTemplateRevisionId', clusterTemplate.defaultRevisionId);
+  }
 });
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
index b69b5cdc5..66fd89c53 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
@@ -24,7 +24,7 @@
           {{/if}}
         </button>
       {{else}}
-        <button class="btn btn-sm bg-primary" {{action "showPaste"}}>
+        <button class="btn btn-sm bg-primary" type="button" {{action "showPaste"}}>
           {{#if notView}}
             {{t "clusterNew.advanced.yaml"}} <span class="icon icon-copy"></span>
           {{else}}
@@ -881,7 +881,7 @@
                     min=1
                     classNames="form-control"
                     placeholder=(t "clusterNew.rke.etcd.backupConfig.interval.placeholder")
-                    disabled=(if (not config.services.etcd.backupConfig.enabled) true)
+                    disabled=(unless config.services.etcd.backupConfig.enabled)
                   }}
                   <span class="input-group-addon bg-default">{{t "generic.hours"}}</span>
                 {{/input-or-display}}
@@ -918,7 +918,7 @@
                     min=1
                     classNames="form-control"
                     placeholder=(t "clusterNew.rke.etcd.backupConfig.retention.placeholder")
-                    disabled=(if (not config.services.etcd.backupConfig.enabled) true)
+                    disabled=(unless config.services.etcd.backupConfig.enabled)
                   }}
                 {{/input-or-display}}
               </CheckOverrideAllowed>
@@ -1383,7 +1383,7 @@
                                       </td>
 
                                       <td class="text-right">
-                                        <button class="btn bg-primary btn-sm" {{action removeLabel label}} disabled={{eq label.readonly true}}>
+                                        <button class="btn bg-primary btn-sm" disabled={{eq label.readonly true}} type="button" {{action removeLabel label}}>
                                           <i class="icon icon-minus"/>
                                           <span class="sr-only">
                                             {{t "generic.remove"}}
@@ -1399,7 +1399,7 @@
                               </div>
                             {{/if}}
 
-                            <button class="btn bg-link icon-btn" {{action addUserLabel}}>
+                            <button class="btn bg-link icon-btn" type="button" {{action addUserLabel}}>
                               <span class="darken">
                                 <i class="icon icon-plus text-small"/>
                               </span>
@@ -1497,7 +1497,7 @@
       />
     </section>
     <div class="footer-actions">
-      <button {{action "close"}} class="btn bg-primary">
+      <button class="btn bg-primary" type="button" {{action "close"}}>
         {{t "generic.cancel"}}
       </button>
     </div>
@@ -1511,7 +1511,7 @@
   {{/if}}
 {{else}}
   <div class="footer-actions">
-    <button {{action "close"}} class="btn bg-primary">
+    <button class="btn bg-primary" type="button" {{action "close"}}>
       {{t "clusterNew.rke.done"}}
     </button>
   </div>
diff --git a/lib/shared/addon/components/cluster-driver/driver-tencenttke/component.js b/lib/shared/addon/components/cluster-driver/driver-tencenttke/component.js
index 18834f274..5620a73dd 100644
--- a/lib/shared/addon/components/cluster-driver/driver-tencenttke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-tencenttke/component.js
@@ -331,7 +331,7 @@ export default Component.extend(ClusterDriver, {
     }
   }),
 
-  subnetChoices: computed('selectedZone', 'allSubnets', 'config.vpcId', 'vpcChoices.[]', function() {
+  subnetChoices: computed('allSubnets', 'config.vpcId', 'selectedZone.label', 'vpcChoices.[]', function() {
     if ( !get(this, 'selectedZone') || !get(this, 'allSubnets') ) {
       return;
     }
@@ -340,7 +340,7 @@ export default Component.extend(ClusterDriver, {
     return subnets;
   }),
 
-  instanceChoices: computed('selectedZone', 'allInstances', function() {
+  instanceChoices: computed('allInstances', 'config.instanceType', 'selectedZone.label', function() {
     if ( !get(this, 'selectedZone') || !get(this, 'allInstances') ) {
       return;
     }
diff --git a/lib/shared/addon/components/cluster-ribbon-nav/component.js b/lib/shared/addon/components/cluster-ribbon-nav/component.js
index 7324dca31..8089e837f 100644
--- a/lib/shared/addon/components/cluster-ribbon-nav/component.js
+++ b/lib/shared/addon/components/cluster-ribbon-nav/component.js
@@ -5,7 +5,7 @@ import { inject as service } from '@ember/service';
 import { computed, get, set } from '@ember/object';
 
 export default Component.extend({
-  prefs:  service(),
+  prefs: service(),
 
   layout,
 
diff --git a/lib/shared/addon/components/cluster-template-question-row/template.hbs b/lib/shared/addon/components/cluster-template-question-row/template.hbs
index 12f74625e..9a16d3c98 100644
--- a/lib/shared/addon/components/cluster-template-question-row/template.hbs
+++ b/lib/shared/addon/components/cluster-template-question-row/template.hbs
@@ -98,8 +98,7 @@
 {{#unless applyClusterTemplate}}
   <td data-title="{{t "generic.actions"}}:" class="actions">
     <button
-      class="btn bg-primary btn-sm"
-      {{action "removeQuestion"}}
+      class="btn bg-primary btn-sm" type="button" {{action "removeQuestion"}}
     >
       <i class="icon icon-minus"></i>
     </button>
diff --git a/lib/shared/addon/components/cluster-template-revision-upgrade-notification/component.js b/lib/shared/addon/components/cluster-template-revision-upgrade-notification/component.js
index b6ece51f1..96ec873e3 100644
--- a/lib/shared/addon/components/cluster-template-revision-upgrade-notification/component.js
+++ b/lib/shared/addon/components/cluster-template-revision-upgrade-notification/component.js
@@ -6,5 +6,5 @@ export default Component.extend({
   tagName:            'span',
   classNames:         ['cluster-template-revision-upgrade-notification'],
 
-  cluster:            null,
+  cluster: null,
 });
diff --git a/lib/shared/addon/components/code-block/component.js b/lib/shared/addon/components/code-block/component.js
index 4c2d9e6b0..5fc2ad73c 100644
--- a/lib/shared/addon/components/code-block/component.js
+++ b/lib/shared/addon/components/code-block/component.js
@@ -17,7 +17,7 @@ export default Component.extend({
   classNames:        ['line-numbers'],
   classNameBindings: ['languageClass', 'hide:hide', 'constrained:constrained'],
 
-  highlighted:        null,
+  highlighted: null,
 
   didReceiveAttrs() {
     this.highlightedChanged();
@@ -35,6 +35,8 @@ export default Component.extend({
     if ( lang ) {
       return `language-${ lang }`;
     }
+
+    return 'language-javascript';
   }),
 
 });
diff --git a/lib/shared/addon/components/confirm-delete/component.js b/lib/shared/addon/components/confirm-delete/component.js
index 623509033..5fe38cdf0 100644
--- a/lib/shared/addon/components/confirm-delete/component.js
+++ b/lib/shared/addon/components/confirm-delete/component.js
@@ -124,7 +124,7 @@ export default Component.extend(ModalBase, {
     return hasSomeOfResourceType.call(this, C.RESOURCE_TYPES.CLUSTER);
   }),
 
-  resourceType: computed('resources', function() {
+  resourceType: computed('hasClusterResourceType', 'hasNamespaceResourceType', 'hasProjectResourceType', 'resources', function() {
     if (get(this, 'hasNamespaceResourceType')) {
       return C.RESOURCE_TYPES.NAMESPACE;
     }
diff --git a/lib/shared/addon/components/confirm-delete/template.hbs b/lib/shared/addon/components/confirm-delete/template.hbs
index b45b9d27d..538b9f518 100644
--- a/lib/shared/addon/components/confirm-delete/template.hbs
+++ b/lib/shared/addon/components/confirm-delete/template.hbs
@@ -96,10 +96,10 @@
 {{/if}}
 
 <div class="footer-actions">
-  <button {{action "confirm"}} class="btn bg-error">
+  <button class="btn bg-error" type="button" {{action "confirm"}}>
     {{t "confirmDelete.confirmAction"}}
   </button>
-  <button {{action "cancel"}} class="btn bg-transparent">
+  <button class="btn bg-transparent" type="button" {{action "cancel"}}>
     {{t "confirmDelete.cancelAction"}}
   </button>
 </div>
diff --git a/lib/shared/addon/components/container-shell/component.js b/lib/shared/addon/components/container-shell/component.js
index 12dc5365d..d390cd334 100644
--- a/lib/shared/addon/components/container-shell/component.js
+++ b/lib/shared/addon/components/container-shell/component.js
@@ -8,7 +8,7 @@ import { next } from '@ember/runloop';
 import layout from './template';
 import Component from '@ember/component';
 import { Terminal } from 'xterm';
-import * as fit from 'xterm/lib/addons/fit/fit';
+import { FitAddon } from 'xterm-addon-fit';
 import $ from 'jquery';
 
 const DEFAULT_COMMAND = ['/bin/sh', '-c', 'TERM=xterm-256color; export TERM; [ -x /bin/bash ] && ([ -x /usr/bin/script ] && /usr/bin/script -q -c "/bin/bash" /dev/null || exec /bin/bash) || exec /bin/sh'];
@@ -43,15 +43,15 @@ export default Component.extend(ThrottledResize, {
   },
 
   didInsertElement() {
-    this._super();
+    this._super(...arguments);
 
     next(this, 'exec');
   },
 
   willDestroyElement() {
-    this.disconnect();
+    this.disconnect(true);
 
-    this._super();
+    this._super(...arguments);
   },
 
   actions: {
@@ -74,7 +74,7 @@ export default Component.extend(ThrottledResize, {
     return (get(this, 'instance.containers') || []).filterBy('canShell', true);
   }),
 
-  status:          statusMap.connecting,
+  status: statusMap.connecting,
 
   _bootstrap() {
     set(this, 'containerName', get(this, 'containerName') || get(this, 'instance.containers.firstObject.name'));
@@ -85,7 +85,9 @@ export default Component.extend(ThrottledResize, {
     const socket = get(this, 'socket');
 
     if (term && socket) {
-      term.fit()
+      try {
+        this.fitAddon.fit();
+      } catch (error) { }
 
       socket.send(`4${ AWS.util.base64.encode(JSON.stringify({
         Width:  term.cols,
@@ -95,7 +97,9 @@ export default Component.extend(ThrottledResize, {
   },
 
   onResize() {
-    this.fit();
+    try {
+      this.fitAddon.fit();
+    } catch (error) { }
   },
 
   exec() {
@@ -178,7 +182,7 @@ export default Component.extend(ThrottledResize, {
     socket.onopen = () => {
       set(this, 'status', statusMap.init);
 
-      Terminal.applyAddon(fit)
+      const fitAddon = new FitAddon();
 
       var term = new Terminal({
         cursorBlink: true,
@@ -186,15 +190,18 @@ export default Component.extend(ThrottledResize, {
         fontSize:    12,
       });
 
-      set(this, 'term', term);
+      term.loadAddon(fitAddon)
 
-      term.on('data', (data) => {
+      set(this, 'term', term);
+      set(this, 'fitAddon', fitAddon);
+
+      term.onData((data) => {
         socket.send(`0${ AWS.util.base64.encode(data) }`);
       });
 
-      term.open($('.shell-body')[0], true);
+      term.open($('.shell-body')[0]);
 
-      this.fit();
+      fitAddon.fit();
 
       term.focus();
 
@@ -218,7 +225,7 @@ export default Component.extend(ThrottledResize, {
     };
   },
 
-  disconnect() {
+  disconnect(destroying = false) {
     setProperties(this, {
       status:     statusMap.closed,
       userClosed: true,
@@ -227,9 +234,11 @@ export default Component.extend(ThrottledResize, {
     const term = get(this, 'term');
 
     if (term) {
-      term.destroy();
+      term.dispose();
 
-      set(this, 'term', null);
+      if (!destroying) {
+        set(this, 'term', null);
+      }
     }
 
     const socket = get(this, 'socket');
@@ -237,7 +246,9 @@ export default Component.extend(ThrottledResize, {
     if (socket) {
       socket.close();
 
-      set(this, 'socket', null);
+      if (!destroying) {
+        set(this, 'socket', null);
+      }
     }
 
     if (this.disconnected) {
diff --git a/lib/shared/addon/components/copy-inline/component.js b/lib/shared/addon/components/copy-inline/component.js
index 447acd13f..b50820203 100644
--- a/lib/shared/addon/components/copy-inline/component.js
+++ b/lib/shared/addon/components/copy-inline/component.js
@@ -45,7 +45,7 @@ export default Component.extend({
       }, DELAY);
     },
   },
-  isSupported: computed('clipboardText', function() {
+  isSupported: computed('clipboardText.length', function() {
     return this.get('clipboardText.length') && (!isSafari || document.queryCommandSupported('copy'));
   }),
 
diff --git a/lib/shared/addon/components/copy-to-clipboard/component.js b/lib/shared/addon/components/copy-to-clipboard/component.js
index 32f9acde1..5ff171724 100644
--- a/lib/shared/addon/components/copy-to-clipboard/component.js
+++ b/lib/shared/addon/components/copy-to-clipboard/component.js
@@ -53,11 +53,11 @@ export default Component.extend({
     },
   },
 
-  isSupported: computed('clipboardText', function() {
+  isSupported: computed('clipboardText.length', function() {
     return get(this, 'clipboardText.length') && (!isSafari || document.queryCommandSupported('copy'));
   }),
 
-  buttonClasses: computed('status', function() {
+  buttonClasses: computed('buttonClass', 'color', 'size', 'status', function() {
     let status = get(this, 'status');
     let out = `btn ${ get(this, 'color') }`;
 
diff --git a/lib/shared/addon/components/cru-cloud-provider/component.js b/lib/shared/addon/components/cru-cloud-provider/component.js
index 6daba66be..8434bc57a 100644
--- a/lib/shared/addon/components/cru-cloud-provider/component.js
+++ b/lib/shared/addon/components/cru-cloud-provider/component.js
@@ -31,7 +31,7 @@ export default Component.extend({
   azureDefaults,
   azureDescriptions:     AzureInfo,
 
-  configName:            alias('cluster.rancherKubernetesEngineConfig.cloudProvider.name'),
+  configName: alias('cluster.rancherKubernetesEngineConfig.cloudProvider.name'),
 
   init() {
     this._super(...arguments);
@@ -107,11 +107,7 @@ export default Component.extend({
   }),
 
   selectedCloudProviderOverrideAvailable: computed(
-    'selectedCloudProvider',
-    'clusterTemplateCreate',
-    'applyClusterTemplate',
-    'clusterTemplateRevision.questions',
-    'clusterTemplateRevision.id',
+    'applyClusterTemplate', 'clusterTemplateCreate', 'clusterTemplateRevision.{id,questions}', 'configName', 'destroyed', 'destroying', 'selectedCloudProvider',
     function() {
       let { clusterTemplateRevision, applyClusterTemplate } = this;
 
diff --git a/lib/shared/addon/components/cru-cluster-template/component.js b/lib/shared/addon/components/cru-cluster-template/component.js
index 729f0cb09..7d22cca58 100644
--- a/lib/shared/addon/components/cru-cluster-template/component.js
+++ b/lib/shared/addon/components/cru-cluster-template/component.js
@@ -14,7 +14,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
 
   layout,
 
-  classNames:                 ['horizontal-form', 'container-fluid'],
+  classNames: ['horizontal-form', 'container-fluid'],
 
   clusterTemplate:            null,
   clusterTemplateRevision:    null,
diff --git a/lib/shared/addon/components/cru-cluster/component.js b/lib/shared/addon/components/cru-cluster/component.js
index 170a49813..a15f34aef 100644
--- a/lib/shared/addon/components/cru-cluster/component.js
+++ b/lib/shared/addon/components/cru-cluster/component.js
@@ -146,12 +146,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
   }),
 
   providerChoices: computed(
-    'isEdit',
-    'cluster.rancherKubernetesEngineConfig',
-    'nodeDrivers.[]',
-    'schemaReloaded',
-    'intl.locale',
-    'kontainerDrivers.[]',
+    'app.proxyEndpoint', 'cluster.rancherKubernetesEngineConfig', 'intl.locale', 'isEdit', 'kontainerDrivers.[]', 'model.nodeDrivers', 'nodeDrivers.[]', 'schemaReloaded',
     function() {
       const { kontainerDrivers, intl  } = this;
       const { builtIn, custom } = kontainerDrivers;
@@ -298,7 +293,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
       return out;
     }),
 
-  driverInfo: computed('provider', 'router.currentRoute.queryParams', function() {
+  driverInfo: computed('provider', 'providerChoices', 'router.currentRoute.queryParams', function() {
     let name    = get(this, 'provider');
     const { router } = this;
     const importProvider = get(router, 'currentRoute.queryParams.importProvider');
@@ -323,6 +318,15 @@ export default Component.extend(ViewNewEdit, ChildHook, {
         nodePool:        entry.nodePool || false
       };
     }
+
+    return {
+      name:            'unknown',
+      displayName:     'unknown',
+      driverComponent: null,
+      nodeWhich:       'unknown',
+      preSave:         false,
+      nodePool:        false
+    };
   }),
 
   showDriverComponent: computed('routeLoading', 'provider', 'router.currentRoute.queryParams', function() {
@@ -365,7 +369,7 @@ export default Component.extend(ViewNewEdit, ChildHook, {
         const clone = originalCluster.clone();
 
         setProperties(this, {
-          cluster:         clone,
+          cluster: clone,
           originalCluster,
         });
 
diff --git a/lib/shared/addon/components/cru-node-pools/component.js b/lib/shared/addon/components/cru-node-pools/component.js
index 34d97cedb..b88d401cb 100644
--- a/lib/shared/addon/components/cru-node-pools/component.js
+++ b/lib/shared/addon/components/cru-node-pools/component.js
@@ -82,7 +82,7 @@ export default Component.extend({
   nodePools:     null,
   errors:        null,
 
-  taintCapabilites:   alias('scope.currentCluster.capabilities.taintSupport'),
+  taintCapabilites: alias('scope.currentCluster.capabilities.taintSupport'),
 
   init() {
     this._super(...arguments);
@@ -218,7 +218,7 @@ export default Component.extend({
       this.setNodePoolErrors(errors);
     }
   }),
-  showIamWarning: computed('driver', 'nodePools.@each.{nodeTemplateId}', 'cluster.rancherKubernetesEngineConfig.cloudProvider.name', function() {
+  showIamWarning: computed('driver', 'nodePools.@each.nodeTemplateId', 'cluster.rancherKubernetesEngineConfig.cloudProvider.name', function() {
     const cloudProvider = get(this, 'cluster.rancherKubernetesEngineConfig.cloudProvider.name');
     const driver = get(this, 'driver');
 
diff --git a/lib/shared/addon/components/cru-node-pools/template.hbs b/lib/shared/addon/components/cru-node-pools/template.hbs
index fed085d3c..ac1256e8d 100644
--- a/lib/shared/addon/components/cru-node-pools/template.hbs
+++ b/lib/shared/addon/components/cru-node-pools/template.hbs
@@ -54,7 +54,7 @@
 {{/if}}
 
 <div class="mt-20">
-  <button class="btn bg-primary icon-btn p-0" {{action "addPool"}}>
+  <button class="btn bg-primary icon-btn p-0" type="button" {{action "addPool"}}>
     <span class="darken">
       <i class="icon icon-plus text-small"/>
     </span>
diff --git a/lib/shared/addon/components/cru-private-registry/component.js b/lib/shared/addon/components/cru-private-registry/component.js
index 67a2750f9..f1f301f36 100644
--- a/lib/shared/addon/components/cru-private-registry/component.js
+++ b/lib/shared/addon/components/cru-private-registry/component.js
@@ -10,7 +10,7 @@ import { alias, gt } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 
 export default Component.extend({
-  globalStore:       service(),
+  globalStore: service(),
 
   layout,
 
diff --git a/lib/shared/addon/components/cru-private-registry/template.hbs b/lib/shared/addon/components/cru-private-registry/template.hbs
index 7dc0915dd..b2bc29653 100644
--- a/lib/shared/addon/components/cru-private-registry/template.hbs
+++ b/lib/shared/addon/components/cru-private-registry/template.hbs
@@ -170,7 +170,7 @@
         </div>
       </div>
       <div class="col span-1">
-        <button class="btn bg-primary btn-sm mt-25" {{action "removeRegistry" privateRegistry}}>
+        <button class="btn bg-primary btn-sm mt-25" type="button" {{action "removeRegistry" privateRegistry}}>
           <i class="icon icon-minus"/>
         </button>
       </div>
@@ -246,7 +246,7 @@
           </div>
         </div>
         <div class="col span-1">
-          <button class="btn bg-primary btn-sm mt-25" {{action "removeRegistry" reg}}>
+          <button class="btn bg-primary btn-sm mt-25" type="button" {{action "removeRegistry" reg}}>
             <i class="icon icon-minus"/>
           </button>
         </div>
diff --git a/lib/shared/addon/components/custom-catalog/component.js b/lib/shared/addon/components/custom-catalog/component.js
index 5317e9ab5..32bcd467f 100644
--- a/lib/shared/addon/components/custom-catalog/component.js
+++ b/lib/shared/addon/components/custom-catalog/component.js
@@ -52,27 +52,27 @@ export default Component.extend({
   paging:       true,
   rightActions: true,
 
-  library: computed('catalogs.@each.{name}', function() {
+  library: computed('catalogs.@each.name', function() {
     return get(this, 'catalogs').findBy('name', C.CATALOG.LIBRARY_KEY);
   }),
 
-  helm3Stable: computed('catalogs.@each.{name}', function() {
+  helm3Stable: computed('catalogs.@each.name', function() {
     return get(this, 'catalogs').findBy('name', C.CATALOG.HELM_3_LIBRARY_KEY)
   }),
 
-  helmStable: computed('catalogs.@each.{name}', function() {
+  helmStable: computed('catalogs.@each.name', function() {
     return get(this, 'catalogs').findBy('name', C.CATALOG.HELM_STABLE_KEY)
   }),
 
-  helmIncubator: computed('catalogs.@each.{name}', function() {
+  helmIncubator: computed('catalogs.@each.name', function() {
     return get(this, 'catalogs').findBy('name', C.CATALOG.HELM_INCUBATOR_KEY)
   }),
 
-  alibabaAppHub: computed('catalogs.@each.{name}', function() {
+  alibabaAppHub: computed('catalogs.@each.name', function() {
     return get(this, 'catalogs').findBy('name', C.CATALOG.ALIBABA_APP_HUB_KEY)
   }),
 
-  rows: computed('catalogs.@each.{id,name,url}', function() {
+  rows: computed('alibabaAppHub', 'catalogs.@each.{id,name,url}', 'helm3Stable', 'helmIncubator', 'helmStable', 'library', 'mode', function() {
     const out = get(this, 'catalogs').slice();
 
     if ( get(this, 'mode') === 'global' ) {
diff --git a/lib/shared/addon/components/custom-catalog/template.hbs b/lib/shared/addon/components/custom-catalog/template.hbs
index cfe71fc9d..3dbb426f2 100644
--- a/lib/shared/addon/components/custom-catalog/template.hbs
+++ b/lib/shared/addon/components/custom-catalog/template.hbs
@@ -10,7 +10,7 @@
      as |sortable kind row dt|
 }}
   {{#if (eq kind "row")}}
-    <tr class="main-row {{if (not row.id) "text-muted"}}">
+    <tr class="main-row {{unless row.id "text-muted"}}">
       <td class="row-check" valign="middle" style="padding-top: 2px;">
         {{check-box nodeId=row.id}}
       </td>
diff --git a/lib/shared/addon/components/drain-node/component.js b/lib/shared/addon/components/drain-node/component.js
index 23f013a07..338ab47f8 100644
--- a/lib/shared/addon/components/drain-node/component.js
+++ b/lib/shared/addon/components/drain-node/component.js
@@ -19,7 +19,7 @@ export default Component.extend({
   proxyTimeout:      null,
   unlimitedTimeout:  false,
 
-  view:      computed.not('editable'),
+  view: computed.not('editable'),
   init() {
     this._super(...arguments);
     const force = get(this, 'selection.force');
@@ -50,12 +50,12 @@ export default Component.extend({
 
     set(this, 'selection.timeout', newTimeout);
   }),
-  gracePeriodForPods: computed('selection.usePodGracePeriod', 'selection.gracePeriod', function() {
+  gracePeriodForPods: computed('selection.{gracePeriod,usePodGracePeriod}', 'usePodGracePeriod', function() {
     return this.usePodGracePeriod
       ? this.intl.t('drainNode.gracePeriod.default')
       : this.intl.t('drainNode.gracePeriod.view.custom', { seconds: this.selection.gracePeriod });
   }),
-  timeout: computed('selection.unlimitedTimeout', 'selection.timeout', function() {
+  timeout: computed('selection.{timeout,unlimitedTimeout}', 'unlimitedTimeout', function() {
     return this.unlimitedTimeout
       ? this.intl.t('drainNode.timeout.default')
       : this.intl.t('drainNode.timeout.view.custom', { seconds: this.selection.timeout });
diff --git a/lib/shared/addon/components/error-sub-row/component.js b/lib/shared/addon/components/error-sub-row/component.js
index 540f6eca4..86c498b42 100644
--- a/lib/shared/addon/components/error-sub-row/component.js
+++ b/lib/shared/addon/components/error-sub-row/component.js
@@ -9,9 +9,9 @@ export default Component.extend({
   leftColspan:  1,
   rightColspan: 1,
 
-  tagName:      '',
+  tagName: '',
 
-  mainColspan: computed('fullColspan', function() {
+  mainColspan: computed('fullColspan', 'leftColspan', 'rightColspan', function() {
     return (this.get('fullColspan') || 2) - this.get('leftColspan') - this.get('rightColspan');
   }),
 });
diff --git a/lib/shared/addon/components/form-auth-cloud-credential/template.hbs b/lib/shared/addon/components/form-auth-cloud-credential/template.hbs
index 66b2e257b..d5e4abdad 100644
--- a/lib/shared/addon/components/form-auth-cloud-credential/template.hbs
+++ b/lib/shared/addon/components/form-auth-cloud-credential/template.hbs
@@ -29,8 +29,7 @@
       <button
         class="btn btn-sm bg-default inline-block"
         style="margin-top: -5px;"
-        disabled={{if showAddCloudCredential true}}
-        {{action "addCloudCredential"}}
+        disabled={{if showAddCloudCredential true}} type="button" {{action "addCloudCredential"}}
       >
         {{t "formAuthCloudCredential.add"}}
       </button>
diff --git a/lib/shared/addon/components/form-certificate-row/template.hbs b/lib/shared/addon/components/form-certificate-row/template.hbs
index d850c7d0f..9422c0b37 100644
--- a/lib/shared/addon/components/form-certificate-row/template.hbs
+++ b/lib/shared/addon/components/form-certificate-row/template.hbs
@@ -1,7 +1,7 @@
 {{#if editing}}
   <div class="row">
     <div class="pull-right">
-      <button class="btn bg-transparent text-small vertical-middle" {{action (action removeCert cert)}}>
+      <button class="btn bg-transparent text-small vertical-middle" type="button" {{action (action removeCert cert)}}>
         {{t 'formSslTermination.removeCertLabel'}}
       </button>
     </div>
diff --git a/lib/shared/addon/components/form-contextual-select-array/component.js b/lib/shared/addon/components/form-contextual-select-array/component.js
index eb0d78db4..6d0620df2 100644
--- a/lib/shared/addon/components/form-contextual-select-array/component.js
+++ b/lib/shared/addon/components/form-contextual-select-array/component.js
@@ -42,7 +42,7 @@ export default Component.extend({
       return value;
     }
   }),
-  canAddMore: computed('filteredContent', function() {
+  canAddMore: computed('filteredContent.length', 'values.length', function() {
     return get(this, 'filteredContent.length') > 1
       || get(this, 'filteredContent.length') > 0 && get(this, 'values.length') === 0;
   }),
@@ -61,7 +61,7 @@ export default Component.extend({
         return option ? option.label : '';
       });
   }),
-  filteredContent: computed('asyncContent.value', 'values.@each', 'values.[]', 'values', function() {
+  filteredContent: computed('asyncContent.value', 'contentFilter', 'values.[]', function() {
     if (!get(this, 'contentFilter')) {
       return get(this, 'asyncContent.value') || [];
     }
diff --git a/lib/shared/addon/components/form-contextual-select-array/template.hbs b/lib/shared/addon/components/form-contextual-select-array/template.hbs
index 51c1381de..8e31f5168 100644
--- a/lib/shared/addon/components/form-contextual-select-array/template.hbs
+++ b/lib/shared/addon/components/form-contextual-select-array/template.hbs
@@ -18,8 +18,7 @@
         <td width="30">
           {{#if editing}}
             <button
-              class="btn bg-primary btn-sm"
-              {{action "onRemove" index}}>
+              class="btn bg-primary btn-sm" type="button" {{action "onRemove" index}}>
               <i class="icon icon-minus"/>
               <span class="sr-only">
                 {{t "generic.remove"}}
@@ -43,8 +42,7 @@
         <td width="30">
           {{#if editing}}
             <button
-              class="btn bg-primary btn-sm"
-              {{action "onRemove" lastIndex}}>
+              class="btn bg-primary btn-sm" type="button" {{action "onRemove" lastIndex}}>
               <i class="icon icon-minus"/>
               <span class="sr-only">
                 {{t "generic.remove"}}
@@ -59,9 +57,7 @@
 
 {{#if editing}}
   <button
-    class={{addButtonClass}}
-    {{action "onAdd"}}
-    disabled={{not canAddMore}}
+    class={{addButtonClass}} disabled={{not canAddMore}} type="button" {{action "onAdd"}}
   >
     <span class="darken">
       <i class="icon icon-plus text-small"/>
diff --git a/lib/shared/addon/components/form-engine-opts/component.js b/lib/shared/addon/components/form-engine-opts/component.js
index f4154872c..f6a2119a3 100644
--- a/lib/shared/addon/components/form-engine-opts/component.js
+++ b/lib/shared/addon/components/form-engine-opts/component.js
@@ -27,7 +27,7 @@ export default Component.extend({
       set(this, 'machine.engineInstallURL', url);
     }
   },
-  engineUrlChoices: computed('intl.locale', `settings.${ C.SETTING.ENGINE_URL }`, function() {
+  engineUrlChoices: computed(`settings.${ C.SETTING.ENGINE_URL }`, 'defaultEngine', 'intl.locale', function() {
     let defaultEngine = get(this, 'defaultEngine');
     let out           = [
       {
diff --git a/lib/shared/addon/components/form-engine-opts/template.hbs b/lib/shared/addon/components/form-engine-opts/template.hbs
index 4f67548a9..f648379c1 100644
--- a/lib/shared/addon/components/form-engine-opts/template.hbs
+++ b/lib/shared/addon/components/form-engine-opts/template.hbs
@@ -20,43 +20,47 @@
             placeholder=(t "formEngineOpts.engineInstallUrl.placeholder")
           }}
           <div class="input-group-btn bg-default">
-            {{#basic-dropdown
-                 horizontalPosition="right"
-                 as |dd|}}
-              {{#dd.trigger class="btn bg-default"}}
+            <BasicDropdown @horizontalPosition="right" as |dd|>
+              <dd.Trigger class="btn bg-default">
                 <i class="icon icon-chevron-down"></i>
-              {{/dd.trigger}}
-
-              {{#dd.content}}
+              </dd.Trigger>
+              <dd.Content>
                 {{#each engineUrlChoices as |choice|}}
-                  <li>
-                    <a href="#" {{action "setEngine" choice.value}}>{{choice.label}}</a>
+                  <li {{action dd.actions.close}}>
+                    <a href="#" {{action "setEngine" choice.value}}>
+                      {{choice.label}}
+                    </a>
                   </li>
                 {{/each}}
-              {{/dd.content}}
-
-            {{/basic-dropdown}}
+              </dd.Content>
+            </BasicDropdown>
           </div>
         </div>
       </div>
     </div>
     <hr />
   {{/if}}
-
   <div class="row inline-form">
     <div class="col span-2 col-inline">
-      <label class="acc-label">{{t "formEngineOpts.engineStorageDriver.label"}}</label>
+      <label class="acc-label">
+        {{t "formEngineOpts.engineStorageDriver.label"}}
+      </label>
     </div>
     <div class="col span-10">
-      {{input type="text" value=machine.engineStorageDriver classNames="form-control" placeholder=(t "formEngineOpts.engineStorageDriver.placeholder")}}
+      {{input
+        type="text"
+        value=machine.engineStorageDriver
+        classNames="form-control"
+        placeholder=(t "formEngineOpts.engineStorageDriver.placeholder")
+      }}
     </div>
   </div>
-
-  <hr/>
-
+  <hr />
   <div class="row inline-form">
     <div class="col span-2 col-inline">
-      <label class="acc-label">{{t "formEngineOpts.engineOpts.label"}}</label>
+      <label class="acc-label">
+        {{t "formEngineOpts.engineOpts.label"}}
+      </label>
     </div>
     <div class="col span-10">
       {{form-key-value
@@ -68,12 +72,12 @@
       }}
     </div>
   </div>
-
   <hr />
-
   <div class="row inline-form">
     <div class="col span-2 col-inline">
-      <label class="acc-label">{{t "formEngineOpts.engineLabels.label"}}</label>
+      <label class="acc-label">
+        {{t "formEngineOpts.engineLabels.label"}}
+      </label>
     </div>
     <div class="col span-10">
       {{form-key-value
@@ -84,12 +88,12 @@
       }}
     </div>
   </div>
-
   <hr />
-
   <div class="row inline-form">
     <div class="col span-2 col-inline">
-      <label class="acc-label">{{t "formEngineOpts.engineEnv.label"}}</label>
+      <label class="acc-label">
+        {{t "formEngineOpts.engineEnv.label"}}
+      </label>
     </div>
     <div class="col span-10">
       {{form-key-value
@@ -102,12 +106,12 @@
       }}
     </div>
   </div>
-
   <hr />
-
   <div class="row inline-form">
     <div class="col span-2 col-inline">
-      <label class="acc-label">{{t "formEngineOpts.engineInsecureRegistry.label"}}</label>
+      <label class="acc-label">
+        {{t "formEngineOpts.engineInsecureRegistry.label"}}
+      </label>
     </div>
     <div class="col span-10">
       {{form-value-array
@@ -119,12 +123,12 @@
       }}
     </div>
   </div>
-
   <hr />
-
   <div class="row inline-form">
     <div class="col span-2 col-inline">
-      <label class="acc-label">{{t "formEngineOpts.engineRegistryMirror.label"}}</label>
+      <label class="acc-label">
+        {{t "formEngineOpts.engineRegistryMirror.label"}}
+      </label>
     </div>
     <div class="col span-10">
       {{form-value-array
@@ -136,4 +140,4 @@
       }}
     </div>
   </div>
-{{/accordion-list-item}}
+{{/accordion-list-item}}
\ No newline at end of file
diff --git a/lib/shared/addon/components/form-gke-taints/component.js b/lib/shared/addon/components/form-gke-taints/component.js
index d4859e33c..3918405de 100644
--- a/lib/shared/addon/components/form-gke-taints/component.js
+++ b/lib/shared/addon/components/form-gke-taints/component.js
@@ -14,7 +14,7 @@ export default Component.extend({
   editing:             false,
   showWarning:         false,
 
-  taints:               null,
+  taints: null,
 
   actions: {
     addTaint() {
diff --git a/lib/shared/addon/components/form-gke-taints/template.hbs b/lib/shared/addon/components/form-gke-taints/template.hbs
index 03f9367f9..9386e0b0e 100644
--- a/lib/shared/addon/components/form-gke-taints/template.hbs
+++ b/lib/shared/addon/components/form-gke-taints/template.hbs
@@ -56,7 +56,7 @@
           </td>
 
           <td>
-            <button class="btn bg-primary btn-sm" {{action "removeTaint" taint}}>
+            <button class="btn bg-primary btn-sm" type="button" {{action "removeTaint" taint}}>
               <i class="icon icon-minus"/><span class="sr-only">{{t "generic.remove"}}</span>
             </button>
           </td>
@@ -72,7 +72,7 @@
 
 {{#if editable}}
   <div>
-    <button class="btn bg-link icon-btn p-0" {{action "addTaint"}}>
+    <button class="btn bg-link icon-btn p-0" type="button" {{action "addTaint"}}>
       <span class="darken"><i class="icon icon-plus text-small"/></span>
       <span>{{t "clusterNew.googlegke.taints.addAction"}}</span>
     </button>
diff --git a/lib/shared/addon/components/form-ingress-backends/component.js b/lib/shared/addon/components/form-ingress-backends/component.js
index d5fb8d774..3eb2a12a9 100644
--- a/lib/shared/addon/components/form-ingress-backends/component.js
+++ b/lib/shared/addon/components/form-ingress-backends/component.js
@@ -63,7 +63,7 @@ export default Component.extend({
     });
   }),
 
-  hasServiceTargets: computed('pathArray.@each.backendType}', function() {
+  hasServiceTargets: computed('pathArray.@each.backendType', function() {
     return !!get(this, 'pathArray').findBy('backendType', 'service');
   }),
 
diff --git a/lib/shared/addon/components/form-ingress-backends/template.hbs b/lib/shared/addon/components/form-ingress-backends/template.hbs
index af98c83c3..13d34101e 100644
--- a/lib/shared/addon/components/form-ingress-backends/template.hbs
+++ b/lib/shared/addon/components/form-ingress-backends/template.hbs
@@ -4,11 +4,11 @@
 <div class="clearfix">
   {{#if editing}}
     <label class="acc-label">{{t 'formIngressBackends.label'}}</label>
-    <button class="btn bg-link icon-btn" {{action "addPath" "service"}}>
+    <button class="btn bg-link icon-btn" type="button" {{action "addPath" "service"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t 'formIngressBackends.addServiceLabel'}}</span>
     </button>
-    <button class="btn bg-link icon-btn ml-20" {{action "addPath" "workload"}}>
+    <button class="btn bg-link icon-btn ml-20" type="button" {{action "addPath" "workload"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t 'formIngressBackends.addWorkloadLabel'}}</span>
     </button>
@@ -90,7 +90,7 @@
 
           {{#if editing}}
             <td class="text-right">
-              <button class="btn bg-primary btn-sm" {{action "removePath" path}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+              <button class="btn bg-primary btn-sm" type="button" {{action "removePath" path}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
             </td>
           {{/if}}
         </tr>
diff --git a/lib/shared/addon/components/form-ingress-rows/component.js b/lib/shared/addon/components/form-ingress-rows/component.js
index 2aa4ea765..bd703513b 100644
--- a/lib/shared/addon/components/form-ingress-rows/component.js
+++ b/lib/shared/addon/components/form-ingress-rows/component.js
@@ -11,7 +11,7 @@ export default Component.extend({
 
   layout,
 
-  mode:                           'automatic',
+  mode: 'automatic',
 
   rule:                           null,
   rules:                          null,
@@ -91,7 +91,7 @@ export default Component.extend({
     return get(this, 'mode') === 'default';
   }),
 
-  defaultDisabled: computed('rules.@each.defaultBackend', function() {
+  defaultDisabled: computed('ingress.defaultBackend', 'rule.defaultBackend', 'rules.@each.defaultBackend', function() {
     const { ingressControllersCapabilities, selectedProvider } = this;
 
     const def = get(this, 'ingress.defaultBackend');
diff --git a/lib/shared/addon/components/form-ingress-rows/template.hbs b/lib/shared/addon/components/form-ingress-rows/template.hbs
index 31e6287f7..5d3df9bd3 100644
--- a/lib/shared/addon/components/form-ingress-rows/template.hbs
+++ b/lib/shared/addon/components/form-ingress-rows/template.hbs
@@ -3,11 +3,11 @@
     {{#if (and editing (gt rules.length 1))}}
       <div class="pull-right">
         {{#if (lte rules.length 1 )}}
-          <button class="btn btn-disabled-transparent text-small vertical-middle" disabled="true">
+          <button class="btn btn-disabled-transparent text-small vertical-middle" disabled="true" type="button">
             {{t 'formIngress.removeRuleLabel'}}
           </button>
         {{else}}
-          <button class="btn bg-transparent text-small vertical-middle" {{action "removeRule" rule}}>
+          <button class="btn bg-transparent text-small vertical-middle" type="button" {{action "removeRule" rule}}>
             {{t 'formIngress.removeRuleLabel'}}
           </button>
         {{/if}}
diff --git a/lib/shared/addon/components/form-ingress-rule/template.hbs b/lib/shared/addon/components/form-ingress-rule/template.hbs
index 79a94e19c..cf0d1c785 100644
--- a/lib/shared/addon/components/form-ingress-rule/template.hbs
+++ b/lib/shared/addon/components/form-ingress-rule/template.hbs
@@ -17,7 +17,7 @@
 
 {{#if editing}}
   <div class="row">
-    <button class="btn bg-link icon-btn pull-right" {{action "addRule"}}>
+    <button class="btn bg-link icon-btn pull-right" type="button" {{action "addRule"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t "formIngress.addRuleLabel"}}</span>
     </button>
diff --git a/lib/shared/addon/components/form-key-value/template.hbs b/lib/shared/addon/components/form-key-value/template.hbs
index 86a0938c4..71878ee11 100644
--- a/lib/shared/addon/components/form-key-value/template.hbs
+++ b/lib/shared/addon/components/form-key-value/template.hbs
@@ -7,7 +7,7 @@
 
   {{#if (and allowUpload editing)}}
     <div class="pull-right">
-      <button class="btn btn-sm bg-primary" {{action "upload"}}>{{t "uploadFile.label"}} <span class="icon icon-upload"></span></button>
+      <button class="btn btn-sm bg-primary" type="button" {{action "upload"}}>{{t "uploadFile.label"}} <span class="icon icon-upload"></span></button>
     </div>
   {{/if}}
 </div>
@@ -103,9 +103,7 @@
           <td class="valign-top text-right">
             {{#if (and editing allowRemove)}}
               <button
-                class="btn bg-primary btn-sm"
-                {{action "remove" row}}
-                disabled={{eq row.editable false}}
+                class="btn bg-primary btn-sm" disabled={{eq row.editable false}} type="button" {{action "remove" row}}
               >
                 <i class="icon icon-minus"/>
                 <span class="sr-only">
@@ -134,7 +132,7 @@
     </div>
   {{/if}}
   <div>
-    <button class="btn bg-link icon-btn p-0" {{action "add"}}>
+    <button class="btn bg-link icon-btn p-0" type="button" {{action "add"}}>
       <span class="darken"><i class="icon icon-plus text-small"/></span>
       <span>{{t addActionLabel}}</span>
     </button>
diff --git a/lib/shared/addon/components/form-labels-annotations/component.js b/lib/shared/addon/components/form-labels-annotations/component.js
index 68f550da4..2e52e5145 100644
--- a/lib/shared/addon/components/form-labels-annotations/component.js
+++ b/lib/shared/addon/components/form-labels-annotations/component.js
@@ -31,7 +31,7 @@ export default Component.extend(ManageLabels, {
 
   model: null,
 
-  statusClass:       null,
+  statusClass: null,
   init() {
     this._super(...arguments);
 
diff --git a/lib/shared/addon/components/form-labels-annotations/template.hbs b/lib/shared/addon/components/form-labels-annotations/template.hbs
index c30317abd..2379fcc8f 100644
--- a/lib/shared/addon/components/form-labels-annotations/template.hbs
+++ b/lib/shared/addon/components/form-labels-annotations/template.hbs
@@ -48,7 +48,7 @@
                   </td>
 
                   <td class="text-right">
-                    <button class="btn bg-primary btn-sm" {{action "removeLabel" label}} disabled={{eq label.readonly true}}><i class="icon icon-minus"/><span class="sr-only">{{t "generic.remove"}}</span></button>
+                    <button class="btn bg-primary btn-sm" disabled={{eq label.readonly true}} type="button" {{action "removeLabel" label}}><i class="icon icon-minus"/><span class="sr-only">{{t "generic.remove"}}</span></button>
                   </td>
                 </tr>
               {{/each}}
@@ -59,7 +59,7 @@
           </div>
         {{/if}}
 
-        <button class="btn bg-link icon-btn" {{action "addUserLabel"}}>
+        <button class="btn bg-link icon-btn" type="button" {{action "addUserLabel"}}>
           <span class="darken"><i class="icon icon-plus text-small"/></span>
           <span>{{t "formUserLabels.addAction"}}</span>
         </button>
diff --git a/lib/shared/addon/components/form-match-expressions/template.hbs b/lib/shared/addon/components/form-match-expressions/template.hbs
index 3dc117b54..829c81465 100644
--- a/lib/shared/addon/components/form-match-expressions/template.hbs
+++ b/lib/shared/addon/components/form-match-expressions/template.hbs
@@ -83,8 +83,7 @@
         <td class="valign-top text-right">
           {{#if editing}}
             <button
-              class="btn bg-primary btn-sm"
-              {{action "remove" row}}
+              class="btn bg-primary btn-sm" type="button" {{action "remove" row}}
             >
               <i class="icon icon-minus"/>
               <span class="sr-only">
@@ -107,8 +106,7 @@
 {{#if editing}}
   <div>
     <button
-      class="btn bg-link icon-btn p-0"
-      {{action "add"}}
+      class="btn bg-link icon-btn p-0" type="button" {{action "add"}}
     >
       <span class="darken">
         <i class="icon icon-plus text-small"/>
diff --git a/lib/shared/addon/components/form-members-catalog-access/component.js b/lib/shared/addon/components/form-members-catalog-access/component.js
index b5081d709..10ef5ee78 100644
--- a/lib/shared/addon/components/form-members-catalog-access/component.js
+++ b/lib/shared/addon/components/form-members-catalog-access/component.js
@@ -16,7 +16,7 @@ const MEMBERS_HEADERS = [
 ];
 
 export default Component.extend({
-  globalStore:      service(),
+  globalStore: service(),
 
   layout,
 
diff --git a/lib/shared/addon/components/form-members-catalog-access/template.hbs b/lib/shared/addon/components/form-members-catalog-access/template.hbs
index 3982bef84..5aaae78d8 100644
--- a/lib/shared/addon/components/form-members-catalog-access/template.hbs
+++ b/lib/shared/addon/components/form-members-catalog-access/template.hbs
@@ -33,8 +33,7 @@
           <td data-title="{{t "generic.actions"}}:" class="actions">
             <div class="p-5">
               <button
-                class="btn bg-primary btn-sm"
-                {{action removeMember member}}
+                class="btn bg-primary btn-sm" type="button" {{action removeMember member}}
               >
                 <i class="icon icon-minus"/>
               </button>
diff --git a/lib/shared/addon/components/form-members-global-access/component.js b/lib/shared/addon/components/form-members-global-access/component.js
index 68eb9ccae..b725c4fb7 100644
--- a/lib/shared/addon/components/form-members-global-access/component.js
+++ b/lib/shared/addon/components/form-members-global-access/component.js
@@ -22,7 +22,7 @@ const MEMBERS_HEADERS = [
 ];
 
 export default Component.extend({
-  globalStore:          service(),
+  globalStore: service(),
 
   layout,
 
diff --git a/lib/shared/addon/components/form-members-global-access/template.hbs b/lib/shared/addon/components/form-members-global-access/template.hbs
index 244668f50..c6e0f97a3 100644
--- a/lib/shared/addon/components/form-members-global-access/template.hbs
+++ b/lib/shared/addon/components/form-members-global-access/template.hbs
@@ -53,8 +53,7 @@
           <td data-title="{{t "generic.actions"}}:" class="actions">
             <div class="p-5">
               <button
-                class="btn bg-primary btn-sm"
-                {{action removeMember member}}
+                class="btn bg-primary btn-sm" type="button" {{action removeMember member}}
               >
                 <i class="icon icon-minus"/>
               </button>
diff --git a/lib/shared/addon/components/form-members/component.js b/lib/shared/addon/components/form-members/component.js
index 9139aca35..1b859d1b3 100644
--- a/lib/shared/addon/components/form-members/component.js
+++ b/lib/shared/addon/components/form-members/component.js
@@ -58,11 +58,11 @@ export default Component.extend({
     },
   },
 
-  defaultRoles: computed('roles.[]', function() {
+  defaultRoles: computed('roles.[]', 'type', function() {
     return get(this, 'roles').filterBy(`${ get(this, 'type') }CreatorDefault`);
   }),
 
-  filteredRoles: computed('roles.[]', function() {
+  filteredRoles: computed('roles.[]', 'type', function() {
     let pt = get(this, 'type');
 
     return get(this, 'roles').filterBy('hidden', false).filter((r) => get(r, 'context') === pt || get(r, 'context') === '' || !get(r, 'context') ).sortBy('displayName');
@@ -96,7 +96,7 @@ export default Component.extend({
               roleTemplateId: get(b, 'roleTemplateId'),
               id:             get(b, 'id')
             }],
-            isCustom:        get(b, 'isCustom'),
+            isCustom: get(b, 'isCustom'),
           };
 
           mOut.push(match);
diff --git a/lib/shared/addon/components/form-members/template.hbs b/lib/shared/addon/components/form-members/template.hbs
index 16beb903a..2d6f13df3 100644
--- a/lib/shared/addon/components/form-members/template.hbs
+++ b/lib/shared/addon/components/form-members/template.hbs
@@ -45,13 +45,13 @@
          aria-describedby="tooltip-base"
          tooltipFor="tooltipNoUsers"
       }}
-        <button class="btn bg-link icon-btn p-0" disabled=true>
+        <button class="btn bg-link icon-btn p-0" disabled=true type="button">
           <span class="darken"><i class="icon icon-plus text-small"/></span>
           <span>{{t "formMembers.members.addMember"}}</span>
         </button>
       {{/tooltip-element}}
     {{else}}
-      <button class="btn bg-link icon-btn p-0" {{action "addMember" "User"}}>
+      <button class="btn bg-link icon-btn p-0" type="button" {{action "addMember" "User"}}>
         <span class="darken"><i class="icon icon-plus text-small"/></span>
         <span>{{t "formMembers.members.addMember"}}</span>
       </button>
diff --git a/lib/shared/addon/components/form-name-description/component.js b/lib/shared/addon/components/form-name-description/component.js
index 849aedde2..4591fe8ed 100644
--- a/lib/shared/addon/components/form-name-description/component.js
+++ b/lib/shared/addon/components/form-name-description/component.js
@@ -95,27 +95,30 @@ export default Component.extend({
   }),
 
   nameChanged: observer('_name', function() {
-    once(() => {
-      let val = get(this, '_name');
-
-      if ( get(this, 'model') ) {
-        set(this, 'model.name', val);
-      } else {
-        set(this, 'name', val);
-      }
-    });
+    once(this, 'handleNameChanged');
   }),
 
   descriptionChanged: observer('_description', function() {
-    once(() => {
-      let val = get(this, '_description');
-
-      if ( get(this, 'model') ) {
-        set(this, 'model.description', val);
-      } else {
-        set(this, 'description', val);
-      }
-    });
+    once(this, 'handleDescriptionChanged');
   }),
 
+  handleNameChanged() {
+    let val = get(this, '_name');
+
+    if ( get(this, 'model') ) {
+      set(this, 'model.name', val);
+    } else {
+      set(this, 'name', val);
+    }
+  },
+
+  handleDescriptionChanged() {
+    let val = get(this, '_description');
+
+    if ( get(this, 'model') ) {
+      set(this, 'model.description', val);
+    } else {
+      set(this, 'description', val);
+    }
+  },
 });
diff --git a/lib/shared/addon/components/form-namespace/component.js b/lib/shared/addon/components/form-namespace/component.js
index 89cbf61ba..a511c5871 100644
--- a/lib/shared/addon/components/form-namespace/component.js
+++ b/lib/shared/addon/components/form-namespace/component.js
@@ -35,7 +35,7 @@ export default Component.extend({
   classNames: ['inline-form'],
   choices:    null,
 
-  isReuse:         equal('mode', REUSE),
+  isReuse: equal('mode', REUSE),
   init() {
     this._super(...arguments);
 
diff --git a/lib/shared/addon/components/form-network-config/component.js b/lib/shared/addon/components/form-network-config/component.js
index dfab507bf..11ff0de50 100644
--- a/lib/shared/addon/components/form-network-config/component.js
+++ b/lib/shared/addon/components/form-network-config/component.js
@@ -44,7 +44,7 @@ const {
 } = C.NETWORK_CONFIG_DEFAULTS;
 
 export default Component.extend({
-  globalStore:             service(),
+  globalStore: service(),
   layout,
 
   networkContent:          NETWORKCHOICES,
@@ -57,7 +57,7 @@ export default Component.extend({
 
   windowsSupportOverrideAvailable: false,
 
-  isEdit:                  equal('mode', 'edit'),
+  isEdit: equal('mode', 'edit'),
 
   init() {
     this._super(...arguments);
diff --git a/lib/shared/addon/components/form-project-targets/component.js b/lib/shared/addon/components/form-project-targets/component.js
index fbd63fcc2..e88dba9a9 100644
--- a/lib/shared/addon/components/form-project-targets/component.js
+++ b/lib/shared/addon/components/form-project-targets/component.js
@@ -20,7 +20,7 @@ export default Component.extend({
   globalStore: service(),
   layout,
 
-  classNames:  ['row'],
+  classNames: ['row'],
 
   headers:     HEADERS,
   projects:    null,
@@ -30,7 +30,7 @@ export default Component.extend({
   sortBy:      'clusterName',
   searchText:  '',
 
-  appTargets: computed('targets.@each.{projectId}', function() {
+  appTargets: computed('targets.@each.projectId', function() {
     return get(this, 'targets') || [];
   }),
 
diff --git a/lib/shared/addon/components/form-project-targets/template.hbs b/lib/shared/addon/components/form-project-targets/template.hbs
index a54746d76..c1c322aa9 100644
--- a/lib/shared/addon/components/form-project-targets/template.hbs
+++ b/lib/shared/addon/components/form-project-targets/template.hbs
@@ -59,8 +59,7 @@
           class="actions"
         >
           <button
-            class="btn bg-primary btn-sm"
-            {{action removeTarget target}}
+            class="btn bg-primary btn-sm" type="button" {{action removeTarget target}}
           >
             <i class="icon icon-minus"></i>
           </button>
diff --git a/lib/shared/addon/components/form-share-member/component.js b/lib/shared/addon/components/form-share-member/component.js
index 8497636b0..8e9e71a71 100644
--- a/lib/shared/addon/components/form-share-member/component.js
+++ b/lib/shared/addon/components/form-share-member/component.js
@@ -33,13 +33,7 @@ export default Component.extend({
   init() {
     this._super(...arguments);
 
-    scheduleOnce('afterRender', () => {
-      let { members = [] } = this.resource;
-
-      if (!this.addPublicMember && (members || []).findBy('groupPrincipalId', '*')) {
-        set(this, 'addPublicMember', true);
-      }
-    });
+    scheduleOnce('afterRender', this, 'setupPublicMember');
   },
 
   actions: {
@@ -73,6 +67,14 @@ export default Component.extend({
     return ( members || [] ).filter((member) => get(member, 'groupPrincipalId') !== '*').sortBy('displayName');
   }),
 
+  setupPublicMember() {
+    let { members = [] } = this.resource;
+
+    if (!this.addPublicMember && (members || []).findBy('groupPrincipalId', '*')) {
+      set(this, 'addPublicMember', true);
+    }
+  },
+
   addAuthorizedPrincipal() {
     throw new Error('add principal handler must be provided!!');
   },
diff --git a/lib/shared/addon/components/form-share-member/template.hbs b/lib/shared/addon/components/form-share-member/template.hbs
index 1389decb8..93288fac9 100644
--- a/lib/shared/addon/components/form-share-member/template.hbs
+++ b/lib/shared/addon/components/form-share-member/template.hbs
@@ -1,7 +1,7 @@
 {{#if editing}}
   <div class="row">
     <div class="col">
-      <button class="btn bg-link icon-btn p-0" {{action "addMember"}}>
+      <button class="btn bg-link icon-btn p-0" type="button" {{action "addMember"}}>
         <span class="darken">
           <i class="icon icon-plus text-small"/>
         </span>
diff --git a/lib/shared/addon/components/form-ssl-rows/template.hbs b/lib/shared/addon/components/form-ssl-rows/template.hbs
index 7b3f981fe..e90b8df0c 100644
--- a/lib/shared/addon/components/form-ssl-rows/template.hbs
+++ b/lib/shared/addon/components/form-ssl-rows/template.hbs
@@ -1,7 +1,7 @@
 <div class="clearfix">
   <label class="acc-label">{{t 'formSslTermination.hosts'}}</label>
   {{#if editing}}
-    <button class="btn bg-link icon-btn" {{action "addHost"}}>
+    <button class="btn bg-link icon-btn" type="button" {{action "addHost"}}>
       <span class="darken"><i class="icon icon-plus text-small"></i></span>
       <span>{{t 'formSslTermination.addHostLabel'}}</span>
     </button>
@@ -30,7 +30,7 @@
 
           {{#if editing}}
             <td class="text-right">
-              <button class="btn bg-primary btn-sm" {{action "removeHost" host}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
+              <button class="btn bg-primary btn-sm" type="button" {{action "removeHost" host}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
             </td>
           {{/if}}
         </tr>
diff --git a/lib/shared/addon/components/form-ssl-termination/component.js b/lib/shared/addon/components/form-ssl-termination/component.js
index be9ea3ced..e28551139 100644
--- a/lib/shared/addon/components/form-ssl-termination/component.js
+++ b/lib/shared/addon/components/form-ssl-termination/component.js
@@ -79,7 +79,7 @@ export default Component.extend({
     });
   }),
 
-  allCertificates: computed('namespacedCertificates.[]', 'certificates.[]', 'namespace', function() {
+  allCertificates: computed('certificates.[]', 'namespace.id', 'namespacedCertificates.[]', function() {
     const out = [];
     const namespacedCertificates = (get(this, 'namespacedCertificates') || []).filter((c) => {
       const selectedNamespace = get(this, 'namespace.id');
diff --git a/lib/shared/addon/components/form-ssl-termination/template.hbs b/lib/shared/addon/components/form-ssl-termination/template.hbs
index c62266d93..4ddd42771 100644
--- a/lib/shared/addon/components/form-ssl-termination/template.hbs
+++ b/lib/shared/addon/components/form-ssl-termination/template.hbs
@@ -28,7 +28,7 @@
   {{/each}}
   {{#if (and editing (or allCertificates.length (not certs.length)))}}
     <div class="row">
-      <button class="btn bg-link icon-btn pull-right" {{action "addCert"}}>
+      <button class="btn bg-link icon-btn pull-right" type="button" {{action "addCert"}}>
         <span class="darken"><i class="icon icon-plus text-small"></i></span>
         <span>{{t 'formSslTermination.addCertLabel'}}</span>
       </button>
diff --git a/lib/shared/addon/components/form-user-labels/template.hbs b/lib/shared/addon/components/form-user-labels/template.hbs
index e890551a5..c0a802790 100644
--- a/lib/shared/addon/components/form-user-labels/template.hbs
+++ b/lib/shared/addon/components/form-user-labels/template.hbs
@@ -59,7 +59,7 @@
       </div>
     {{/if}}
 
-    <button class="btn bg-link icon-btn" {{action "addUserLabel"}}>
+    <button class="btn bg-link icon-btn" type="button" {{action "addUserLabel"}}>
       <span class="darken"><i class="icon icon-plus text-small"/></span>
       <span>{{t "formUserLabels.addAction"}}</span>
     </button>
diff --git a/lib/shared/addon/components/form-value-array/template.hbs b/lib/shared/addon/components/form-value-array/template.hbs
index e648723b8..6707791f7 100644
--- a/lib/shared/addon/components/form-value-array/template.hbs
+++ b/lib/shared/addon/components/form-value-array/template.hbs
@@ -28,8 +28,7 @@
       {{#if editing}}
         <span class="input-group-btn">
           <button
-            class="btn bg-primary btn-sm"
-            {{action "remove" row}}>
+            class="btn bg-primary btn-sm" type="button" {{action "remove" row}}>
             <i class="icon icon-minus"/>
             <span class="sr-only">
               {{t "generic.remove"}}
@@ -48,9 +47,7 @@
 {{/if}}
 {{#if editing}}
   <button
-    class={{addButtonClass}}
-    {{action "add"}}
-    disabled={{not addButtonEnabled}}
+    class={{addButtonClass}} disabled={{not addButtonEnabled}} type="button" {{action "add"}}
   >
     <span class="darken">
       <i class="icon icon-plus text-small"/>
diff --git a/lib/shared/addon/components/form-versions/component.js b/lib/shared/addon/components/form-versions/component.js
index 2df20610f..3bc35cccc 100644
--- a/lib/shared/addon/components/form-versions/component.js
+++ b/lib/shared/addon/components/form-versions/component.js
@@ -33,15 +33,7 @@ export default Component.extend({
   defaultK8sVersion:      alias(`settings.${ C.SETTING.VERSION_RKE_K8S_DEFAULT }`),
 
   shouldRecomputInitalValues: on('init', observer('cluster.clusterTemplateRevisionId', function() {
-    scheduleOnce('afterRender', () => {
-      // we should set this everytime. we can potentially override it based on
-      // satisfies overrides, so if we change templates while launching
-      // a cluster from a satisfies to a non-satisfies override we should set
-      // it back to the system setting
-      set(this, 'supportedVersionsRange', get(this, `settings.${ C.SETTING.VERSION_K8S_SUPPORTED_RANGE }`));
-
-      this.initVersions();
-    });
+    scheduleOnce('afterRender', this, 'setupVersions');
   })),
 
   isRke: computed('cluster', function() {
@@ -240,4 +232,14 @@ export default Component.extend({
     return label;
   },
 
+  setupVersions() {
+    // we should set this everytime. we can potentially override it based on
+    // satisfies overrides, so if we change templates while launching
+    // a cluster from a satisfies to a non-satisfies override we should set
+    // it back to the system setting
+    set(this, 'supportedVersionsRange', get(this, `settings.${ C.SETTING.VERSION_K8S_SUPPORTED_RANGE }`));
+
+    this.initVersions();
+  }
+
 });
diff --git a/lib/shared/addon/components/graph-area/component.js b/lib/shared/addon/components/graph-area/component.js
index 342e9f0de..36d3b3a39 100644
--- a/lib/shared/addon/components/graph-area/component.js
+++ b/lib/shared/addon/components/graph-area/component.js
@@ -73,7 +73,7 @@ const LOADING_PARAMS =  {
 var ECharts = null;
 
 export default Component.extend(ThrottledResize, {
-  intl:       service(),
+  intl: service(),
   layout,
 
   tagName:    'div',
@@ -91,9 +91,9 @@ export default Component.extend(ThrottledResize, {
 
     if ( !ECharts ) {
       all([
-          import('echarts/lib/echarts'),
-          import('echarts/lib/chart/line'),
-          import('echarts/lib/component/tooltip'),
+        import('echarts/lib/echarts'),
+        import('echarts/lib/chart/line'),
+        import('echarts/lib/component/tooltip'),
       ]).then( (modules) => {
         ECharts = modules[0].default;
         ECharts.registerTheme('walden', THEME);
@@ -199,7 +199,7 @@ export default Component.extend(ThrottledResize, {
     const formatter = getFormatter(get(this, 'formatter'), true);
     let option = {
       tooltip: {
-        trigger:   'axis',
+        trigger: 'axis',
         position(pos, params, dom, rect, size) {
           const obj = { top: 60 };
 
diff --git a/lib/shared/addon/components/hover-dropdown/template.hbs b/lib/shared/addon/components/hover-dropdown/template.hbs
index 06f379101..951b14fd2 100644
--- a/lib/shared/addon/components/hover-dropdown/template.hbs
+++ b/lib/shared/addon/components/hover-dropdown/template.hbs
@@ -1,28 +1,32 @@
-{{#basic-dropdown
-   renderInPlace=renderInPlace
-   verticalPosition=verticalPosition
-   horizontalPosition=horizontalPosition
-   matchTriggerWidth=matchTriggerWidth
-   triggerComponent=triggerComponent
-   contentComponent=contentComponent
-   registerAPI=(action "registerAPI")
-   calculatePosition=(action "calculatePosition" )
-   onOpen=onOpen
-   onClose=onClose
-   onFocus=onFocus
-   as |dd|}}
-  {{yield (assign
+<BasicDropdown
+  @renderInPlace={{renderInPlace}}
+  @verticalPosition={{verticalPosition}}
+  @horizontalPosition={{horizontalPosition}}
+  @matchTriggerWidth={{matchTriggerWidth}}
+  @triggerComponent={{triggerComponent}}
+  @contentComponent={{contentComponent}}
+  @registerAPI={{action "registerAPI"}}
+  @calculatePosition={{action "calculatePosition"}}
+  @onOpen={{onOpen}}
+  @onClose={{onClose}}
+  @onFocus={{onFocus}} as |dd|
+>
+  {{yield
+    (assign
       dd
       (hash
-        trigger=(component dd.trigger
-        onMouseDown=(action "prevent")
-        onMouseEnter=(action "open" false)
-        onMouseLeave=(action "close" false))
-        content=(component dd.content
+        Trigger=(component
+          dd.Trigger
+          onMouseDown=(action "prevent")
+          onMouseEnter=(action "open" false)
+          onMouseLeave=(action "close" false)
+        )
+        Content=(component
+          dd.Content
           onMouseEnter=(action "open" true)
           onMouseLeave=(action "close" true)
         )
       )
     )
   }}
-{{/basic-dropdown}}
+</BasicDropdown>
\ No newline at end of file
diff --git a/lib/shared/addon/components/huawei-user-labels/template.hbs b/lib/shared/addon/components/huawei-user-labels/template.hbs
index 5260c99b3..3d3514ef4 100644
--- a/lib/shared/addon/components/huawei-user-labels/template.hbs
+++ b/lib/shared/addon/components/huawei-user-labels/template.hbs
@@ -26,7 +26,7 @@
         </td>
         {{#unless readOnly}}
           <td class="text-right">
-            <button class="btn bg-primary btn-sm" {{action "removeLabel" label}} disabled={{eq label.readonly true}}><i
+            <button class="btn bg-primary btn-sm" disabled={{eq label.readonly true}} type="button" {{action "removeLabel" label}}><i
                 class="icon icon-minus" /><span class="sr-only">{{t "generic.remove"}}</span></button>
           </td>
         {{/unless}}
@@ -40,7 +40,7 @@
   {{/unless}}
 {{/if}}
 {{#unless readOnly}}
-  <button class="btn bg-link icon-btn" {{action "addUserLabel"}}>
+  <button class="btn bg-link icon-btn" type="button" {{action "addUserLabel"}}>
     <span class="darken"><i class="icon icon-plus text-small" /></span>
     <span>{{t "formUserLabels.addAction"}}</span>
   </button>
diff --git a/lib/shared/addon/components/identity-block/component.js b/lib/shared/addon/components/identity-block/component.js
index df3ebc498..11068dc2f 100644
--- a/lib/shared/addon/components/identity-block/component.js
+++ b/lib/shared/addon/components/identity-block/component.js
@@ -8,7 +8,7 @@ import Identicon from 'identicon.js';
 let missingPrincipals = [];
 
 export default Component.extend({
-  globalStore:        service(),
+  globalStore: service(),
 
   layout,
   // Principal or id+parsedExternalType
@@ -71,7 +71,7 @@ export default Component.extend({
     }
   },
 
-  avatarSrc: computed('principal', function() {
+  avatarSrc: computed('principal.id', function() {
     return `data:image/png;base64,${ new Identicon(AWS.util.crypto.md5(get(this, 'principal.id') || 'Unknown', 'hex'), 80, 0.01).toString() }`;
   }),
 
diff --git a/lib/shared/addon/components/input-answer-row/component.js b/lib/shared/addon/components/input-answer-row/component.js
index 9115c69e0..a4367c625 100644
--- a/lib/shared/addon/components/input-answer-row/component.js
+++ b/lib/shared/addon/components/input-answer-row/component.js
@@ -9,7 +9,7 @@ export default Component.extend({
 
   layout,
 
-  tagName:    'div',
+  tagName: 'div',
 
   namespace: computed('namespaceId', function() {
     return { id: get(this, 'namespaceId'), }
diff --git a/lib/shared/addon/components/input-answers/component.js b/lib/shared/addon/components/input-answers/component.js
index aa0f56085..a32ba72b0 100644
--- a/lib/shared/addon/components/input-answers/component.js
+++ b/lib/shared/addon/components/input-answers/component.js
@@ -46,7 +46,7 @@ export default Component.extend(InputAnswers, {
   // shared actions exist in mixin
   // actions: {},
 
-  pastedAnswers: computed('pasteOrUpload', {
+  pastedAnswers: computed('app.answers.firstObject.valuesYaml', 'app.valuesYaml', 'pasteOrUpload', 'questions', {
     get( /* key */ ) {
       let valuesYaml;
 
diff --git a/lib/shared/addon/components/input-answers/template.hbs b/lib/shared/addon/components/input-answers/template.hbs
index 3ef7ae69e..be31debd4 100644
--- a/lib/shared/addon/components/input-answers/template.hbs
+++ b/lib/shared/addon/components/input-answers/template.hbs
@@ -1,14 +1,14 @@
 <form class="{{if getTemplate.isRunning "hide"}}">
   <div class="btn-group  pull-right">
     {{#if pasteOrUpload}}
-      <button class="btn btn-sm" {{action "cancel"}}>
+      <button class="btn btn-sm" type="button" {{action "cancel"}}>
         {{t "inputAnswers.editAsForm"}}
       </button>
-      <button class="btn btn-sm bg-primary" {{action "upload"}}>
+      <button class="btn btn-sm bg-primary" type="button" {{action "upload"}}>
         {{t "uploadFile.label"}} <span class="icon icon-upload"></span>
       </button>
     {{else if (not isMultiClusterApp)}}
-      <button class="btn btn-sm bg-primary" {{action "showPaste"}}>
+      <button class="btn btn-sm bg-primary" type="button" {{action "showPaste"}}>
         {{t "inputAnswers.yaml"}} <span class="icon icon-copy"></span>
       </button>
     {{/if}}
diff --git a/lib/shared/addon/components/input-custom-answers/component.js b/lib/shared/addon/components/input-custom-answers/component.js
index b53fe085f..326c75a0d 100644
--- a/lib/shared/addon/components/input-custom-answers/component.js
+++ b/lib/shared/addon/components/input-custom-answers/component.js
@@ -54,7 +54,7 @@ export default Component.extend(InputAnswers, {
     }
   }),
 
-  pastedAnswers: computed('pasteOrUpload', {
+  pastedAnswers: computed('app.answers.firstObject.valuesYaml', 'app.valuesYaml', 'applicationAnswers', 'pasteOrUpload', {
     get( /* key */ ) {
       let valuesYaml;
 
diff --git a/lib/shared/addon/components/input-custom-answers/template.hbs b/lib/shared/addon/components/input-custom-answers/template.hbs
index 575dfaea9..3f6c58624 100644
--- a/lib/shared/addon/components/input-custom-answers/template.hbs
+++ b/lib/shared/addon/components/input-custom-answers/template.hbs
@@ -1,22 +1,19 @@
 <div class="btn-group  pull-right">
   {{#if pasteOrUpload}}
     <button
-      class="btn btn-sm"
-      {{action "cancel"}}
+      class="btn btn-sm" type="button" {{action "cancel"}}
     >
       {{t "inputAnswers.editAsForm"}}
     </button>
     <button
-      class="btn btn-sm bg-primary"
-      {{action "upload"}}
+      class="btn btn-sm bg-primary" type="button" {{action "upload"}}
     >
       {{t "uploadFile.label"}}
       <i class="icon icon-upload"></i>
     </button>
   {{else if (not isMultiClusterApp)}}
     <button
-      class="btn btn-sm bg-primary"
-      {{action "showPaste"}}
+      class="btn btn-sm bg-primary" type="button" {{action "showPaste"}}
     >
       {{t "inputAnswers.yaml"}}
       <i class="icon icon-copy"></i>
diff --git a/lib/shared/addon/components/input-identity/component.js b/lib/shared/addon/components/input-identity/component.js
index 2c2a7f745..e34b83a64 100644
--- a/lib/shared/addon/components/input-identity/component.js
+++ b/lib/shared/addon/components/input-identity/component.js
@@ -118,7 +118,7 @@ export default Component.extend({
     return get(this, 'access.provider') !== 'localauthconfig';
   }),
 
-  addDisabled: computed('addInput', 'checking', function() {
+  addDisabled: computed('addInput.value', 'checking', function() {
     let input = get(this, 'addInput.value') || '';
 
     return get(this, 'checking') || input.trim().length === 0;
diff --git a/lib/shared/addon/components/input-identity/template.hbs b/lib/shared/addon/components/input-identity/template.hbs
index 1e79ad970..9792fefd6 100644
--- a/lib/shared/addon/components/input-identity/template.hbs
+++ b/lib/shared/addon/components/input-identity/template.hbs
@@ -10,29 +10,30 @@
       useLabel=true
       searchOnlyGroups=searchOnlyGroups
     }}
-
     <div class="input-group-btn">
       {{#if showDropdown}}
-        {{#basic-dropdown
-             horizontalPosition="right"
-             as |dd|}}
-          {{#dd.trigger class="btn bg-default"}}
+        <BasicDropdown @horizontalPosition="right" as |dd|>
+          <dd.Trigger class="btn bg-default">
             <i class="icon icon-chevron-down"></i>
-          {{/dd.trigger}}
-
-          {{#dd.content class="principal-search-list"}}
-            <li role="presentation" class="dropdown-header">{{dropdownLabel}}</li>
+          </dd.Trigger>
+          <dd.Content class="principal-search-list">
+            <li
+              role="presentation"
+              class="dropdown-header"
+              {{action dd.actions.close}}
+            >
+              {{dropdownLabel}}
+            </li>
             {{#each dropdownChoices as |item|}}
-              <li>
+              <li {{action dd.actions.close}}>
                 <a {{action "addObject" item}}>
                   {{identity-block principal=item}}
                 </a>
               </li>
             {{/each}}
-          {{/dd.content}}
-
-        {{/basic-dropdown}}
+          </dd.Content>
+        </BasicDropdown>
       {{/if}}
     </div>
   </div>
-</form>
+</form>
\ No newline at end of file
diff --git a/lib/shared/addon/components/input-paste/component.js b/lib/shared/addon/components/input-paste/component.js
index b6f0962ad..b2b4f250c 100644
--- a/lib/shared/addon/components/input-paste/component.js
+++ b/lib/shared/addon/components/input-paste/component.js
@@ -9,7 +9,7 @@ export default TextField.extend(IntlPlaceholder, {
 
   separators: null,
 
-  _onPaste:  null,
+  _onPaste: null,
 
   didInsertElement() {
     this._super();
diff --git a/lib/shared/addon/components/input-suggest/component.js b/lib/shared/addon/components/input-suggest/component.js
index a91b01dec..5f5e5a899 100644
--- a/lib/shared/addon/components/input-suggest/component.js
+++ b/lib/shared/addon/components/input-suggest/component.js
@@ -10,7 +10,7 @@ export default Component.extend({
   grouped:     null, // {group1: [val1, val2], group2: [val3, val4]}
   choices:     null, // or [val1, val2, val3, val4]
 
-  classNames:  ['input-group'],
+  classNames: ['input-group'],
 
   init() {
     this._super(...arguments);
@@ -19,8 +19,12 @@ export default Component.extend({
   },
 
   actions: {
-    select(value) {
+    select(value, dd) {
       this.set('value', value);
+
+      if (dd) {
+        dd.actions.close();
+      }
     }
   }
 });
diff --git a/lib/shared/addon/components/input-suggest/template.hbs b/lib/shared/addon/components/input-suggest/template.hbs
index 7058a6adc..b19a312d8 100644
--- a/lib/shared/addon/components/input-suggest/template.hbs
+++ b/lib/shared/addon/components/input-suggest/template.hbs
@@ -1,33 +1,32 @@
-{{input
-    type="text"
-    class="form-control"
-    value=value
-    placeholder=placeholder
-}}
-
-{{#basic-dropdown
-     horizontalPosition="right"
-     as |dd|}}
-  {{#dd.trigger
-       class="btn bg-primary input-group-btn"
-  }}
+{{input type="text" class="form-control" value=value placeholder=placeholder}}
+<BasicDropdown @horizontalPosition="right" as |dd|>
+  <dd.Trigger class="btn bg-primary input-group-btn">
     <i class="icon icon-chevron-down"></i>
-  {{/dd.trigger}}
-
-  {{#dd.content}}
+  </dd.Trigger>
+  <dd.Content>
     {{#if grouped}}
       {{#each-in grouped as |group choices|}}
         {{#if choices.length}}
-          <li class="dropdown-header">{{group}}</li>
+          <li class="dropdown-header">
+            {{group}}
+          </li>
           {{#each choices as |value|}}
-            <li {{action "select" value}}><a href="#">{{value}}</a></li>
+            <li {{action "select" value dd}}>
+              <a href="#">
+                {{value}}
+              </a>
+            </li>
           {{/each}}
         {{/if}}
       {{/each-in}}
     {{else}}
       {{#each choices as |value|}}
-        <li {{action "select" value}}><a href="#">{{value}}</a></li>
+        <li {{action "select" value dd}}>
+          <a href="#">
+            {{value}}
+          </a>
+        </li>
       {{/each}}
     {{/if}}
-  {{/dd.content}}
-{{/basic-dropdown}}
\ No newline at end of file
+  </dd.Content>
+</BasicDropdown>
\ No newline at end of file
diff --git a/lib/shared/addon/components/input-text-file/component.js b/lib/shared/addon/components/input-text-file/component.js
index 3e80133fd..1ccb0b29a 100644
--- a/lib/shared/addon/components/input-text-file/component.js
+++ b/lib/shared/addon/components/input-text-file/component.js
@@ -28,7 +28,7 @@ export default Component.extend({
   showUploadLabel:  true,
   concealValue:     false,
 
-  tagName:          ['div'],
+  tagName: ['div'],
 
   shouldChangeName: true,
 
diff --git a/lib/shared/addon/components/input-text-file/template.hbs b/lib/shared/addon/components/input-text-file/template.hbs
index 48d974b30..d88634ede 100644
--- a/lib/shared/addon/components/input-text-file/template.hbs
+++ b/lib/shared/addon/components/input-text-file/template.hbs
@@ -11,7 +11,7 @@
       {{/if}}
       {{#if nameRequired}}{{field-required}}{{/if}}
       {{#if canChangeName}}
-        <button class="btn btn-sm bg-link p-0 pl-10 acc-label-hover" {{action "wantsChange"}}>{{t "action.edit"}}</button>
+        <button class="btn btn-sm bg-link p-0 pl-10 acc-label-hover" type="button" {{action "wantsChange"}}>{{t "action.edit"}}</button>
       {{/if}}
     </h4>
   {{/if}}
@@ -19,7 +19,7 @@
   <div class="pull-right vertical-middle">
     {{#if canUpload}}
       {{#if showUploadLabel}}
-        <button class="btn bg-link icon-btn" {{action "click"}} disabled={{disabled}}>
+        <button class="btn bg-link icon-btn" disabled={{disabled}} type="button" {{action "click"}}>
           <span class="darken"><i class="icon icon-upload text-small"/></span>
           <span>{{t "inputTextFile.tooltip"}}</span>
         </button>
diff --git a/lib/shared/addon/components/input-url/component.js b/lib/shared/addon/components/input-url/component.js
index 4af3b0cb8..381da3df4 100644
--- a/lib/shared/addon/components/input-url/component.js
+++ b/lib/shared/addon/components/input-url/component.js
@@ -17,7 +17,7 @@ import { scheduleOnce } from '@ember/runloop';
 // }
 
 export default TextField.extend({
-  intl:              service(),
+  intl: service(),
 
   type:              'url',
   classNameBindings: ['invalid:input-error'],
@@ -28,17 +28,19 @@ export default TextField.extend({
   urlError:          null,
   init() {
     this._super(...arguments);
-    scheduleOnce('afterRender', () => {
-      let val = null;
+    scheduleOnce('afterRender', this, 'setupValue');
+  },
 
-      if (get(this, 'stripScheme')) {
-        val = stripScheme(get(this, 'element.value') || '');
-      } else {
-        val = get(this, 'element.value') || '';
-      }
+  setupValue() {
+    let val = null;
 
-      set(this, 'value', this.validateInput(val));
-    });
+    if (get(this, 'stripScheme')) {
+      val = stripScheme(get(this, 'element.value') || '');
+    } else {
+      val = get(this, 'element.value') || '';
+    }
+
+    set(this, 'value', this.validateInput(val));
   },
 
   _elementValueDidChange() {
diff --git a/lib/shared/addon/components/input-yaml/component.js b/lib/shared/addon/components/input-yaml/component.js
index b115b98c4..cf2703e81 100644
--- a/lib/shared/addon/components/input-yaml/component.js
+++ b/lib/shared/addon/components/input-yaml/component.js
@@ -40,7 +40,7 @@ export default Component.extend(ThrottledResize, {
   showCopy:         false,
   shouldChangeName: true,
 
-  _isEditorVisible:  false,
+  _isEditorVisible: false,
 
   init() {
     this._super(...arguments);
diff --git a/lib/shared/addon/components/input-yaml/template.hbs b/lib/shared/addon/components/input-yaml/template.hbs
index 3253d8e7d..a5d9cf5ee 100644
--- a/lib/shared/addon/components/input-yaml/template.hbs
+++ b/lib/shared/addon/components/input-yaml/template.hbs
@@ -10,13 +10,13 @@
         }}
       {{/if}}
       {{#if showUpload}}
-        <button class="btn bg-link icon-btn" {{action "click"}}>
+        <button class="btn bg-link icon-btn" type="button" {{action "click"}}>
           <span class="darken"><i class="icon icon-upload text-small"/></span>
           <span>{{t "inputTextFile.tooltip"}}</span>
         </button>
       {{/if}}
       {{#if showDownload}}
-        <button class="btn bg-link icon-btn p-0" {{action "download"}}>
+        <button class="btn bg-link icon-btn p-0" type="button" {{action "download"}}>
           <span class="darken"><i class="icon icon-download text-small"/></span>
           <span>{{t "generic.download"}}</span>
         </button>
@@ -35,13 +35,13 @@
       }}
     {{/if}}
     {{#if showUpload}}
-      <button class="btn bg-link icon-btn" {{action "click"}}>
+      <button class="btn bg-link icon-btn" type="button" {{action "click"}}>
         <span class="darken"><i class="icon icon-upload text-small"/></span>
         <span>{{t "inputTextFile.tooltip"}}</span>
       </button>
     {{/if}}
     {{#if showDownload}}
-      <button class="btn bg-link icon-btn p-0" {{action "download"}}>
+      <button class="btn bg-link icon-btn p-0" type="button" {{action "download"}}>
         <span class="darken"><i class="icon icon-download text-small"/></span>
         <span>{{t "generic.download"}}</span>
       </button>
diff --git a/lib/shared/addon/components/labels-section/component.js b/lib/shared/addon/components/labels-section/component.js
index 0970de93c..28bd5295a 100644
--- a/lib/shared/addon/components/labels-section/component.js
+++ b/lib/shared/addon/components/labels-section/component.js
@@ -47,7 +47,7 @@ export default Component.extend(ManageLabels, {
   showKind:          true,
   descending:        true,
 
-  labelSource:    alias('model.labels'),
+  labelSource: alias('model.labels'),
 
   didReceiveAttrs() {
     this.initLabels(this.get('labelSource'), null, null, this.k3sLabelsToIgnore);
diff --git a/lib/shared/addon/components/language-dropdown/component.js b/lib/shared/addon/components/language-dropdown/component.js
index 41a8d73fe..8629f90cd 100644
--- a/lib/shared/addon/components/language-dropdown/component.js
+++ b/lib/shared/addon/components/language-dropdown/component.js
@@ -22,7 +22,7 @@ export default Component.extend({
   dropdownVertPosition: 'below',
   dropdownHoriPosition: 'right',
 
-  locales:           alias('language.locales'),
+  locales: alias('language.locales'),
 
   actions: {
     selectLanguage(language) {
diff --git a/lib/shared/addon/components/language-dropdown/template.hbs b/lib/shared/addon/components/language-dropdown/template.hbs
index cc21aaa49..8c1c9375f 100644
--- a/lib/shared/addon/components/language-dropdown/template.hbs
+++ b/lib/shared/addon/components/language-dropdown/template.hbs
@@ -4,15 +4,13 @@
    renderInPlace=true
    as |dd|
 }}
-  {{#dd.trigger
-     class="hand btn btn-sm bg-transparent lang-select"
-  }}
+  <dd.Trigger class="hand btn btn-sm bg-transparent lang-select">
     <i class="icon icon-globe"></i> {{selectedLabel}} <i class="icon icon-chevron-down"></i>
-  {{/dd.trigger}}
+  </dd.Trigger>
 
-  {{#dd.content class="text-right lang-select"}}
+  <dd.Content class="text-right lang-select">
     {{#if settings.isRancher}}
-      <li>
+      <li {{action dd.actions.close}}>
         <a
           role="button"
           href="http://translate.rancher.com"
@@ -25,7 +23,7 @@
       <li class="divider"></li>
     {{/if}}
     {{#each-in locales as |lang label|}}
-      <li class="{{if (eq selected lang) "disabled selected"}}">
+      <li class="{{if (eq selected lang) "disabled selected"}}" {{action dd.actions.close}}>
         <a
           role="button"
           href="#"
@@ -35,5 +33,5 @@
         </a>
       </li>
     {{/each-in}}
-  {{/dd.content}}
+  </dd.Content>
 {{/hover-dropdown}}
\ No newline at end of file
diff --git a/lib/shared/addon/components/link-to-as-attrs/component.js b/lib/shared/addon/components/link-to-as-attrs/component.js
index f12521f55..426e0508c 100644
--- a/lib/shared/addon/components/link-to-as-attrs/component.js
+++ b/lib/shared/addon/components/link-to-as-attrs/component.js
@@ -17,12 +17,14 @@ export default LinkComponent.extend({
     this._super(...arguments);
   },
 
-  'current-when': computed('onlyCurrentWhen', function() {
+  'current-when': computed('onlyCurrentWhen.length', 'qualifiedRouteName', function() {
     let base = get(this, 'qualifiedRouteName');
 
     if ( get(this, 'onlyCurrentWhen.length') ) {
       return get(this, 'onlyCurrentWhen').concat(base).join(' ');
     }
+
+    return;
   }),
 
   queryParams: computed('attrs.qp.value', function(){
diff --git a/lib/shared/addon/components/link-to-cluster-driver/template.hbs b/lib/shared/addon/components/link-to-cluster-driver/template.hbs
index ea4055f5c..f940e45a0 100644
--- a/lib/shared/addon/components/link-to-cluster-driver/template.hbs
+++ b/lib/shared/addon/components/link-to-cluster-driver/template.hbs
@@ -1,5 +1,5 @@
 {{#if linkHovered}}
-  <button class="btn btn-sm bg-transparent pull-right">
+  <button class="btn btn-sm bg-transparent pull-right" type="button">
     <i
       class="icon icon-minus-circle icon-lg"
       aria-label="Remove Recent"
diff --git a/lib/shared/addon/components/marked-down/component.js b/lib/shared/addon/components/marked-down/component.js
index 579b9f45f..7eaa3e8ac 100644
--- a/lib/shared/addon/components/marked-down/component.js
+++ b/lib/shared/addon/components/marked-down/component.js
@@ -2,13 +2,14 @@ import Component from '@ember/component';
 import layout from './template';
 import { htmlSafe } from '@ember/string';
 import { get, computed } from '@ember/object';
+import { next } from '@ember/runloop';
 
 var Marked = null;
 var DOMPurify = null;
 
 export default Component.extend({
   layout,
-  markdown:       null,
+  markdown: null,
   init() {
     this._super(...arguments);
 
@@ -23,7 +24,7 @@ export default Component.extend({
             return;
           }
 
-          this.notifyPropertyChange('parsedMarkdown');
+          next(() => this.notifyPropertyChange('parsedMarkdown'));
         });
       });
     }
diff --git a/lib/shared/addon/components/metrics-action/template.hbs b/lib/shared/addon/components/metrics-action/template.hbs
index db9957563..8e0be740c 100644
--- a/lib/shared/addon/components/metrics-action/template.hbs
+++ b/lib/shared/addon/components/metrics-action/template.hbs
@@ -50,15 +50,15 @@
       {{#if state.detail}}
         <div>
           <div class="btn-group no-inline-space">
-            <button class="btn btn-link btn-sm bg-primary" disabled={{state.loading}} {{action "toggle" true}}>{{t 'metricsAction.detail.label'}}</button>
-            <button class="btn btn-link btn-sm bg-default" disabled={{state.loading}} {{action "toggle" false}}>{{t 'metricsAction.summary.label'}}</button>
+            <button class="btn btn-link btn-sm bg-primary" disabled={{state.loading}} type="button" {{action "toggle" true}}>{{t 'metricsAction.detail.label'}}</button>
+            <button class="btn btn-link btn-sm bg-default" disabled={{state.loading}} type="button" {{action "toggle" false}}>{{t 'metricsAction.summary.label'}}</button>
           </div>
         </div>
       {{else}}
         <div>
           <div class="btn-group no-inline-space">
-            <button class="btn btn-link btn-sm bg-default" disabled={{state.loading}} {{action "toggle" true}}>{{t 'metricsAction.detail.label'}}</button>
-            <button class="btn btn-link btn-sm bg-primary" disabled={{state.loading}} {{action "toggle" false}}>{{t 'metricsAction.summary.label'}}</button>
+            <button class="btn btn-link btn-sm bg-default" disabled={{state.loading}} type="button" {{action "toggle" true}}>{{t 'metricsAction.detail.label'}}</button>
+            <button class="btn btn-link btn-sm bg-primary" disabled={{state.loading}} type="button" {{action "toggle" false}}>{{t 'metricsAction.summary.label'}}</button>
           </div>
         </div>
       {{/if}}
diff --git a/lib/shared/addon/components/modal-add-custom-roles/component.js b/lib/shared/addon/components/modal-add-custom-roles/component.js
index 88746a5ac..44ea8e58d 100644
--- a/lib/shared/addon/components/modal-add-custom-roles/component.js
+++ b/lib/shared/addon/components/modal-add-custom-roles/component.js
@@ -61,7 +61,7 @@ export default Component.extend(ModalBase, {
       }
     }
   },
-  filteredRoles: computed('modalOpts.roles', function() {
+  filteredRoles: computed('modalOpts.current.length', 'modalOpts.roles', function() {
     return get(this, 'modalOpts.roles').filterBy('isCustom').map((role) => {
       let binding = null;
 
@@ -77,7 +77,7 @@ export default Component.extend(ModalBase, {
     });
   }),
 
-  roleTemplateId: computed({
+  roleTemplateId: computed('mode', 'type', {
     get(key) {
       if (get(this, 'mode') === 'custom') {
         return 'custom';
diff --git a/lib/shared/addon/components/modal-confirm-deactivate/template.hbs b/lib/shared/addon/components/modal-confirm-deactivate/template.hbs
index 6c5beb696..bdcc00ff0 100644
--- a/lib/shared/addon/components/modal-confirm-deactivate/template.hbs
+++ b/lib/shared/addon/components/modal-confirm-deactivate/template.hbs
@@ -30,6 +30,6 @@
 
 
 <div class="footer-actions">
-  <button {{action "confirm"}} class="btn bg-error">{{isService.button}}</button>
-  <button {{action "cancel"}} class="btn bg-transparent">{{t 'modalConfirmDeactivate.cancel'}}</button>
+  <button class="btn bg-error" type="button" {{action "confirm"}}>{{isService.button}}</button>
+  <button class="btn bg-transparent" type="button" {{action "cancel"}}>{{t 'modalConfirmDeactivate.cancel'}}</button>
 </div>
diff --git a/lib/shared/addon/components/modal-confirm-yaml-switch/template.hbs b/lib/shared/addon/components/modal-confirm-yaml-switch/template.hbs
index 52848c54a..151ac1e39 100644
--- a/lib/shared/addon/components/modal-confirm-yaml-switch/template.hbs
+++ b/lib/shared/addon/components/modal-confirm-yaml-switch/template.hbs
@@ -18,10 +18,10 @@
 </div>
 
 <div class="footer-actions">
-  <button {{action "confirm"}} class="btn bg-error">
+  <button class="btn bg-error" type="button" {{action "confirm"}}>
     {{t "modalConfirmYaml2Form.confirm"}}
   </button>
-  <button {{action "cancel"}} class="btn bg-transparent">
+  <button class="btn bg-transparent" type="button" {{action "cancel"}}>
     {{t "generic.cancel"}}
   </button>
 </div>
\ No newline at end of file
diff --git a/lib/shared/addon/components/modal-container-stop/component.js b/lib/shared/addon/components/modal-container-stop/component.js
index 3d3246011..739cfa3bd 100644
--- a/lib/shared/addon/components/modal-container-stop/component.js
+++ b/lib/shared/addon/components/modal-container-stop/component.js
@@ -7,7 +7,7 @@ import layout from './template';
 
 export default Component.extend(ModalBase, {
   layout,
-  classNames:     ['medium-modal'],
+  classNames: ['medium-modal'],
   alternateLabel,
 
   resources:      alias('modalService.modalOpts.model'),
diff --git a/lib/shared/addon/components/modal-container-stop/template.hbs b/lib/shared/addon/components/modal-container-stop/template.hbs
index aa439e2cd..7f5108d1a 100644
--- a/lib/shared/addon/components/modal-container-stop/template.hbs
+++ b/lib/shared/addon/components/modal-container-stop/template.hbs
@@ -8,8 +8,8 @@
 </h3>
 
 <div class="footer-actions">
-  <button {{action "stop"}} class="btn bg-error">{{t 'modalContainerStop.button'}}</button>
-  <button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
+  <button class="btn bg-error" type="button" {{action "stop"}}>{{t 'modalContainerStop.button'}}</button>
+  <button class="btn bg-transparent" type="button" {{action "cancel"}}>{{t 'generic.cancel'}}</button>
 </div>
 
 <hr/>
diff --git a/lib/shared/addon/components/modal-edit-cluster-template/component.js b/lib/shared/addon/components/modal-edit-cluster-template/component.js
index ded1be829..8e9b2bf7f 100644
--- a/lib/shared/addon/components/modal-edit-cluster-template/component.js
+++ b/lib/shared/addon/components/modal-edit-cluster-template/component.js
@@ -7,7 +7,7 @@ import { alias } from '@ember/object/computed';
 import { set } from '@ember/object';
 
 export default Component.extend(ModalBase, NewOrEdit, {
-  modal:      service(),
+  modal: service(),
 
   layout,
   classNames: ['large-modal'],
diff --git a/lib/shared/addon/components/modal-edit-driver/component.js b/lib/shared/addon/components/modal-edit-driver/component.js
index 7966fd72b..a4c99dd5a 100644
--- a/lib/shared/addon/components/modal-edit-driver/component.js
+++ b/lib/shared/addon/components/modal-edit-driver/component.js
@@ -1,4 +1,4 @@
-import { scheduleOnce } from '@ember/runloop';
+import { scheduleOnce, next } from '@ember/runloop';
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
@@ -29,9 +29,7 @@ export default Component.extend(ModalBase, NewOrEdit, {
       model: clone,
     })
 
-    scheduleOnce('afterRender', () => {
-      $('INPUT')[0].focus();
-    });
+    scheduleOnce('afterRender', this, 'setupFocus');
   },
 
   actions: {
@@ -50,5 +48,9 @@ export default Component.extend(ModalBase, NewOrEdit, {
 
   doneSaving() {
     this.send('cancel');
-  }
+  },
+
+  setupFocus() {
+    next(() => $(this.element).find('input:first')[0].focus()); // gotta make sure that modal is rendered
+  },
 });
diff --git a/lib/shared/addon/components/modal-istio-yaml/template.hbs b/lib/shared/addon/components/modal-istio-yaml/template.hbs
index 2afc6ed27..c5f792a87 100644
--- a/lib/shared/addon/components/modal-istio-yaml/template.hbs
+++ b/lib/shared/addon/components/modal-istio-yaml/template.hbs
@@ -37,7 +37,7 @@
 </div>
 
 <div style="text-align: center" class="mt-20 text-center">
-  <button {{action "cancel"}} class="btn bg-transparent">
+  <button class="btn bg-transparent" type="button" {{action "cancel"}}>
     {{t "generic.cancel"}}
   </button>
 </div>
diff --git a/lib/shared/addon/components/modal-shell/template.hbs b/lib/shared/addon/components/modal-shell/template.hbs
index b054cf9c4..56a11442c 100644
--- a/lib/shared/addon/components/modal-shell/template.hbs
+++ b/lib/shared/addon/components/modal-shell/template.hbs
@@ -7,6 +7,6 @@
    disconncted=(action "cancel")
 }}
   <div class="footer-actions">
-    <button {{action "cancel"}} class="btn bg-primary">{{t 'generic.closeModal'}}</button>
+    <button class="btn bg-primary" type="button" {{action "cancel"}}>{{t 'generic.closeModal'}}</button>
   </div>
 {{/container-shell}}
diff --git a/lib/shared/addon/components/modal-yaml/template.hbs b/lib/shared/addon/components/modal-yaml/template.hbs
index 549c8e885..10cc2b31a 100644
--- a/lib/shared/addon/components/modal-yaml/template.hbs
+++ b/lib/shared/addon/components/modal-yaml/template.hbs
@@ -22,7 +22,7 @@
 
 {{#if readOnly}}
   <div style="text-align: center" class="mt-20 text-center">
-    <button {{action "cancel"}} class="btn bg-transparent">
+    <button class="btn bg-transparent" type="button" {{action "cancel"}}>
       {{t "generic.cancel"}}
     </button>
   </div>
diff --git a/lib/shared/addon/components/namespace-group/component.js b/lib/shared/addon/components/namespace-group/component.js
index 29aa514ee..675ab0e85 100644
--- a/lib/shared/addon/components/namespace-group/component.js
+++ b/lib/shared/addon/components/namespace-group/component.js
@@ -8,5 +8,5 @@ export default Component.extend({
   alignState:   'text-center',
   noGroup:      'namespaceGroup.none',
 
-  tagName:      '',
+  tagName: '',
 });
diff --git a/lib/shared/addon/components/new-select/component.js b/lib/shared/addon/components/new-select/component.js
index 918a46ab9..56b0bc16a 100644
--- a/lib/shared/addon/components/new-select/component.js
+++ b/lib/shared/addon/components/new-select/component.js
@@ -30,7 +30,7 @@ export default Component.extend({
     'asyncContent.loaded:loaded',
     'asyncContent.error:error',
   ],
-  classNames:         ['new-select'],
+  classNames: ['new-select'],
 
   // leaking changes to it via a 2-way binding
   _selection: reads('selection'),
diff --git a/lib/shared/addon/components/node-group-row/component.js b/lib/shared/addon/components/node-group-row/component.js
index b98214574..78bbd1dd4 100644
--- a/lib/shared/addon/components/node-group-row/component.js
+++ b/lib/shared/addon/components/node-group-row/component.js
@@ -10,7 +10,7 @@ import { coerce, minor } from 'semver';
 
 export default Component.extend({
   layout,
-  classNames:    ['row', 'mb-20'],
+  classNames: ['row', 'mb-20'],
 
   instanceTypes: INSTANCE_TYPES,
 
@@ -61,7 +61,7 @@ export default Component.extend({
     return '';
   }),
 
-  upgradeAvailable: computed('clusterConfig.kubernetesVersion', 'model.version', 'originalClusterVersion', function() {
+  upgradeAvailable: computed('clusterConfig.kubernetesVersion', 'mode', 'model.version', 'originalClusterVersion', 'showNodeUpgradePreventionReason', function() {
     const originalClusterVersion = get(this, 'originalClusterVersion');
     const clusterVersion         = get(this, 'clusterConfig.kubernetesVersion');
     const nodeVersion            = get(this, 'model.version');
diff --git a/lib/shared/addon/components/node-pool-row/component.js b/lib/shared/addon/components/node-pool-row/component.js
index 3bd434501..eaa99c661 100644
--- a/lib/shared/addon/components/node-pool-row/component.js
+++ b/lib/shared/addon/components/node-pool-row/component.js
@@ -16,7 +16,7 @@ export default Component.extend({
   classNames: ['main-row'],
   pool:       null,
 
-  taintCapabilites:   alias('scope.currentCluster.capabilities.taintSupport'),
+  taintCapabilites: alias('scope.currentCluster.capabilities.taintSupport'),
 
   deleteNotReadyAfterSecs: computed('pool.deleteNotReadyAfterSecs', {
     get() {
@@ -33,7 +33,7 @@ export default Component.extend({
     },
   }),
 
-  groupedNodeTemplates: computed('filteredNodeTemplates', function() {
+  groupedNodeTemplates: computed('access.me.id', 'filteredNodeTemplates', function() {
     const currentUserId = get(this, 'access.me.id');
 
     return get(this, 'filteredNodeTemplates').map((template) => {
diff --git a/lib/shared/addon/components/node-pool-row/template.hbs b/lib/shared/addon/components/node-pool-row/template.hbs
index 3a8bf2d10..fcabb3353 100644
--- a/lib/shared/addon/components/node-pool-row/template.hbs
+++ b/lib/shared/addon/components/node-pool-row/template.hbs
@@ -30,13 +30,13 @@
         value=pool.nodeTemplateId
       }}
       <div class="input-group-btn bg-primary">
-        <button class="btn btn-sm bg-primary" {{action addNodeTemplate pool}}>
+        <button class="btn btn-sm bg-primary" type="button" {{action addNodeTemplate pool}}>
           <i class="icon icon-plus"></i>
         </button>
       </div>
     </div>
   {{else}}
-    <button class="btn bg-primary" {{action addNodeTemplate pool}}>
+    <button class="btn bg-primary" type="button" {{action addNodeTemplate pool}}>
       {{t "clusterNew.rke.nodes.addTemplate"}}
     </button>
   {{/if}}
@@ -84,8 +84,7 @@
 
 {{#if (or taintCapabilites (eq mode "new"))}}
   <td data-title="{{dt.advanced}}" class="text-center">
-    <button class="btn bg-transparent"
-      {{action configAdvancedOptions pool}}
+    <button class="btn bg-transparent" type="button" {{action configAdvancedOptions pool}}
     >
       <i class="icon icon-edit" />
       {{t "clusterNew.rke.nodes.taints"}}
@@ -94,7 +93,7 @@
 {{/if}}
 
 <td data-title="{{dt.remove}}" class="text-center">
-  <button class="btn bg-primary btn-sm" {{action removePool pool}}>
+  <button class="btn bg-primary btn-sm" type="button" {{action removePool pool}}>
     <i class="icon icon-minus"/>
   </button>
 </td>
\ No newline at end of file
diff --git a/lib/shared/addon/components/node-taints/template.hbs b/lib/shared/addon/components/node-taints/template.hbs
index 3075fc173..3eb88b785 100644
--- a/lib/shared/addon/components/node-taints/template.hbs
+++ b/lib/shared/addon/components/node-taints/template.hbs
@@ -70,8 +70,7 @@
           <td class="text-right">
             <button
               class="btn bg-primary btn-sm"
-              disabled={{taint.readonly}}
-              {{action "removeTaint" taint}}
+              disabled={{taint.readonly}} type="button" {{action "removeTaint" taint}}
             >
               <i class="icon icon-minus"/>
               <span class="sr-only">
@@ -90,8 +89,7 @@
 
 <div>
   <button
-    class="btn bg-link icon-btn"
-    {{action "addTaint"}}
+    class="btn bg-link icon-btn" type="button" {{action "addTaint"}}
   >
     <span class="darken">
       <i class="icon icon-plus text-small"/>
diff --git a/lib/shared/addon/components/principal-search/component.js b/lib/shared/addon/components/principal-search/component.js
index 3b5c70db3..03b5ed6a2 100644
--- a/lib/shared/addon/components/principal-search/component.js
+++ b/lib/shared/addon/components/principal-search/component.js
@@ -155,7 +155,7 @@ export default SearchableSelect.extend({
     return Object.keys(C.KEY).map((k) => C.KEY[k]);
   }),
 
-  displayLabel: computed('value', 'prompt', 'interContent.[]', function() {
+  displayLabel: computed('interContent.[]', 'intl', 'localizedLabel', 'optionLabelPath', 'optionValuePath', 'prompt', 'value', function() {
     const value = get(this, 'value');
 
     if (!value) {
diff --git a/lib/shared/addon/components/project-member-row/component.js b/lib/shared/addon/components/project-member-row/component.js
index 99a1a9c8a..48ef1a72d 100644
--- a/lib/shared/addon/components/project-member-row/component.js
+++ b/lib/shared/addon/components/project-member-row/component.js
@@ -56,7 +56,7 @@ export default Component.extend({
   principalGravatarSrc: null,
 
 
-  role:                 alias('member.role'),
+  role: alias('member.role'),
   init() {
     this._super(...arguments);
     let member = get(this, 'member');
@@ -133,7 +133,7 @@ export default Component.extend({
   }),
 
 
-  roleTemplateId: computed({
+  roleTemplateId: computed('member.bindings.firstObject', 'member.isCustom', {
     get() {
       return get(this, 'member.isCustom') ?  'custom' : get(this, 'member.bindings.firstObject');
     },
@@ -157,7 +157,7 @@ export default Component.extend({
     return get(this, 'roles').filter((r) => !r.builtin && !r.external && !r.hidden);
   }),
 
-  choices: computed('roles.[]', 'pageType', function() {
+  choices: computed('customRoles', 'pageType', 'roleTemplateId', 'roles.[]', function() {
     const pt = get(this, 'pageType');
     const allRoles = get(this, 'globalStore').all('roleTemplate');
 
diff --git a/lib/shared/addon/components/project-member-row/template.hbs b/lib/shared/addon/components/project-member-row/template.hbs
index bcb401605..6efe81502 100644
--- a/lib/shared/addon/components/project-member-row/template.hbs
+++ b/lib/shared/addon/components/project-member-row/template.hbs
@@ -48,7 +48,7 @@
 <td>&nbsp;</td>
 <div class="input-group-btn">
   {{#if (and (not isCreatorMember) editing)}}
-    <button class="btn bg-primary btn-sm" {{action "remove"}}>
+    <button class="btn bg-primary btn-sm" type="button" {{action "remove"}}>
       <i class="icon icon-minus" />
     </button>
   {{/if}}
diff --git a/lib/shared/addon/components/run-scan-modal/component.js b/lib/shared/addon/components/run-scan-modal/component.js
index 0bb095c4b..1c5df9174 100644
--- a/lib/shared/addon/components/run-scan-modal/component.js
+++ b/lib/shared/addon/components/run-scan-modal/component.js
@@ -52,7 +52,7 @@ export default Component.extend(ModalBase, {
     this.updateProfile();
   }),
 
-  profileObject: computed('profile', function() {
+  profileObject: computed('cisHelpers.cisScanProfiles', 'profile', function() {
     return this.cisHelpers.cisScanProfiles[get(this, 'profile')];
   }),
 
diff --git a/lib/shared/addon/components/run-scan-modal/template.hbs b/lib/shared/addon/components/run-scan-modal/template.hbs
index 892c850d7..3e5ba7547 100644
--- a/lib/shared/addon/components/run-scan-modal/template.hbs
+++ b/lib/shared/addon/components/run-scan-modal/template.hbs
@@ -85,11 +85,11 @@
   </div>
 
   <div class="footer-actions pull-right">
-    <button {{action "cancel"}} class="btn bg-secondary">
+    <button class="btn bg-secondary" type="button" {{action "cancel"}}>
       {{t "generic.cancel"}}
     </button>
 
-    <button {{action "run"}} class="btn bg-primary">
+    <button class="btn bg-primary" type="button" {{action "run"}}>
       {{t "generic.run"}}
     </button>
   </div>
diff --git a/lib/shared/addon/components/save-cancel/template.hbs b/lib/shared/addon/components/save-cancel/template.hbs
index 65eb71900..165b51b70 100644
--- a/lib/shared/addon/components/save-cancel/template.hbs
+++ b/lib/shared/addon/components/save-cancel/template.hbs
@@ -1,5 +1,5 @@
 {{#if saving}}
-  <button class="btn btn-disabled {{savingColor}}" {{action "doNothing"}}>
+  <button class="btn btn-disabled {{savingColor}}" type="button" {{action "doNothing"}}>
     <i class="icon icon-spinner icon-spin"></i>
     {{t savingLabel}}
   </button>
@@ -10,7 +10,7 @@
 {{/if}}
 {{yield}}
 {{#unless cancelDisabled}}
-  <button {{action "cancel"}} class="btn {{cancelColor}}">
+  <button class="btn {{cancelColor}}" type="button" {{action "cancel"}}>
     {{t cancelLabel}}
   </button>
 {{/unless}}
diff --git a/lib/shared/addon/components/scheduling-toleration/template.hbs b/lib/shared/addon/components/scheduling-toleration/template.hbs
index 7c7db3ce4..2631ff94d 100644
--- a/lib/shared/addon/components/scheduling-toleration/template.hbs
+++ b/lib/shared/addon/components/scheduling-toleration/template.hbs
@@ -127,7 +127,7 @@
           </td>
           {{#if editing}}
             <div class="input-group-btn">
-              <button class="btn bg-primary btn-sm" {{action "removeToleration" toleration}}>
+              <button class="btn bg-primary btn-sm" type="button" {{action "removeToleration" toleration}}>
                 <i class="icon icon-minus"/>
               </button>
             </div>
@@ -145,7 +145,7 @@
 {{/if}}
 
 {{#if editing}}
-  <button class="btn bg-link icon-btn" {{action "addToleration"}}>
+  <button class="btn bg-link icon-btn" type="button" {{action "addToleration"}}>
     <span class="darken">
       <i class="icon icon-plus text-small"/>
     </span>
diff --git a/lib/shared/addon/components/schema/input-config-map/component.js b/lib/shared/addon/components/schema/input-config-map/component.js
index a5eacb7b0..fea57c3e0 100644
--- a/lib/shared/addon/components/schema/input-config-map/component.js
+++ b/lib/shared/addon/components/schema/input-config-map/component.js
@@ -64,7 +64,7 @@ export default Component.extend({
 
     set(this, 'value', str);
   }),
-  filtered: computed('namespaceConfigMaps.[]', 'namespace.id', function() {
+  filtered: computed('exclude', 'namespace.id', 'namespaceConfigMaps.[]', function() {
     const intl = get(this, 'intl');
 
     let out = [];
diff --git a/lib/shared/addon/components/schema/input-container/component.js b/lib/shared/addon/components/schema/input-container/component.js
index daee1bdea..aabf6af25 100644
--- a/lib/shared/addon/components/schema/input-container/component.js
+++ b/lib/shared/addon/components/schema/input-container/component.js
@@ -47,7 +47,7 @@ export default Component.extend({
 
     this.set('value', str);
   }),
-  grouped: computed('allContainers.list.[]', 'canBalanceTo', 'canHaveContainers', function() {
+  grouped: computed('allContainers.list.[]', 'canBalanceTo', 'canHaveContainers', 'exclude', function() {
     let list = this.get('allContainers.list');
 
     let exclude = this.get('exclude');
diff --git a/lib/shared/addon/components/schema/input-dns-record/component.js b/lib/shared/addon/components/schema/input-dns-record/component.js
index 9b9a018a9..2f18bd330 100644
--- a/lib/shared/addon/components/schema/input-dns-record/component.js
+++ b/lib/shared/addon/components/schema/input-dns-record/component.js
@@ -46,7 +46,7 @@ export default Component.extend({
     set(this, 'value', str);
     set(this, 'obj', dnsRecord);
   }),
-  grouped: computed('allDnsRecords.list.[]', 'selectedNamespace', function() {
+  grouped: computed('allDnsRecords.list.[]', 'culsterIpNotNull', 'exclude', 'selected', 'selectedNamespace.id', function() {
     let list = get(this, 'allDnsRecords.list');
 
     let exclude = get(this, 'exclude');
diff --git a/lib/shared/addon/components/schema/input-istiohost/component.js b/lib/shared/addon/components/schema/input-istiohost/component.js
index 3ad75a780..db6d16330 100644
--- a/lib/shared/addon/components/schema/input-istiohost/component.js
+++ b/lib/shared/addon/components/schema/input-istiohost/component.js
@@ -10,7 +10,7 @@ export default Component.extend({
   fiedl:       null,
   value:       null,
 
-  hosts:        null,
+  hosts: null,
 
   init() {
     this._super(...arguments);
diff --git a/lib/shared/addon/components/schema/input-pvc/component.js b/lib/shared/addon/components/schema/input-pvc/component.js
index a73231441..6ad62347a 100644
--- a/lib/shared/addon/components/schema/input-pvc/component.js
+++ b/lib/shared/addon/components/schema/input-pvc/component.js
@@ -10,7 +10,7 @@ export default Component.extend({
   fiedl:       null,
   value:       null,
 
-  pvcs:        null,
+  pvcs: null,
 
   init() {
     this._super(...arguments);
diff --git a/lib/shared/addon/components/schema/input-relative-service/component.js b/lib/shared/addon/components/schema/input-relative-service/component.js
index 1c1c28c3d..91656f578 100644
--- a/lib/shared/addon/components/schema/input-relative-service/component.js
+++ b/lib/shared/addon/components/schema/input-relative-service/component.js
@@ -63,7 +63,7 @@ export default Component.extend({
       this.set('obj', obj);
     }
   }),
-  list: computed('grouped.[]', 'intl.locale', 'exclude', 'stack.name', function() {
+  list: computed('allWorkloads.list', 'exclude', 'grouped.[]', 'intl.locale', 'stack.{id,name}', function() {
     let stackId = this.get('stack.id');
     let list = this.get('allWorkloads.list').sortBy('combined');
 
diff --git a/lib/shared/addon/components/schema/input-relative-service/template.hbs b/lib/shared/addon/components/schema/input-relative-service/template.hbs
index 89ac6797b..52342ac34 100644
--- a/lib/shared/addon/components/schema/input-relative-service/template.hbs
+++ b/lib/shared/addon/components/schema/input-relative-service/template.hbs
@@ -3,7 +3,7 @@
     {{input value=value classNames=inputClass placeholder="[stack-name/]service-name"}}
     <span class="input-group-addon bg-default p-0">
       <span class="input-group-btn p-0">
-        <button class="btn bg-transparent text-info pl-10 pr-10" {{action 'standard'}}><i class="icon icon-close"/></button>
+        <button class="btn bg-transparent text-info pl-10 pr-10" type="button" {{action 'standard'}}><i class="icon icon-close"/></button>
       </span>
     </span>
   {{else}}
diff --git a/lib/shared/addon/components/schema/input-secret/component.js b/lib/shared/addon/components/schema/input-secret/component.js
index 018c037ed..0ae9124bf 100644
--- a/lib/shared/addon/components/schema/input-secret/component.js
+++ b/lib/shared/addon/components/schema/input-secret/component.js
@@ -74,7 +74,7 @@ export default Component.extend({
 
     set(this, 'value', str);
   }),
-  filtered: computed('projectSecrets.[]', 'namespaceSecrets.[]', 'namespace.id', function() {
+  filtered: computed('exclude', 'namespace.id', 'namespaceSecrets.[]', 'projectSecrets.[]', function() {
     const intl = get(this, 'intl');
 
     let out = get(this, 'projectSecrets').map((secret) => {
diff --git a/lib/shared/addon/components/schema/input-workload/component.js b/lib/shared/addon/components/schema/input-workload/component.js
index ee23d72bb..97777038a 100644
--- a/lib/shared/addon/components/schema/input-workload/component.js
+++ b/lib/shared/addon/components/schema/input-workload/component.js
@@ -62,7 +62,7 @@ export default Component.extend({
     this.set('obj', workload);
   }),
 
-  grouped: computed('allWorkloads.list.[]', 'selectedNamespace', function() {
+  grouped: computed('allWorkloads.list.[]', 'exclude', 'selected', 'selectedNamespace.id', function() {
     let list = this.get('allWorkloads.list');
 
     let exclude = this.get('exclude');
diff --git a/lib/shared/addon/components/search-text/template.hbs b/lib/shared/addon/components/search-text/template.hbs
index 43e52ab98..91ce20072 100644
--- a/lib/shared/addon/components/search-text/template.hbs
+++ b/lib/shared/addon/components/search-text/template.hbs
@@ -8,7 +8,7 @@
   {{#if searchText}}
     <span class="input-group-btn">
       <button
-        class="btn bg-transparent text-info pl-10 pr-10" {{action "clearSearch"}}
+        class="btn bg-transparent text-info pl-10 pr-10" type="button" {{action "clearSearch"}}
       >
         <i class="icon icon-close"/>
       </button>
diff --git a/lib/shared/addon/components/searchable-select/component.js b/lib/shared/addon/components/searchable-select/component.js
index e56a515e9..0224899dd 100644
--- a/lib/shared/addon/components/searchable-select/component.js
+++ b/lib/shared/addon/components/searchable-select/component.js
@@ -35,7 +35,7 @@ import StatefulPromise from 'shared/utils/stateful-promise';
 const MAX_HEIGHT = 285;
 
 export default Component.extend({
-  intl:                service(),
+  intl: service(),
 
   layout,
   classNames:          ['searchable-select'],
@@ -196,7 +196,7 @@ export default Component.extend({
     return get(this, 'unGroupedContent').some((item) => !!item.imgUrl);
   }),
 
-  displayLabel: computed('value', 'prompt', 'interContent.[]', 'intl.locale.[]', function() {
+  displayLabel: computed('interContent.[]', 'intl.locale.[]', 'localizedHtmlLabel', 'localizedLabel', 'optionLabelPath', 'optionValuePath', 'prompt', 'value', function() {
     const value = get(this, 'value');
     const vp = get(this, 'optionValuePath');
     const lp = get(this, 'optionLabelPath');
@@ -217,7 +217,7 @@ export default Component.extend({
     return null;
   }),
 
-  filtered: computed('filter', 'interContent.[]', function() {
+  filtered: computed('allowCustom', 'clientSideFiltering', 'filter', 'interContent.[]', 'optionGroupPath', 'optionLabelPath', function() {
     const filter  = (get(this, 'filter') || '').trim();
     const options = get(this, 'interContent');
 
@@ -277,7 +277,7 @@ export default Component.extend({
     }
   }),
 
-  unGroupedContent: computed('filtered.[]', function() {
+  unGroupedContent: computed('filtered.[]', 'optionGroupPath', function() {
     const groupPath = get(this, 'optionGroupPath');
     const out       = [];
 
@@ -292,7 +292,7 @@ export default Component.extend({
     return out;
   }),
 
-  groupedContent: computed('filtered.[]', function() {
+  groupedContent: computed('filtered.[]', 'optionGroupPath', function() {
     const groupPath = get(this, 'optionGroupPath');
     const out       = [];
 
diff --git a/lib/shared/addon/components/select-value-check/component.js b/lib/shared/addon/components/select-value-check/component.js
index a4e10b56a..b3d56fc33 100644
--- a/lib/shared/addon/components/select-value-check/component.js
+++ b/lib/shared/addon/components/select-value-check/component.js
@@ -7,7 +7,7 @@ export default Component.extend({
   layout,
 
   optionValues:  computed.mapBy('asyncOptions.value', 'value'),
-  asyncOptions: computed('content', function() {
+  asyncOptions: computed('content', 'options', function() {
     return StatefulPromise.wrap(get(this, 'options'), []);
   }),
   valueArray: computed('values', function() {
diff --git a/lib/shared/addon/components/share-member-row/component.js b/lib/shared/addon/components/share-member-row/component.js
index eaec32570..da1052ab4 100644
--- a/lib/shared/addon/components/share-member-row/component.js
+++ b/lib/shared/addon/components/share-member-row/component.js
@@ -7,7 +7,7 @@ import Identicon from 'identicon.js';
 import C from 'shared/utils/constants';
 
 export default Component.extend({
-  globalStore:          service(),
+  globalStore: service(),
   layout,
 
   tagName:              '',
@@ -89,7 +89,7 @@ export default Component.extend({
     })
   }),
 
-  noUpdate: computed('principal', 'principalId', function() {
+  noUpdate: computed('editing', 'principal', 'principalId', function() {
     if (this.editing) {
       if (this.principal || this.principalId) {
         return true;
diff --git a/lib/shared/addon/components/share-member-row/template.hbs b/lib/shared/addon/components/share-member-row/template.hbs
index 619e144cd..f4b8d80a1 100644
--- a/lib/shared/addon/components/share-member-row/template.hbs
+++ b/lib/shared/addon/components/share-member-row/template.hbs
@@ -8,7 +8,7 @@
     </td>
     <td class="pt-10">
       <div class="input-group-btn">
-        <button class="btn bg-primary btn-sm" {{action "remove"}}>
+        <button class="btn bg-primary btn-sm" type="button" {{action "remove"}}>
           <i class="icon icon-minus" />
         </button>
       </div>
@@ -59,7 +59,7 @@
     </td>
     <td class="pt-10">
       {{#if editing}}
-        <button class="btn bg-primary btn-sm" {{action "remove"}}>
+        <button class="btn bg-primary btn-sm" type="button" {{action "remove"}}>
           <i class="icon icon-minus" />
         </button>
       {{/if}}
diff --git a/lib/shared/addon/components/sortable-table/component.js b/lib/shared/addon/components/sortable-table/component.js
index 840d08f8f..d65553d4e 100644
--- a/lib/shared/addon/components/sortable-table/component.js
+++ b/lib/shared/addon/components/sortable-table/component.js
@@ -69,10 +69,10 @@ export default Component.extend(Sortable, StickyHeader, {
   page:                 1,
   pagingLabel:          'pagination.generic',
 
-  showHeader:           or('bulkActions', 'searchInPlace'),
+  showHeader: or('bulkActions', 'searchInPlace'),
 
   // -----
-  sortableContent:      alias('body'),
+  sortableContent: alias('body'),
   init() {
     this._super(...arguments);
 
@@ -105,7 +105,7 @@ export default Component.extend(Sortable, StickyHeader, {
       watchKey = `pagedContent.@each.${ get(this, 'groupByKey').replace(/\..*/g, '') }`;
     }
 
-    defineProperty(this, 'groupedContent', computed(watchKey, () => {
+    defineProperty(this, 'groupedContent', computed(watchKey, 'groupByKey', 'groupByRef', 'pagedContent', 'selectedNodes', () => {
       let ary = [];
       let map = {};
 
@@ -382,7 +382,7 @@ export default Component.extend(Sortable, StickyHeader, {
     }
   }),
 
-  filtered: computed('arranged.[]', 'searchText', function() {
+  filtered: computed('arranged.[]', 'searchFields', 'searchText', 'subFields', 'subSearchField', function() {
     const { matches, subMatches } = filter(
       get(this, 'arranged').slice(),
       get(this, 'searchText'),
@@ -407,7 +407,7 @@ export default Component.extend(Sortable, StickyHeader, {
     return Math.min(get(this, 'filtered.length'), get(this, 'indexFrom') + get(this, 'perPage') - 1);
   }),
 
-  pageCountContent: computed('indexFrom', 'indexTo', 'pagedContent.totalPages', function() {
+  pageCountContent: computed('filtered.length', 'indexFrom', 'indexTo', 'pagedContent.totalPages', function() {
     let from  = get(this, 'indexFrom') || 0;
     let to    = get(this, 'indexTo') || 0;
     let count = get(this, 'filtered.length') || 0;
diff --git a/lib/shared/addon/components/sortable-table/template.hbs b/lib/shared/addon/components/sortable-table/template.hbs
index 0356ddaf3..3bcf2a7a6 100644
--- a/lib/shared/addon/components/sortable-table/template.hbs
+++ b/lib/shared/addon/components/sortable-table/template.hbs
@@ -50,7 +50,7 @@
                   {{input value=searchText aria-title=(t "generic.search") type="search" class="input-sm pull-right" placeholder=(t "generic.search")}}
                   {{#if searchText}}
                     <span class="input-group-btn">
-                      <button class="btn bg-transparent text-info pl-10 pr-10" {{action "clearSearch"}}><i class="icon icon-close"/></button>
+                      <button class="btn bg-transparent text-info pl-10 pr-10" type="button" {{action "clearSearch"}}><i class="icon icon-close"/></button>
                     </span>
                   {{/if}}
                 </div>
diff --git a/lib/shared/addon/components/storage-class/provisioner-azure-disk/component.js b/lib/shared/addon/components/storage-class/provisioner-azure-disk/component.js
index 66e7d18b9..47b5d2afb 100644
--- a/lib/shared/addon/components/storage-class/provisioner-azure-disk/component.js
+++ b/lib/shared/addon/components/storage-class/provisioner-azure-disk/component.js
@@ -21,7 +21,7 @@ const KIND_OPTIONS = [
 export default Component.extend(StorageClassProvisioner, {
   layout,
 
-  kindOptions:        KIND_OPTIONS,
+  kindOptions: KIND_OPTIONS,
 
   skuName:            null,
   location:           null,
diff --git a/lib/shared/addon/components/table-labels/component.js b/lib/shared/addon/components/table-labels/component.js
index b4b6df755..a07bf1596 100644
--- a/lib/shared/addon/components/table-labels/component.js
+++ b/lib/shared/addon/components/table-labels/component.js
@@ -27,7 +27,7 @@ export default Component.extend(ManageLabels, {
     },
   ],
 
-  labelSource:    alias('model'),
+  labelSource: alias('model'),
   didReceiveAttrs() {
     this.initLabels(this.get('labelSource'));
   },
diff --git a/lib/shared/addon/components/textarea-autogrow/component.js b/lib/shared/addon/components/textarea-autogrow/component.js
index 86ec2becc..d791cce02 100644
--- a/lib/shared/addon/components/textarea-autogrow/component.js
+++ b/lib/shared/addon/components/textarea-autogrow/component.js
@@ -31,9 +31,11 @@ export default TextArea.extend(IntlPlaceholder, {
     if ( get(this, 'disabled') ) {
       return 'bg-disabled'
     }
+
+    return '';
   }),
 
-  isSmall: computed(function() {
+  isSmall: computed('isDestroyed', 'isDestroying', function() {
     if ( this.isDestroyed || this.isDestroying ) {
       return;
     }
diff --git a/lib/shared/addon/components/top-errors/component.js b/lib/shared/addon/components/top-errors/component.js
index 20e83c25c..63c21bbf2 100644
--- a/lib/shared/addon/components/top-errors/component.js
+++ b/lib/shared/addon/components/top-errors/component.js
@@ -1,8 +1,9 @@
-import { later } from '@ember/runloop';
+import $ from 'jquery';
 import Component from '@ember/component';
 import layout from './template';
-import { get, set, computed } from '@ember/object';
-import $ from 'jquery';
+import { get, set, observer } from '@ember/object';
+import { later } from '@ember/runloop';
+import { on } from '@ember/object/evented';
 
 export default Component.extend({
   layout,
@@ -17,11 +18,13 @@ export default Component.extend({
     set(this, 'errors', []);
   },
 
-  errorsDidChange: computed('errors.[]', function() {
+  errorsDidChange: on('init', observer('errors.[]', function() {
     if ( get(this, 'errors.length') ) {
       later(() => {
-        $().scrollIntoView();
+        try {
+          $(this.element)[0].scrollIntoView();
+        } catch (error) { }
       }, 100);
     }
-  }),
+  })),
 });
diff --git a/lib/shared/addon/components/upgrade-btn/component.js b/lib/shared/addon/components/upgrade-btn/component.js
index 69e686171..fbcb8a663 100644
--- a/lib/shared/addon/components/upgrade-btn/component.js
+++ b/lib/shared/addon/components/upgrade-btn/component.js
@@ -13,6 +13,8 @@ export default Component.extend(UpgradeComponent, {
     if ( this.get('color') === 'bg-transparent' ) {
       return 'p-0';
     }
+
+    return '';
   }),
 
   click() {
diff --git a/lib/shared/addon/cookies/service.js b/lib/shared/addon/cookies/service.js
index 63b9e89bc..8588cff53 100644
--- a/lib/shared/addon/cookies/service.js
+++ b/lib/shared/addon/cookies/service.js
@@ -36,7 +36,7 @@ function getAll() {
 }
 
 export default Service.extend({
-  app:             service(),
+  app: service(),
   unknownProperty(key) {
     let all = getAll();
 
diff --git a/lib/shared/addon/digital-ocean/service.js b/lib/shared/addon/digital-ocean/service.js
index c1e88d883..ac93560a8 100644
--- a/lib/shared/addon/digital-ocean/service.js
+++ b/lib/shared/addon/digital-ocean/service.js
@@ -8,7 +8,7 @@ import { reject } from 'rsvp';
 const DIGITALOCEAN_API = 'api.digitalocean.com/v2';
 
 export default Service.extend({
-  app:           service(),
+  app: service(),
 
   request(auth = {}, command, opt = {}, out) {
     let url     = `${ get(this, 'app.proxyEndpoint') }/`;
diff --git a/lib/shared/addon/endpoint/service.js b/lib/shared/addon/endpoint/service.js
index 8327ca2a1..359ebd173 100644
--- a/lib/shared/addon/endpoint/service.js
+++ b/lib/shared/addon/endpoint/service.js
@@ -43,7 +43,7 @@ export default Service.extend({
     return a.origin;
   }),
 
-  api: computed('absolute', 'app.{apiEndpoint}', function() {
+  api: computed('absolute', 'app.apiEndpoint', function() {
     // Strip trailing slash off of the absoluteEndpoint
     var base = this.get('absolute').replace(/\/+$/, '');
 
diff --git a/lib/shared/addon/k8s/service.js b/lib/shared/addon/k8s/service.js
index c167c942a..cfa8ad4e3 100644
--- a/lib/shared/addon/k8s/service.js
+++ b/lib/shared/addon/k8s/service.js
@@ -9,7 +9,7 @@ export default Service.extend({
   scope:       service(),
   app:         service(),
 
-  kubernetesDashboard: computed('scope.currentProject.id', 'scope.currentCluster.id', function() {
+  kubernetesDashboard: computed('app.{clusterToken,kubernetesDashboard,projectToken}', 'scope.currentCluster.id', 'scope.currentProject.id', function() {
     let url = this.get('app.kubernetesDashboard')
       .replace(this.get('app.projectToken'), this.get('scope.currentProject.id'))
       .replace(this.get('app.clusterToken'), this.get('scope.currentCluster.id'));
diff --git a/lib/shared/addon/mixins/catalog-app.js b/lib/shared/addon/mixins/catalog-app.js
index 714003306..7ef3bee76 100644
--- a/lib/shared/addon/mixins/catalog-app.js
+++ b/lib/shared/addon/mixins/catalog-app.js
@@ -67,7 +67,7 @@ export default Mixin.create({
     return files.sortBy('label');
   }),
 
-  sortedVersions: computed('versionsArray', 'templateResource.defaultVersion', function() {
+  sortedVersions: computed('defaultUrl', 'intl', 'showDefaultVersionOption', 'templateResource.defaultVersion', 'versionsArray', function() {
     const out = get(this, 'versionsArray').sort((a, b) => {
       if ( a.sortVersion && b.sortVersion ) {
         return compareVersion(a.sortVersion, b.sortVersion);
@@ -99,7 +99,7 @@ export default Mixin.create({
     return null;
   }),
 
-  answers: computed('selectedTemplateModel.allQuestions.@each.{variable,answer}', function() {
+  answers: computed('selectedTemplateModel.allQuestions.@each.{answer,variable}', 'selectedTemplateModel.customAnswers', function() {
     const out = {};
     const allQuestions = (get(this, 'selectedTemplateModel.allQuestions') || []);
     const filteredQuestions = allQuestions.filter((q) => evaluate(q, allQuestions));
diff --git a/lib/shared/addon/mixins/catalog-upgrade.js b/lib/shared/addon/mixins/catalog-upgrade.js
index b38e3f8a3..93a957c7b 100644
--- a/lib/shared/addon/mixins/catalog-upgrade.js
+++ b/lib/shared/addon/mixins/catalog-upgrade.js
@@ -20,7 +20,7 @@ export default Mixin.create(UpgradeComponent, {
   latestVersion:    null,
   templateId:       null,
 
-  templateVersion:   null,
+  templateVersion: null,
 
   checkUpdateStatus: on('init', observer('apps', function() {
     get(this, 'catalog').fetchTemplate(`${ PREFIX }:${ get(this, 'templateId') }`).then((template) => {
@@ -76,7 +76,7 @@ export default Mixin.create(UpgradeComponent, {
       });
       setProperties(this, {
         availableVersions,
-        templateVersion:   currentVersion
+        templateVersion: currentVersion
       });
     } else {
       setProperties(this, {
diff --git a/lib/shared/addon/mixins/cattle-transitioning-resource.js b/lib/shared/addon/mixins/cattle-transitioning-resource.js
index 36d060a49..ae99548b0 100644
--- a/lib/shared/addon/mixins/cattle-transitioning-resource.js
+++ b/lib/shared/addon/mixins/cattle-transitioning-resource.js
@@ -292,7 +292,7 @@ export default Mixin.create({
     return [];
   }),
 
-  _availableActions: computed('availableActions.[]', 'links.{self,yaml}', 'canEdit', 'canEditYaml', 'canViewYaml', 'canRemove', 'grafanaUrl', function() {
+  _availableActions: computed('availableActions.[]', 'canBulkRemove', 'canClone', 'canDownloadYaml', 'canEdit', 'canEditYaml', 'canRemove', 'canViewYaml', 'getAltActionDelete', 'grafanaUrl', 'links.{self,yaml}', function() {
     const out = get(this, 'availableActions').slice();
 
     let nextSort = 1;
@@ -403,19 +403,19 @@ export default Mixin.create({
 
   canEditYaml: alias('canEdit'),
 
-  canViewYaml: computed('links.@each', 'canEditYaml', function() {
+  canViewYaml: computed('canEditYaml', 'links.[]', 'links.yaml', function() {
     return !!get(this, 'links.yaml') && !get(this, 'canEditYaml');
   }),
 
-  canDownloadYaml: computed('links.@each', function() {
+  canDownloadYaml: computed('links.{@each,yaml}', function() {
     return !!get(this, 'links.yaml');
   }),
 
-  canEdit: computed('links.@each', 'actions.edit', function() {
+  canEdit: computed('actions.edit', 'links.[]', 'links.update', function() {
     return !!get(this, 'links.update') && !!get(this, 'actions.edit');
   }),
 
-  canRemove: computed('links.@each', function() {
+  canRemove: computed('links.{@each,remove}', function() {
     return !!get(this, 'links.remove');
   }),
 
@@ -509,7 +509,7 @@ export default Mixin.create({
     return false;
   }),
 
-  stateIcon: computed('relevantState', 'transitioning', function() {
+  stateIcon: computed('constructor.{defaultStateIcon,stateMap}', 'relevantState', 'transitioning', function() {
     var trans = get(this, 'transitioning');
     var icon = '';
 
@@ -551,7 +551,7 @@ export default Mixin.create({
     return icon;
   }),
 
-  stateColor: computed('relevantState', 'isError', function() {
+  stateColor: computed('constructor.{defaultStateColor,stateMap}', 'isError', 'relevantState', function() {
     if ( get(this, 'isError') ) {
       return 'text-error';
     }
diff --git a/lib/shared/addon/mixins/cluster-driver.js b/lib/shared/addon/mixins/cluster-driver.js
index 7f230b85e..3f719f895 100644
--- a/lib/shared/addon/mixins/cluster-driver.js
+++ b/lib/shared/addon/mixins/cluster-driver.js
@@ -25,9 +25,7 @@ export default Mixin.create({
     this._super(...arguments);
 
 
-    defineProperty(this, 'config', computed('configField', `primaryResource.${ this.configField }`, () => {
-      return get(this, `cluster.${  get(this, 'configField') }`);
-    }));
+    defineProperty(this, 'config', computed('configField', `primaryResource.${ this.configField }`, this._getConfigField));
   },
 
   actions: {
@@ -129,5 +127,10 @@ export default Mixin.create({
 
   doneSaving() {
     return resolve();
-  }
+  },
+
+  _getConfigField() {
+    return get(this, `cluster.${  get(this, 'configField') }`);
+  },
+
 });
diff --git a/lib/shared/addon/mixins/container-choices.js b/lib/shared/addon/mixins/container-choices.js
index cf6e82328..9b29e6c79 100644
--- a/lib/shared/addon/mixins/container-choices.js
+++ b/lib/shared/addon/mixins/container-choices.js
@@ -14,7 +14,7 @@ export default Mixin.create({
     this._super(...arguments);
   },
 
-  containerChoices: computed('allHosts.@each.instances', 'intl.locale', function() {
+  containerChoices: computed('allHosts.@each.instances', 'id', 'intl.locale', 'linksArray', 'store', function() {
     var list = [];
     var id = this.get('id');
     var intl = this.get('intl');
diff --git a/lib/shared/addon/mixins/grafana.js b/lib/shared/addon/mixins/grafana.js
index ba756c3d9..6305f5150 100644
--- a/lib/shared/addon/mixins/grafana.js
+++ b/lib/shared/addon/mixins/grafana.js
@@ -7,7 +7,7 @@ export default Mixin.create({
   scope:       service(),
   grafana:      service(),
 
-  grafanaUrl: computed('grafana.dashboards', function() {
+  grafanaUrl: computed('baseType', 'grafana.dashboards', 'grafanaDashboardName', 'grafanaResourceId', 'namespaceId', 'podName', 'scope.currentCluster.monitoringStatus.grafanaEndpoint', 'scope.currentProject.isMonitoringReady', 'scope.currentProject.monitoringStatus.grafanaEndpoint', 'type', function() {
     let dashboardName = get(this, 'baseType') === 'workload' ? (get(this, 'type') || '').capitalize() : get(this, 'grafanaDashboardName');
 
     const dashboard = (get(this, 'grafana.dashboards') || []).findBy('title', dashboardName);
diff --git a/lib/shared/addon/mixins/reservation-check.js b/lib/shared/addon/mixins/reservation-check.js
index 4f2a000d3..6a6c92a43 100644
--- a/lib/shared/addon/mixins/reservation-check.js
+++ b/lib/shared/addon/mixins/reservation-check.js
@@ -6,7 +6,7 @@ import { parseSi } from 'shared/utils/parse-unit';
 import { requiredError } from 'shared/utils/util';
 
 export default Mixin.create({
-  scope:                 service(),
+  scope: service(),
 
   preRequestsCpu:        null,
   preRequestsMemory:     null,
@@ -89,7 +89,7 @@ export default Mixin.create({
     }
   }),
 
-  minCpu: computed('requestsCpu', 'clusterLevelMinCpu', 'projectLevelMinCpu', function() {
+  minCpu: computed('clusterLevelMinCpu', 'level', 'projectLevelMinCpu', 'requestsCpu', function() {
     let cpu = parseInt(get(this, 'requestsCpu') || 0, 10);
 
     if ( isNaN(cpu) ) {
@@ -99,7 +99,7 @@ export default Mixin.create({
     return (get(this, 'level') === 'cluster' ? get(this, 'clusterLevelMinCpu') : get(this, 'projectLevelMinCpu'))  + cpu;
   }),
 
-  minMemory: computed('requestsMemory', 'clusterLevelMinMemory', 'projectLevelMinMemory', function() {
+  minMemory: computed('clusterLevelMinMemory', 'level', 'projectLevelMinMemory', 'requestsMemory', function() {
     let memory = parseInt(get(this, 'requestsMemory') || 0, 10);
 
     if ( isNaN(memory) ) {
diff --git a/lib/shared/addon/mixins/sortable-base.js b/lib/shared/addon/mixins/sortable-base.js
index f08e7bd4e..04ccef8a0 100644
--- a/lib/shared/addon/mixins/sortable-base.js
+++ b/lib/shared/addon/mixins/sortable-base.js
@@ -32,7 +32,7 @@ export default Mixin.create({
     },
   },
 
-  currentSort: computed('sortBy', 'groupByRef', 'headers.@each.{sortBy}', 'descending', function() {
+  currentSort: computed('descending', 'groupByRef', 'headers.@each.sortBy', 'preSorts', 'sortBy', function() {
     var headers = this.get('headers');
     var desc = this.get('descending');
     let sort = (this.get('preSorts') || []).slice();
diff --git a/lib/shared/addon/mixins/store-tweaks.js b/lib/shared/addon/mixins/store-tweaks.js
index 4dadd8120..502e33252 100644
--- a/lib/shared/addon/mixins/store-tweaks.js
+++ b/lib/shared/addon/mixins/store-tweaks.js
@@ -9,7 +9,7 @@ export default Mixin.create({
   defaultPageSize:   -1,
   removeAfterDelete: false,
 
-  headers: computed(function() {
+  headers: computed('cookies.CSRF', function() {
     let out = {
       [C.HEADER.ACTIONS]:      C.HEADER.ACTIONS_VALUE,
       [C.HEADER.NO_CHALLENGE]: C.HEADER.NO_CHALLENGE_VALUE
@@ -22,5 +22,5 @@ export default Mixin.create({
     }
 
     return out;
-  }).volatile(),
+  }),
 });
diff --git a/lib/shared/addon/mixins/stripped-name.js b/lib/shared/addon/mixins/stripped-name.js
index d1e99bcf8..2fd6ebbfd 100644
--- a/lib/shared/addon/mixins/stripped-name.js
+++ b/lib/shared/addon/mixins/stripped-name.js
@@ -5,7 +5,7 @@ import { computed } from '@ember/object';
 
 export default Mixin.create({
   stripStack:   true,
-  prefixLength: computed('name', function() {
+  prefixLength: computed('model.{displayName,labels}', 'name', function() {
     var name = this.get('model.displayName');
     var stackName = (this.get('model.labels') || {})[C.LABEL.STACK_NAME];
 
diff --git a/lib/shared/addon/mixins/tooltip.js b/lib/shared/addon/mixins/tooltip.js
index 2edce1b79..8fbc8ddf6 100644
--- a/lib/shared/addon/mixins/tooltip.js
+++ b/lib/shared/addon/mixins/tooltip.js
@@ -40,13 +40,15 @@ export default Mixin.create(ThrottledResize, {
   })),
 
   tooltipConstructor: on('init', observer('tooltipService.tooltipOpts', function() {
-    scheduleOnce('afterRender', this, function() {
-      if (get(this, 'tooltipService.tooltipOpts')) {
-        this.constructTooltip();
-      }
-    });
+    scheduleOnce('afterRender', this, 'setupToolTip');
   })),
 
+  setupToolTip() {
+    if (get(this, 'tooltipService.tooltipOpts')) {
+      this.constructTooltip();
+    }
+  },
+
   constructTooltip() {
     let tts           = get(this, 'tooltipService');
     let node          = $(this.element);
diff --git a/lib/shared/addon/mixins/upgrade-component.js b/lib/shared/addon/mixins/upgrade-component.js
index 01d5cfda1..0d99350b7 100644
--- a/lib/shared/addon/mixins/upgrade-component.js
+++ b/lib/shared/addon/mixins/upgrade-component.js
@@ -45,8 +45,6 @@ export default Mixin.create({
 
   color: computed('upgradeStatus', function() {
     switch ( get(this, 'upgradeStatus') ) {
-    case NONE:
-      return 'none';
     case CURRENT:
     case LOADING:
       return 'bg-default';
@@ -59,10 +57,13 @@ export default Mixin.create({
     case AVAILABLE:
     case UPGRADED:
       return 'bg-warning';
+    case NONE:
+    default:
+      return 'none';
     }
   }),
 
-  currentVersion: computed('model.externalIdInfo.{version}', 'model.externalId', function() {
+  currentVersion: computed('model.externalId', 'model.externalIdInfo.version', 'upgradeInfo.version', function() {
     let text = get(this, 'intl').t('upgradeBtn.version.current');
     let version = get(this, 'model.externalIdInfo.version');
 
diff --git a/lib/shared/addon/mixins/view-new-edit.js b/lib/shared/addon/mixins/view-new-edit.js
index aae93fc6b..68fba77f8 100644
--- a/lib/shared/addon/mixins/view-new-edit.js
+++ b/lib/shared/addon/mixins/view-new-edit.js
@@ -52,7 +52,7 @@ export default Mixin.create(NewOrEdit, {
     return isClone;
   }),
 
-  title: computed('mode', 'primaryResource.displayName', 'titleKey', function() {
+  title: computed('mode', 'originalModel.displayName', 'primaryResource.displayName', 'titleKey', function() {
     const prefix = get(this, 'titleKey');
     const mode = get(this, 'mode');
     const intl = get(this, 'intl');
diff --git a/lib/shared/addon/mixins/volume-source.js b/lib/shared/addon/mixins/volume-source.js
index b7a8a5cae..1604d87d8 100644
--- a/lib/shared/addon/mixins/volume-source.js
+++ b/lib/shared/addon/mixins/volume-source.js
@@ -9,9 +9,9 @@ export default Mixin.create({
   sourceStore: null, // set to clusterStore for cluster volumes
 
   // From the volume plugin
-  field:       null, // the name of the field on the volume
+  field: null, // the name of the field on the volume
 
-  config: computed('field', function() {
+  config: computed('field', 'volume', function() {
     const volume = get(this, 'volume');
     const field = get(this, 'field');
 
diff --git a/lib/shared/addon/release-versions/service.js b/lib/shared/addon/release-versions/service.js
index 8b3b3e467..cd474f0ca 100644
--- a/lib/shared/addon/release-versions/service.js
+++ b/lib/shared/addon/release-versions/service.js
@@ -5,7 +5,7 @@ import { set } from '@ember/object';
 export default Service.extend({
   globalStore: service(),
 
-  allVersions:    null,
+  allVersions: null,
 
   async getAllVersions(driver) {
     try {
diff --git a/lib/shared/addon/role-template/service.js b/lib/shared/addon/role-template/service.js
index 5be83f18f..ca75e54d4 100644
--- a/lib/shared/addon/role-template/service.js
+++ b/lib/shared/addon/role-template/service.js
@@ -4,7 +4,7 @@ import { get, set } from '@ember/object';
 import { computed } from '@ember/object';
 
 export default Service.extend({
-  globalStore:   service(),
+  globalStore: service(),
 
   _allRoleTemplates: null,
 
diff --git a/lib/shared/addon/scope/service.js b/lib/shared/addon/scope/service.js
index 8a349fc31..4271a5699 100644
--- a/lib/shared/addon/scope/service.js
+++ b/lib/shared/addon/scope/service.js
@@ -208,7 +208,7 @@ export default Service.extend({
     return get(this, 'globalStore').findAll('cluster', opt);
   },
 
-  dashboardBase: computed('currentCluster.id', function() {
+  dashboardBase: computed('app.environment', 'currentCluster.id', function() {
     let link;
 
     if ( get(this, 'app.environment') === 'development' ) {
@@ -233,5 +233,7 @@ export default Service.extend({
     if ( link ) {
       return `${ link }c/${ escape(cluster.id) }`;
     }
+
+    return;
   }),
 });
diff --git a/lib/shared/addon/security-scan-config/service.js b/lib/shared/addon/security-scan-config/service.js
index c454aa148..faab65579 100644
--- a/lib/shared/addon/security-scan-config/service.js
+++ b/lib/shared/addon/security-scan-config/service.js
@@ -42,11 +42,11 @@ export default Service.extend({
     return { [CONFIG_MAP_FILE_KEY]: JSON.stringify(get(this, 'defaultValue')) };
   }),
 
-  securityScanConfig: computed('configMaps', 'configMaps.[]', 'configMaps.@each', function() {
+  securityScanConfig: computed('configMaps', 'configMaps.[]',  function() {
     return get(this, 'configMaps').findBy('id', 'security-scan:security-scan-cfg');
   }),
 
-  parsedSecurityScanConfig: computed('securityScanConfig.data.[]', 'securityScanConfig.data.@each', 'loadedTrigger', function() {
+  parsedSecurityScanConfig: computed('defaultValue', 'loadedTrigger', 'securityScanConfig.data.[]', function() {
     try {
       return JSON.parse(get(this, 'securityScanConfig.data')[CONFIG_MAP_FILE_KEY]);
     } catch (error) {
@@ -84,7 +84,7 @@ export default Service.extend({
     }
   },
 
-  skipList: computed('securityScanConfig.data.@each', function() {
+  skipList: computed('report.version', 'securityScanConfig.data.[]', function() {
     const defaultValue = [];
 
     try {
diff --git a/lib/shared/addon/settings/service.js b/lib/shared/addon/settings/service.js
index 85b809e75..5a1e8ce6f 100644
--- a/lib/shared/addon/settings/service.js
+++ b/lib/shared/addon/settings/service.js
@@ -189,7 +189,7 @@ export default Service.extend(Evented, {
     return get(this, 'rancherImage') === 'rancher/enterprise';
   }),
 
-  appName: computed('isRancher', C.SETTING.PL, function() {
+  appName: computed(C.SETTING.PL, 'app.appName', 'isRancher', function() {
     if ( get(this, 'isRancher') ) {
       return get(this, 'app.appName');
     }
@@ -207,7 +207,7 @@ export default Service.extend(Evented, {
     return minorVersion(version);
   }),
 
-  docsBase: computed('intl.locale', 'minorVersion', function() {
+  docsBase: computed('intl.locale', 'minorVersion', 'rancherVersion', 'uiVersion', function() {
     let full = get(this, 'rancherVersion');
     let version;
 
@@ -269,7 +269,7 @@ export default Service.extend(Evented, {
     }
   }),
 
-  bannerContent: computed('uiBanners.@each.{banner}', 'showHeaderBanner', 'showFooterBanner', function() {
+  bannerContent: computed('uiBanners.@each.banner', 'showHeaderBanner', 'showFooterBanner', function() {
     const uiBanners = get(this, 'uiBanners');
 
     let parsedBanners = {}
diff --git a/lib/shared/addon/tooltip/service.js b/lib/shared/addon/tooltip/service.js
index ffaa3abaa..82e0b13dc 100644
--- a/lib/shared/addon/tooltip/service.js
+++ b/lib/shared/addon/tooltip/service.js
@@ -5,7 +5,7 @@ import { get } from '@ember/object';
 const DELAY = 250;
 
 export default Service.extend({
-  app:                   service(),
+  app: service(),
 
   mouseLeaveTimer:       null,
   requireClick:          false,
diff --git a/lib/shared/package.json b/lib/shared/package.json
index 5f2aaf70e..33c11bbe2 100644
--- a/lib/shared/package.json
+++ b/lib/shared/package.json
@@ -35,6 +35,7 @@
     "shell-quote": "*",
     "url-regex": "*",
     "xterm": "*",
+    "xterm-addon-fit": "*",
     "yamljs": "*",
     "dot-object": "*"
   }
diff --git a/package.json b/package.json
index 8c2ed7a66..46b2881f9 100644
--- a/package.json
+++ b/package.json
@@ -10,129 +10,113 @@
     "test": "tests"
   },
   "scripts": {
-    "dependencies": "./scripts/update-dependencies",
-    "lint:hbs": "ember-template-lint .",
-    "dev": "./node_modules/.bin/ember server",
-    "start": "./node_modules/.bin/ember server",
-    "test": "./node_modules/.bin/ember test",
     "build": "./node_modules/.bin/ember build",
-    "ember": "./node_modules/.bin/ember",
     "build-static": "./scripts/build-static",
+    "dependencies": "./scripts/update-dependencies",
+    "dev": "./node_modules/.bin/ember server",
+    "ember": "./node_modules/.bin/ember",
+    "lint:fix": "./node_modules/.bin/eslint --max-warnings 0 --fix .",
+    "lint:hbs": "ember-template-lint .",
     "lint:js": "./node_modules/.bin/eslint --max-warnings 0 .",
-    "lint:fix": "./node_modules/.bin/eslint --max-warnings 0 --fix ."
+    "start": "./node_modules/.bin/ember server",
+    "test": "./node_modules/.bin/ember test"
   },
   "engines": {
-    "node": "8.* || >= 10.*"
+    "node": "10.* || >= 12"
   },
   "devDependencies": {
-    "@ember/jquery": "^0.6.0",
-    "@ember/optional-features": "^0.7.0",
-    "@rancher/ember-api-store": "2.9.9",
-    "ansi_up": "^2.0.2",
-    "async": "2.1.2",
-    "babel-eslint": "^9.0.0",
+    "@ember/jquery": "1.1.0",
+    "@ember/optional-features": "^2.0.0",
+    "@glimmer/component": "^1.0.1",
+    "@glimmer/tracking": "^1.0.0",
+    "@rancher/ember-api-store": "3.0.0-rc1",
+    "ansi_up": "^4.0.4",
+    "async": "3.2.0",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "card": "2.4.0",
-    "cytoscape": "3.3.2",
+    "card": "2.5.0",
+    "cytoscape": "3.16.1",
     "d3": "3.5.17",
-    "dot-object": "^1.7.0",
-    "dotenv": "^6.0.0",
-    "echarts": "4.1.0",
-    "ember-assign-helper": "^0.1.2",
-    "ember-auto-import": "^1.5.3",
-    "ember-basic-dropdown": "^1.1.2",
-    "ember-cli": "~3.12.1",
+    "dompurify": "^2.1.1",
+    "dot-object": "^2.1.4",
+    "dotenv": "^8.2.0",
+    "echarts": "4.9.0",
+    "ember-assign-helper": "^0.3.0",
+    "ember-auto-import": "^1.6.0",
+    "ember-basic-dropdown": "^3.0.10",
+    "ember-cli": "~3.20.2",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.7.3",
-    "ember-cli-clipboard": "^0.9.0",
-    "ember-cli-dependency-checker": "^3.1.0",
-    "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
-    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-babel": "^7.21.0",
+    "ember-cli-clipboard": "^0.15.0",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-htmlbars": "^5.2.0",
+    "ember-cli-htmlbars-inline-precompile": "^3.0.1",
+    "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-inline-content": "^0.4.1",
     "ember-cli-pagination": "^3.1.4",
-    "ember-cli-release": "^0.2.9",
     "ember-cli-rtlcss": "^0.2.0",
     "ember-cli-sass": "^10.0.1",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-test-loader": "^2.2.0",
-    "ember-cli-uglify": "^2.1.0",
+    "ember-cli-test-loader": "^3.0.0",
+    "ember-cli-uglify": "^3.0.0",
     "ember-concurrency": "^1.0.0",
     "ember-copy": "^1.0.0",
     "ember-credit-card": "^2.4.0",
     "ember-deep-set": "^0.2.0",
-    "ember-drag-drop": "^0.4.7",
     "ember-engines": "^0.8.5",
-    "ember-export-application-global": "^2.0.0",
-    "ember-fetch": "^6.5.1",
-    "ember-flatpickr": "^2.7.0",
-    "ember-href-to": "^2.0.1",
+    "ember-export-application-global": "^2.0.1",
+    "ember-fetch": "^8.0.1",
+    "ember-flatpickr": "^3.0.1",
+    "ember-href-to": "^4.1.0",
     "ember-intl": "^4.3.0",
-    "ember-load-initializers": "^2.0.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-math-helpers": "^2.2.3",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^4.4.1",
-    "ember-resolver": "^5.0.1",
-    "ember-source": "~3.12.1",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^8.0.0",
+    "ember-source": "^3.20.2",
+    "ember-template-lint": "^2.9.1",
     "ember-truth-helpers": "2.1.0",
-    "ember-wormhole": "0.5.2",
-    "eslint-plugin-ember": "^6.2.0",
-    "eslint-plugin-node": "^9.0.1",
+    "ember-wormhole": "0.5.5",
+    "eslint": "^7.5.0",
+    "eslint-plugin-ember": "^8.9.1",
+    "eslint-plugin-node": "^11.1.0",
     "express": "^4.8.5",
-    "file-saver": "^1.3.8",
+    "file-saver": "^2.0.2",
     "forever-agent": "^0.6.1",
     "glob": "^7.1.2",
     "http-proxy": "^1.18.1",
     "identicon.js": "^2.3.2",
-    "ipaddr.js": "^1.8.1",
+    "ipaddr.js": "^2.0.0",
     "ivy-codemirror": "^2.1.0",
     "jgrowl": "~1.4.2",
-    "js-yaml": "3.13.1",
+    "js-yaml": "3.14.0",
     "json2yaml": "^1.1.0",
-    "jsondiffpatch": "^0.3.11",
+    "jsondiffpatch": "^0.4.1",
     "jszip": "^3.1.5",
     "linkifyjs": "^2.1.9",
-    "liquid-fire": "^0.30.0",
+    "liquid-fire": "^0.31.0",
     "loader.js": "^4.7.0",
-    "marked": "^0.3.15",
-    "moment": "~2.22.1",
+    "marked": "^1.2.0",
+    "moment": "~2.29.0",
     "node-sass": "^4.14.1",
     "objects-to-csv": "^1.3.5",
     "prettycron": "^0.10.0",
     "prismjs": "^1.21.0",
-    "qunit-dom": "^0.8.4",
+    "qunit-dom": "^1.2.0",
     "rancher-cytoscape-dagre": "2.2.7",
-    "semver": "^5.4.1",
+    "semver": "^7.3.2",
     "shell-quote": "^1.6.1",
     "webpack": "^4.44.1",
-    "xterm": "^3.8.1",
+    "xterm": "^4.9.0",
+    "xterm-addon-fit": "^0.4.0",
     "yamljs": "^0.3.0"
   },
   "dependencies": {
-    "dompurify": "^2.0.8",
     "mysql": "^2.15.0",
     "request": "^2.83.0",
-    "sendgrid": "^4.7.1",
-    "stripe": "^4.15.0"
-  },
-  "resolutions": {
-    "clean-css": "^4.1.11",
-    "fstream": "^1.0.12",
-    "handlebars": "^4.4.5",
-    "lodash": "^4.17.13",
-    "lodash.defaultsdeep": "^4.6.1",
-    "lodash.merge": "^4.6.2",
-    "lodash.mergewith": "^4.6.2",
-    "mem": "^4.0.0",
-    "merge": "^1.2.1",
-    "underscore.string": "^3.3.5",
-    "minimist": "^0.2.1",
-    "kind-of": "^6.0.3",
-    "mixin-deep": ">=1.3.2 <2.0.0 || >=2.0.1",
-    "set-value": ">=2.0.1 <3.0.0 || >=3.0.1",
-    "tar": ">=2.2.2 <3.0.0 || >=4.4.2"
+    "sendgrid": "^5.2.3",
+    "stripe": "^8.107.0"
   },
   "ember-addon": {
     "paths": [
diff --git a/testem.js b/testem.js
index 10e258cd1..fcc39e0d0 100644
--- a/testem.js
+++ b/testem.js
@@ -1,4 +1,6 @@
 /* eslint-env node */
+'use strict';
+
 module.exports = {
   test_page:             'tests/index.html?hidepassed',
   disable_watching:      true,
@@ -7,7 +9,8 @@ module.exports = {
   ],
   launch_in_dev: [
   ],
-  browser_args: {
+  browser_start_timeout: 120,
+  browser_args:          {
     Chrome: {
       ci: [
         // --no-sandbox is needed when running Chrome inside a container
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
deleted file mode 100644
index 171bab158..000000000
--- a/tests/.eslintrc.js
+++ /dev/null
@@ -1,207 +0,0 @@
-const propertyOrder = [
-  'service',
-  'controller',
-  'query-params',
-  'attribute',
-  'relationship',
-  'property',
-  'single-line-function',
-
-  'init',
-  'beforeModel',
-  'model',
-  'afterModel',
-  'redirect',
-  'setupController',
-  'resetController',
-  ['lifecycle-hook', 'activate', 'deactivate', 'didDestroyElement',
-    'didInsertElement', 'didReceiveAttrs', 'didRender', 'didUpdate',
-    'didUpdateAttrs', 'renderTemplate', 'serialize', 'setupController',
-    'willClearRender', 'willDestroyElement', 'willInsertElement', 'willRender', 'willUpdate'
-  ],
-
-  'actions',
-  'observer',
-  'multi-line-function'
-];
-
-module.exports = {
-  root:          true,
-  parser:        'babel-eslint',
-  parserOptions: {
-    ecmaVersion:                 2017,
-    sourceType:                  'module',
-    allowImportExportEverywhere: true
-  },
-  extends: [
-    'eslint:recommended',
-    'plugin:ember/recommended'
-  ],
-  globals: {
-    '$':         true,
-    'ALY':       true,
-    'AWS':       true,
-    'HW':        true,
-    'Stripe':    true,
-    'Ui':        true,
-    'WebSocket': true,
-    'document':  true,
-    'jQuery':    true,
-    'navigator': true,
-    'window':    true,
-  },
-  env:   {
-    node:      true,
-    embertest: true
-  },
-  rules: {
-    // Overrides
-    'curly':                                      'error',
-    'dot-notation':                               'off',
-    'ember/alias-model-in-controller':            'off',
-    'ember/avoid-leaking-state-in-ember-objects': 'off',
-    'ember/closure-actions':                      'off',
-    'ember/jquery-ember-run':                     'off',
-    'ember/named-functions-in-promises':          'off',
-    'ember/no-capital-letters-in-routes':         'off',
-    'ember/no-function-prototype-extensions':     'off',
-    'ember/no-observers':                         'off',
-    'ember/no-on-calls-in-components':            'off',
-    'ember/no-side-effects':                      'off',
-    'ember/no-old-shims':                         'error',
-    'ember/order-in-components':                  ['error', { order: propertyOrder }],
-    'ember/order-in-controllers':                 ['error', { order: propertyOrder }],
-    'ember/order-in-models':                      ['error', { order: propertyOrder }],
-    'ember/order-in-routes':                      ['error', { order: propertyOrder }],
-    'ember/use-brace-expansion':                  'off',
-    'ember/use-ember-get-and-set':                'off',
-    'ember/new-module-imports':                   'error',
-    'eqeqeq':                                     'error',
-    'generator-star-spacing':                     'off',
-    'guard-for-in':                               'off',
-    'linebreak-style':                            'off',
-    'new-cap':                                    'off',
-    'no-caller':                                  'error',
-    'no-cond-assign':                             ['error', 'except-parens'],
-    'no-console':                                 'off',
-    'no-debugger':                                'warn',
-    'no-empty':                                   'off',
-    'no-eq-null':                                 'error',
-    'no-eval':                                    'error',
-    'no-extra-boolean-cast':                      'off',
-    'no-new':                                     'off',
-    'no-plusplus':                                'off',
-    'no-undef':                                   'error',
-    'no-unused-vars':                             'warn',
-    'no-useless-escape':                          'off',
-    'strict':                                     'off',
-    'wrap-iife':                                  'off',
-    files:                                        [
-      '.eslintrc.js',
-      'tests/.eslintrc.js',
-      '.template-lintrc.js',
-      'ember-cli-build.js',
-      'testem.js',
-      'blueprints/*/index.js',
-      'config/**/*.js',
-      'lib/*/index.js'
-    ],
-    // stylistic
-    'array-bracket-spacing':    'error',
-    'padded-blocks':            ['error', 'never'],
-    'block-spacing':            ['error', 'always'],
-    'brace-style':              ['error', '1tbs'],
-    'comma-spacing':            'error',
-    'func-call-spacing':        ['error', 'never'],
-    'implicit-arrow-linebreak': 'error',
-    'indent':                   ['error', 2],
-    'key-spacing':              ['error', {
-      'align': {
-        'beforeColon': false,
-        'afterColon':  true,
-        'on':          'value',
-        'mode':        'minimum'
-      },
-      'multiLine': {
-        'beforeColon': false,
-        'afterColon':  true
-      },
-    }],
-    'keyword-spacing':               'error',
-    'lines-between-class-members':   'error',
-    'newline-per-chained-call':      ['error', { 'ignoreChainWithDepth': 4 }],
-    'no-whitespace-before-property': 'error',
-    'object-curly-newline':          ['error', {
-      'ObjectExpression':  {
-        'multiline':     true,
-        'minProperties': 3
-      },
-      'ObjectPattern':     {
-        'multiline':     true,
-        'minProperties': 3
-      },
-      'ImportDeclaration': {
-        'multiline':     true,
-        'minProperties': 5
-      },
-      'ExportDeclaration': {
-        'multiline':     true,
-        'minProperties': 3
-      }
-    }],
-    'object-curly-spacing':            ['error', 'always'],
-    'object-property-newline':         'error',
-    'padding-line-between-statements': [
-      'error',
-      {
-        'blankLine': 'always',
-        'prev':      '*',
-        'next':      'return',
-      },
-      // This configuration would require blank lines after every sequence of variable declarations
-      {
-        blankLine: 'always',
-        prev:      ['const', 'let', 'var'],
-        next:      '*'
-      },
-      {
-        blankLine: 'any',
-        prev:      ['const', 'let', 'var'],
-        next:      ['const', 'let', 'var']
-      }
-    ],
-    quotes: [
-      'error',
-      'single',
-      {
-        'avoidEscape':           true,
-        'allowTemplateLiterals': true
-      },
-    ],
-    'space-before-function-paren': ['error', 'never'],
-    'space-infix-ops':             'error',
-    'space-unary-ops':             [
-      'error',
-      {
-        'words':    true,
-        'nonwords': false,
-      }
-    ],
-    'spaced-comment':       'error',
-    'switch-colon-spacing': 'error',
-
-    // ECMAScript 6
-    'arrow-parens':           'error',
-    'arrow-spacing':          ['error', {
-      'before': true,
-      'after':  true
-    }],
-    'no-trailing-spaces':     'error',
-    'object-shorthand':       'error',
-    'prefer-arrow-callback':  'error',
-    'prefer-template':        'error',
-    'rest-spread-spacing':    'error',
-    'template-curly-spacing': ['error', 'always'],
-    'yield-star-spacing':     ['error', 'both'],
-  }
-};
diff --git a/yarn.lock b/yarn.lock
index dac9efe06..626dc33db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,13 +9,6 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
 "@babel/compat-data@^7.10.4", "@babel/compat-data@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz#e9f73efe09af1355b723a7f39b11bad637d7c99c"
@@ -25,16 +18,29 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
-  integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
+"@babel/core@^7.0.0", "@babel/core@^7.10.2", "@babel/core@^7.11.0", "@babel/core@^7.3.4":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz#3a9455dc7387ff1bac45770650bc13ba04a15651"
+  integrity sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==
   dependencies:
-    browserslist "^4.9.1"
-    invariant "^2.2.4"
-    semver "^5.5.0"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.6"
+    "@babel/helper-module-transforms" "^7.11.0"
+    "@babel/helpers" "^7.10.4"
+    "@babel/parser" "^7.11.5"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.11.5"
+    "@babel/types" "^7.11.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
 
-"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.11.0", "@babel/core@^7.2.2", "@babel/core@^7.3.3", "@babel/core@^7.3.4", "@babel/core@^7.4.3":
+"@babel/core@^7.1.6", "@babel/core@^7.2.2":
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
   integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
@@ -56,56 +62,13 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.8.3", "@babel/core@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
-  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+"@babel/generator@^7.11.0", "@babel/generator@^7.11.5", "@babel/generator@^7.11.6":
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz#b868900f81b163b4d464ea24545c61cbac4dc620"
+  integrity sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.0"
-    "@babel/parser" "^7.9.0"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
-  integrity sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==
-  dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.11.5"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/generator@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.0.tgz#4b90c78d8c12825024568cbe83ee6c9af193585c"
-  integrity sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==
-  dependencies:
-    "@babel/types" "^7.11.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
-  integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
-  dependencies:
-    "@babel/types" "^7.9.5"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
     source-map "^0.5.0"
 
 "@babel/helper-annotate-as-pure@^7.10.4":
@@ -115,13 +78,6 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
@@ -130,14 +86,6 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-compilation-targets@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz#804ae8e3f04376607cc791b9d47d540276332bd2"
@@ -149,18 +97,7 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-compilation-targets@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
-  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
-  dependencies:
-    "@babel/compat-data" "^7.8.6"
-    browserslist "^4.9.1"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5":
+"@babel/helper-create-class-features-plugin@^7.10.4", "@babel/helper-create-class-features-plugin@^7.10.5", "@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.8.3":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz#9f61446ba80e8240b0a5c85c6fdac8459d6f259d"
   integrity sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==
@@ -172,18 +109,6 @@
     "@babel/helper-replace-supers" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz#79753d44017806b481017f24b02fd4113c7106ea"
-  integrity sha512-IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA==
-  dependencies:
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-
 "@babel/helper-create-regexp-features-plugin@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz#fdd60d88524659a0b6959c0579925e425714f3b8"
@@ -193,15 +118,6 @@
     "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.0"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.7.0"
-
 "@babel/helper-define-map@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
@@ -211,32 +127,14 @@
     "@babel/types" "^7.10.5"
     lodash "^4.17.19"
 
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
-  dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    lodash "^4.17.13"
-
 "@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz#40a1cd917bff1288f699a94a75b37a1a2dbd8c7c"
-  integrity sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz#2d8e3470252cc17aba917ede7803d4a7a276a41b"
+  integrity sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==
   dependencies:
-    "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
-  dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-function-name@^7.1.0", "@babel/helper-function-name@^7.10.4":
+"@babel/helper-function-name@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
   integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
@@ -245,15 +143,6 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
-
 "@babel/helper-get-function-arity@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
@@ -261,13 +150,6 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
@@ -275,13 +157,6 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-member-expression-to-functions@^7.10.4", "@babel/helper-member-expression-to-functions@^7.10.5":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz#ae69c83d84ee82f4b42f96e2a09410935a8f26df"
@@ -289,27 +164,13 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-imports@^7.10.4":
+"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz#4c5c54be04bd31670a7382797d75b9fa2e5b5620"
   integrity sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-module-transforms@^7.10.4", "@babel/helper-module-transforms@^7.10.5", "@babel/helper-module-transforms@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz#b16f250229e47211abdd84b34b64737c2ab2d359"
@@ -323,19 +184,6 @@
     "@babel/types" "^7.11.0"
     lodash "^4.17.19"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
-
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
@@ -343,23 +191,11 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
 "@babel/helper-regex@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
@@ -367,35 +203,16 @@
   dependencies:
     lodash "^4.17.19"
 
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
-  dependencies:
-    lodash "^4.17.13"
-
 "@babel/helper-remap-async-to-generator@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz#fce8bea4e9690bbe923056ded21e54b4e8b68ed5"
-  integrity sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==
+  version "7.11.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz#4474ea9f7438f18575e30b0cac784045b402a12d"
+  integrity sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-wrap-function" "^7.10.4"
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-replace-supers@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz#d585cd9388ea06e6031e4cd44b6713cbead9e6cf"
@@ -406,16 +223,6 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
 "@babel/helper-simple-access@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz#0f5ccda2945277a2a7a2d3a821e15395edcf3461"
@@ -424,14 +231,6 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-skip-transparent-expression-wrappers@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz#eec162f112c2f58d3af0af125e3bb57665146729"
@@ -439,30 +238,18 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-split-export-declaration@^7.0.0", "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
   integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
   dependencies:
     "@babel/types" "^7.11.0"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
-"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
-
 "@babel/helper-wrap-function@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz#8a6f701eab0ff39f765b5a1cfef409990e624b87"
@@ -473,16 +260,6 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helpers@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz#2abeb0d721aff7c0a97376b9e1f6f65d7a475044"
@@ -492,15 +269,6 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helpers@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
-  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
-
 "@babel/highlight@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
@@ -510,30 +278,16 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+"@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1", "@babel/parser@^7.11.5", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz#c7ff6303df71080ec7a4f5b8c003c58f1cf51037"
+  integrity sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==
 
-"@babel/parser@^7.0.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.0.tgz#a7cd42cb3c12aec52e24375189a47b39759b783e"
-  integrity sha512-SmjnXCuPAlai75AFtzv+KCBcJ3sDDWbIn+WytKw1k+wAtEy6phqI2RqKh/zAnw53i1NR8su3Ep/UoqaKcimuLg==
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.11.0", "@babel/parser@^7.11.1", "@babel/parser@^7.3.4":
+"@babel/parser@^7.3.4":
   version "7.11.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.3.tgz#9e1eae46738bcd08e23e867bab43e7b95299a8f9"
   integrity sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==
 
-"@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
-  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
-
 "@babel/plugin-proposal-async-generator-functions@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz#3491cabf2f7c179ab820606cec27fed15e0e8558"
@@ -543,16 +297,7 @@
     "@babel/helper-remap-async-to-generator" "^7.10.4"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-
-"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.3.4":
+"@babel/plugin-proposal-class-properties@^7.1.0", "@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.3.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz#a33bf632da390a59c7a8c570045d1115cd778807"
   integrity sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==
@@ -560,14 +305,6 @@
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-class-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-proposal-decorators@^7.10.5", "@babel/plugin-proposal-decorators@^7.3.0":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz#42898bba478bc4b1ae242a703a953a7ad350ffb4"
@@ -577,15 +314,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-decorators" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
-  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-decorators" "^7.8.3"
-
 "@babel/plugin-proposal-dynamic-import@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz#ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"
@@ -594,14 +322,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-
 "@babel/plugin-proposal-export-namespace-from@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz#570d883b91031637b3e2958eea3c438e62c05f54"
@@ -618,14 +338,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-
 "@babel/plugin-proposal-logical-assignment-operators@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz#9f80e482c03083c87125dee10026b58527ea20c8"
@@ -634,7 +346,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz#02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"
   integrity sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==
@@ -642,14 +354,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
 "@babel/plugin-proposal-numeric-separator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz#ce1590ff0a65ad12970a609d78855e9a4c1aef06"
@@ -658,14 +362,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-
 "@babel/plugin-proposal-object-rest-spread@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz#bd81f95a1f746760ea43b6c2d3d62b11790ad0af"
@@ -675,15 +371,6 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz#3fd65911306d8746014ec0d0cf78f0e39a149116"
-  integrity sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-
 "@babel/plugin-proposal-optional-catch-binding@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz#31c938309d24a78a49d68fdabffaa863758554dd"
@@ -692,15 +379,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.11.0":
+"@babel/plugin-proposal-optional-chaining@^7.11.0", "@babel/plugin-proposal-optional-chaining@^7.6.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz#de5866d0646f6afdaab8a566382fe3a221755076"
   integrity sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==
@@ -709,14 +388,6 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
 "@babel/plugin-proposal-private-methods@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz#b160d972b8fdba5c7d111a145fc8c421fc2a6909"
@@ -725,7 +396,7 @@
     "@babel/helper-create-class-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.10.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.10.4", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz#4483cda53041ce3413b7fe2f00022665ddfaa75d"
   integrity sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==
@@ -733,14 +404,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-async-generators@^7.8.0":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -762,13 +425,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-decorators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
-  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-dynamic-import@^7.2.0", "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -811,13 +467,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
@@ -846,27 +495,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-typescript@^7.10.4":
+"@babel/plugin-syntax-typescript@^7.10.4", "@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz#2f55e770d3501e83af217d782cb7517d7bb34d25"
   integrity sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
-  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-arrow-functions@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz#e22960d77e697c74f41c501d44d73dbf8a6a64cd"
@@ -874,13 +509,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-async-to-generator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz#41a5017e49eb6f3cda9392a51eef29405b245a37"
@@ -890,15 +518,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.10.4"
 
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
-
 "@babel/plugin-transform-block-scoped-functions@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz#1afa595744f75e43a91af73b0d998ecfe4ebc2e8"
@@ -906,28 +525,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-block-scoping@^7.10.4":
+"@babel/plugin-transform-block-scoping@^7.10.4", "@babel/plugin-transform-block-scoping@^7.8.3":
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz#5b7efe98852bef8d652c0b28144cd93a9e4b5215"
   integrity sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
-
 "@babel/plugin-transform-classes@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz#405136af2b3e218bc4a1926228bc917ab1a0adc7"
@@ -942,20 +546,6 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    globals "^11.1.0"
-
 "@babel/plugin-transform-computed-properties@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz#9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"
@@ -963,13 +553,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-destructuring@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz#70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"
@@ -977,14 +560,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-dotall-regex@^7.10.4":
+"@babel/plugin-transform-dotall-regex@^7.10.4", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz#469c2062105c1eb6a040eaf4fac4b488078395ee"
   integrity sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==
@@ -992,14 +568,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-duplicate-keys@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz#697e50c9fee14380fe843d1f306b295617431e47"
@@ -1007,13 +575,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-exponentiation-operator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz#5ae338c57f8cf4001bdb35607ae66b92d665af2e"
@@ -1022,14 +583,6 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-for-of@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz#c08892e8819d3a5db29031b115af511dbbfebae9"
@@ -1037,13 +590,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-function-name@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz#6a467880e0fc9638514ba369111811ddbe2644b7"
@@ -1052,14 +598,6 @@
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-literals@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz#9f42ba0841100a135f22712d0e391c462f571f3c"
@@ -1067,13 +605,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-member-expression-literals@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz#b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"
@@ -1081,14 +612,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-modules-amd@^7.0.0", "@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.2.0":
+"@babel/plugin-transform-modules-amd@^7.0.0", "@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.10.5":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz#1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"
   integrity sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==
@@ -1097,15 +621,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-amd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz#19755ee721912cf5bb04c07d50280af3484efef4"
-  integrity sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
 "@babel/plugin-transform-modules-commonjs@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz#66667c3eeda1ebf7896d41f1f16b17105a2fbca0"
@@ -1116,16 +631,6 @@
     "@babel/helper-simple-access" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
-  integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
 "@babel/plugin-transform-modules-systemjs@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz#6270099c854066681bae9e05f87e1b9cadbe8c85"
@@ -1136,16 +641,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz#e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"
-  integrity sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
 "@babel/plugin-transform-modules-umd@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz#9a8481fe81b824654b3a0b65da3df89f3d21839e"
@@ -1154,14 +649,6 @@
     "@babel/helper-module-transforms" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-named-capturing-groups-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz#78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"
@@ -1169,13 +656,6 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-
 "@babel/plugin-transform-new-target@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz#9097d753cb7b024cb7381a3b2e52e9513a9c6888"
@@ -1183,12 +663,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-object-assign@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.10.4.tgz#f7c8f54ce8052ccd8b9da9b3358848423221c338"
+  integrity sha512-6zccDhYEICfMeQqIjuY5G09/yhKzG30DKHJeYBQUHIsJH7c2jXSGvgwRalufLAXAq432OSlsEfAOLlzEsQzxVw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-object-super@^7.10.4":
   version "7.10.4"
@@ -1198,14 +678,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.10.4"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
-
 "@babel/plugin-transform-parameters@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz#59d339d58d0b1950435f4043e74e2510005e2c4a"
@@ -1214,14 +686,6 @@
     "@babel/helper-get-function-arity" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-property-literals@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz#f6fe54b6590352298785b83edd815d214c42e3c0"
@@ -1229,13 +693,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-regenerator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz#2015e59d839074e76838de2159db421966fd8b63"
@@ -1243,13 +700,6 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
-  dependencies:
-    regenerator-transform "^0.14.2"
-
 "@babel/plugin-transform-reserved-words@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz#8f2682bcdcef9ed327e1b0861585d7013f8a54dd"
@@ -1257,14 +707,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-runtime@^7.11.0", "@babel/plugin-transform-runtime@^7.2.0":
+"@babel/plugin-transform-runtime@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.0.tgz#e27f78eb36f19448636e05c33c90fd9ad9b8bccf"
   integrity sha512-LFEsP+t3wkYBlis8w6/kmnd6Kb1dxTd+wGJ8MlxTGzQo//ehtqlVL4S9DNUa53+dtPSQobN2CXx4d81FqC58cw==
@@ -1274,13 +717,13 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-runtime@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
-  integrity sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==
+"@babel/plugin-transform-runtime@^7.2.0":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz#f108bc8e0cf33c37da031c097d1df470b3a293fc"
+  integrity sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
@@ -1291,13 +734,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-spread@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz#fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"
@@ -1306,13 +742,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.11.0"
 
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-sticky-regex@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz#8f3889ee8657581130a29d9cc91d7c73b7c4a28d"
@@ -1321,14 +750,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
 
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-
 "@babel/plugin-transform-template-literals@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz#78bc5d626a6642db3312d9d0f001f5e7639fde8c"
@@ -1337,14 +758,6 @@
     "@babel/helper-annotate-as-pure" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-typeof-symbol@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz#9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"
@@ -1352,13 +765,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-typescript@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz#2b4879676af37342ebb278216dd090ac67f13abb"
@@ -1368,10 +774,27 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-typescript" "^7.10.4"
 
-"@babel/plugin-transform-typescript@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz#4bb4dde4f10bbf2d787fce9707fb09b483e33359"
-  integrity sha512-yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==
+"@babel/plugin-transform-typescript@~7.4.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz#ab3351ba35307b79981993536c93ff8be050ba28"
+  integrity sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
+  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-typescript@~7.8.0":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz#48bccff331108a7b3a28c3a4adc89e036dc3efda"
+  integrity sha512-7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
@@ -1392,31 +815,89 @@
     "@babel/helper-create-regexp-features-plugin" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/polyfill@^7.0.0", "@babel/polyfill@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.10.4.tgz#915e5bfe61490ac0199008e35ca9d7d151a8e45a"
-  integrity sha512-8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg==
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.11.5.tgz#df550b2ec53abbc2ed599367ec59e64c7a707bb5"
+  integrity sha512-FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g==
   dependencies:
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/polyfill@^7.8.3", "@babel/polyfill@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
-  integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
+"@babel/preset-env@^7.0.0":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz#18cb4b9379e3e92ffea92c07471a99a2914e4272"
+  integrity sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==
   dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.4"
+    "@babel/compat-data" "^7.11.0"
+    "@babel/helper-compilation-targets" "^7.10.4"
+    "@babel/helper-module-imports" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.10.4"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.10.4"
+    "@babel/plugin-proposal-export-namespace-from" "^7.10.4"
+    "@babel/plugin-proposal-json-strings" "^7.10.4"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.11.0"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.4"
+    "@babel/plugin-proposal-numeric-separator" "^7.10.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.11.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.10.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.11.0"
+    "@babel/plugin-proposal-private-methods" "^7.10.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.10.4"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.10.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.10.4"
+    "@babel/plugin-transform-arrow-functions" "^7.10.4"
+    "@babel/plugin-transform-async-to-generator" "^7.10.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.10.4"
+    "@babel/plugin-transform-block-scoping" "^7.10.4"
+    "@babel/plugin-transform-classes" "^7.10.4"
+    "@babel/plugin-transform-computed-properties" "^7.10.4"
+    "@babel/plugin-transform-destructuring" "^7.10.4"
+    "@babel/plugin-transform-dotall-regex" "^7.10.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.10.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.10.4"
+    "@babel/plugin-transform-for-of" "^7.10.4"
+    "@babel/plugin-transform-function-name" "^7.10.4"
+    "@babel/plugin-transform-literals" "^7.10.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.10.4"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.10.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.10.4"
+    "@babel/plugin-transform-modules-umd" "^7.10.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.4"
+    "@babel/plugin-transform-new-target" "^7.10.4"
+    "@babel/plugin-transform-object-super" "^7.10.4"
+    "@babel/plugin-transform-parameters" "^7.10.4"
+    "@babel/plugin-transform-property-literals" "^7.10.4"
+    "@babel/plugin-transform-regenerator" "^7.10.4"
+    "@babel/plugin-transform-reserved-words" "^7.10.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.10.4"
+    "@babel/plugin-transform-spread" "^7.11.0"
+    "@babel/plugin-transform-sticky-regex" "^7.10.4"
+    "@babel/plugin-transform-template-literals" "^7.10.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.10.4"
+    "@babel/plugin-transform-unicode-escapes" "^7.10.4"
+    "@babel/plugin-transform-unicode-regex" "^7.10.4"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.11.5"
+    browserslist "^4.12.0"
+    core-js-compat "^3.6.2"
+    invariant "^2.2.2"
+    levenary "^1.1.1"
+    semver "^5.5.0"
 
-"@babel/preset-env@^7.0.0", "@babel/preset-env@^7.10.2", "@babel/preset-env@^7.11.0":
+"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.0.tgz#860ee38f2ce17ad60480c2021ba9689393efb796"
   integrity sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==
@@ -1490,76 +971,10 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
-  integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.5"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.0"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.5"
-    browserslist "^4.9.1"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
 "@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1567,20 +982,13 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.11.0", "@babel/runtime@^7.2.0":
+"@babel/runtime@^7.11.0", "@babel/runtime@^7.2.0", "@babel/runtime@^7.8.4":
   version "7.11.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
   integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
-  integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
 "@babel/template@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
@@ -1590,31 +998,7 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/template@^7.8.3", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
-"@babel/traverse@^7.0.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.0.tgz#503ec6669387efd182c3888c4eec07bcc45d91b2"
-  integrity sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.10"
-
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4":
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.2.4", "@babel/traverse@^7.3.4":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.0.tgz#9b996ce1b98f53f7c3e4175115605d56ed07dd24"
   integrity sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==
@@ -1629,22 +1013,22 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2"
-  integrity sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.11.0", "@babel/traverse@^7.11.5", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz#be777b93b518eb6d76ee2e1ea1d143daa11e61c3"
+  integrity sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.5"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.5"
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.11.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.11.5"
+    "@babel/types" "^7.11.5"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.13"
+    lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.3.2", "@babel/types@^7.3.4", "@babel/types@^7.4.4":
+"@babel/types@^7.1.6", "@babel/types@^7.3.2", "@babel/types@^7.3.4":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.0.tgz#2ae6bf1ba9ae8c3c43824e5861269871b206e90d"
   integrity sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==
@@ -1653,13 +1037,13 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
-  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
+  version "7.11.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz#d9de577d01252d77c6800cee039ee64faf75662d"
+  integrity sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":
@@ -1722,43 +1106,49 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@ember/jquery@^0.6.0":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@ember/jquery/-/jquery-0.6.1.tgz#eef89ebc8d7b49bddc176f2a646746c8f5d93978"
-  integrity sha512-XMgfUYag97YOYLsC0Ys4/H6mHO2U2wra/92eVIug+5eYBloYSDhv2MY/iq/ocwXVSB2dQaphJx5pFXqdrjEzWQ==
+"@ember/jquery@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/jquery/-/jquery-1.1.0.tgz#33d062610a5ceaa5c5c8a3187f870d47d6595940"
+  integrity sha512-zePT3LiK4/2bS4xafrbOlwoLJrDFseOZ95OOuVDyswv8RjFL+9lar+uxX6+jxRb0w900BcQSWP/4nuFSK6HXXw==
   dependencies:
     broccoli-funnel "^2.0.2"
     broccoli-merge-trees "^3.0.2"
-    ember-cli-babel "^7.7.3"
+    ember-cli-babel "^7.11.1"
     ember-cli-version-checker "^3.1.3"
     jquery "^3.4.1"
     resolve "^1.11.1"
 
-"@ember/optional-features@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-0.7.0.tgz#f65a858007020ddfb8342f586112750c32abd2d9"
-  integrity sha512-qLXvL/Kq/COb43oQmCrKx7Fy8k1XJDI2RlgbCnZHH26AGVgJT/sZugx1A2AIxKdamtl/Mi+rQSjGIuscSjqjDw==
+"@ember/optional-features@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ember/optional-features/-/optional-features-2.0.0.tgz#c809abd5a27d5b0ef3c6de3941334ab6153313f0"
+  integrity sha512-4gkvuGRYfpAh1nwAz306cmMeC1mG7wxZnbsBZ09mMaMX/W7IyKOKc/38JwrDPUFUalmNEM7q7JEPcmew2M3Dog==
   dependencies:
-    chalk "^2.3.0"
-    co "^4.6.0"
-    ember-cli-version-checker "^2.1.0"
-    glob "^7.1.2"
-    inquirer "^3.3.0"
-    mkdirp "^0.5.1"
-    silent-error "^1.1.0"
-    util.promisify "^1.0.0"
+    chalk "^4.1.0"
+    ember-cli-version-checker "^5.1.1"
+    glob "^7.1.6"
+    inquirer "^7.3.3"
+    mkdirp "^1.0.4"
+    silent-error "^1.1.1"
 
-"@ember/test-helpers@^1.6.0":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.6.1.tgz#5eb0b58486524c54f1b617a83e4ab327b7c62f07"
-  integrity sha512-gXLXR0XdZKfyXHFP+QLpG55TlrDtvrZI6TMQVQxdZwsz589kN8idmc01rDjyy53jx430tZTEsdhJvC2LrHXPwg==
+"@ember/render-modifiers@^1.0.1", "@ember/render-modifiers@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
+  integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
+  dependencies:
+    ember-cli-babel "^7.10.0"
+    ember-modifier-manager-polyfill "^1.1.0"
+
+"@ember/test-helpers@^1.7.1":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-1.7.2.tgz#5b128dc5f6524c3850abf52668e6bd4fda401194"
+  integrity sha512-FEJBpbFNIaWAsCSnataiNwYFvmcpoymL/B7fXLruuJ/46BnJjzLaRPtpUIZ91w4GNTK6knxbHWXW76aVb3Aezg==
   dependencies:
     broccoli-debug "^0.6.5"
     broccoli-funnel "^2.0.2"
     ember-assign-polyfill "^2.6.0"
     ember-cli-babel "^7.7.3"
     ember-cli-htmlbars-inline-precompile "^2.1.0"
-    ember-test-waiters "^1.0.0"
+    ember-test-waiters "^1.1.1"
 
 "@embroider/core@0.4.3", "@embroider/core@^0.4.3":
   version "0.4.3"
@@ -1806,65 +1196,100 @@
     resolve "^1.8.1"
     semver "^5.6.0"
 
-"@glimmer/compiler@^0.38.0":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.38.1.tgz#03b43a2a8a04b1ed39517862158e8897d0f6798b"
-  integrity sha512-V4wRYRPH6FSVZw9dNfZn3IRxBofUBL0oGeBLm7wNdUOg4oXE26BMmxRVtYzTsBmmSj7SqB+B6VKuH1jEuvOOhQ==
+"@eslint/eslintrc@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
+  integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==
   dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/syntax" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
-    "@glimmer/wire-format" "^0.38.1"
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    lodash "^4.17.19"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
 
-"@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/interfaces@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.38.1.tgz#5b1c174363396b99d6a6bddb35538151e4c4c989"
-  integrity sha512-YXnzRR7IviHdN+k2Llp8rQ+ADrdzme++A5EFZRxcUoD14Eu1u2S3al7FlLLfwHhp5R2leO+x3zSYoWsuzfvsqw==
+"@glimmer/component@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.0.2.tgz#679307972d29a849225c13062ab11c779956ff60"
+  integrity sha512-st6YroDjkvUeYWE36NglNG9hXmJOuOI8t44UEp1tufGc4B1L/CTlt1ziQGkaxkhY7/o2r0ZCcWHvf5bpq838YQ==
   dependencies:
-    "@glimmer/wire-format" "^0.38.1"
-    "@simple-dom/interface" "1.4.0"
+    "@glimmer/di" "^0.1.9"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/util" "^0.44.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.7.3"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "3.0.0"
+    ember-cli-version-checker "^3.1.3"
+    ember-compatibility-helpers "^1.1.2"
 
-"@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==
+"@glimmer/di@^0.1.9":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
+  integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
+
+"@glimmer/env@0.1.7", "@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/interfaces@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.1.tgz#42e4021569a00ca60d469ef06cc0c719883d109e"
+  integrity sha512-Ui4u/0G0zOYeDuz497DQ/isOgd43r6zNO0JdsDeVw1D/tYQQHR1Xk/1YRKC9jK2n5oicMYKVyEeT62Ec2rL/Jg==
   dependencies:
-    "@glimmer/di" "^0.2.0"
+    "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.38.1.tgz#625875da5f1e827ad5806fdaa23e2cd00369fda8"
-  integrity sha512-tzc1NeUd7hbBWqIlgSY5Oq8bEiMpp7ClawVt8hWUarbr9G+qR0toDEQYqZmeRtCXjHAIh9M9oYbpbzLP6+iiag==
+"@glimmer/syntax@^0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.1.tgz#60f0b14c8503f059b9b73065a2d86f9ca6c6e3f3"
+  integrity sha512-pjnPouu3tVJ5sDcpYCv9hyodJW6T07LvOjsGQ+QT5TdMqN4hoc4iK3dkdrRh+dkNcUsBxFQhxOtAbwOVSgtVtg==
   dependencies:
-    "@glimmer/interfaces" "^0.38.1"
-    "@glimmer/util" "^0.38.1"
-    handlebars "^4.0.6"
-    simple-html-tokenizer "^0.5.6"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/util" "0.62.1"
+    "@handlebars/parser" "^1.1.0"
+    simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.38.1.tgz#41ca0544f95ec980bc492f4f0e5a85564964c028"
-  integrity sha512-WAe+bqJSFBR8EmA/NsxcqWmyi2AfOyW9x1jpWczZHJiBkvssiRF6nre39CJVwwMPlFDtdKzvnRQkWVl8ZBhcNw==
-
-"@glimmer/wire-format@^0.38.1":
-  version "0.38.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.38.1.tgz#a77963cf7193ab23cbce242116aac613f17cd3dc"
-  integrity sha512-AT1dToybQxbY29XpkNra9/j7svq65ZNnSXmRs1zUKAarvgh6qxOBsnYeVBNrxBFduNuNJOxP8G0Y+nXEGrUoRQ==
+"@glimmer/tracking@^1.0.0", "@glimmer/tracking@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-1.0.2.tgz#4fe9ca89e3f4a2ae8e37c8bd8e4ea0d886d9abbf"
+  integrity sha512-9Vp04TM2IDTShGFdxccfvnmcaj4NwqLrwbOXm4iju5KL/WkeB8mqoCSLtO3kUg+80DqU0pKE8tR460lQP8CutA==
   dependencies:
-    "@glimmer/util" "^0.38.1"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/validator" "^0.44.0"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+"@glimmer/util@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.1.tgz#44221aca6a8bb06791b0057db9b1d72330c08094"
+  integrity sha512-e6YTDAgEh8fqarhyN+0ncXOixLn5Wt12/IWdwKmtGIhdALOc/lWbJfrxlmKD+kkFTTjUVJUKm1Y6pxUyXOo4Ww==
   dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.62.1"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/util@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
+  integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
+
+"@glimmer/validator@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.44.0.tgz#03d127097dc9cb23052cdb7fcae59d0a9dca53e1"
+  integrity sha512-i01plR0EgFVz69GDrEuFgq1NheIjZcyTy3c7q+w7d096ddPVeVcRzU3LKaqCfovvLJ+6lJx40j45ecycASUUyw==
+
+"@handlebars/parser@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
+  integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -1879,11 +1304,6 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
   integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
-
 "@nodelib/fs.walk@^1.2.3":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
@@ -1892,21 +1312,21 @@
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
 
-"@rancher/ember-api-store@2.9.9":
-  version "2.9.9"
-  resolved "https://registry.yarnpkg.com/@rancher/ember-api-store/-/ember-api-store-2.9.9.tgz#71f98801f7e6dae141d4da9ed0588119c63f4fa6"
-  integrity sha512-tHLnnQjRKAE2wO/U8fBi+kUpTfkwuiZ+NNp9mK7MnhU/ekoAFyWXbp264o+U0aTZagfC0smTH5rAxAECetDjgQ==
+"@rancher/ember-api-store@3.0.0-rc1":
+  version "3.0.0-rc1"
+  resolved "https://registry.yarnpkg.com/@rancher/ember-api-store/-/ember-api-store-3.0.0-rc1.tgz#e8a37521d02d151b2516945b38621619d4b330ef"
+  integrity sha512-djDVFLuNelAR2qc8mPFKvzqH+IaLOt5BxmIrUY2sOIjzxG5KwPzvozxZmmQXArU26T5UH53xEYJmPgQFTatJow==
   dependencies:
-    babel-eslint "^10.0.1"
+    babel-eslint "^10.1.0"
     broccoli-file-creator "^2.1.1"
-    ember-auto-import "^1.5.3"
-    ember-cli-babel "^7.1.2"
+    ember-auto-import "^1.6.0"
+    ember-cli-babel "^7.21.0"
     ember-cookies "^0.4.0"
-    eslint "^4.19.1"
+    eslint "^7.5.0"
     node-fetch "^2.3.0"
-    set-cookie-parser "^2.2.1"
+    set-cookie-parser "^2.4.6"
 
-"@simple-dom/interface@1.4.0":
+"@simple-dom/interface@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f"
   integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA==
@@ -1943,6 +1363,11 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.12.tgz#6160ae454cd89dae05adc3bb97997f488b608201"
   integrity sha512-aN5IAC8QNtSUdQzxu7lGBgYAOuU1tmRU4c9dIq5OKGf/SBVjXo+ffM2wEjudAWbgpOhy60nLoAGH1xm8fpCKFQ==
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 "@types/connect@*":
   version "3.4.33"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
@@ -1960,11 +1385,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
   integrity sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA==
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
 "@types/express-serve-static-core@*":
   version "4.17.9"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz#2d7b34dcfd25ec663c25c85d76608f8b249667f1"
@@ -1991,16 +1411,14 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+"@types/fs-extra@^8.1.0":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
+  integrity sha512-TcUlBem321DFQzBNuz8p0CLLKp0VvF/XH9E4KHNmgwyp4E3AfgI5cjiIVZWlbfThBop2qxFIh4+LeY6hVWWZ2w==
   dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/glob@^7.1.1":
+"@types/glob@*", "@types/glob@^7.1.1":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
   integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
@@ -2023,10 +1441,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
-"@types/node@*":
-  version "13.11.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.1.tgz#49a2a83df9d26daacead30d0ccc8762b128d53c7"
-  integrity sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==
+"@types/node@*", "@types/node@>=8.1.0":
+  version "14.11.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.11.3.tgz#e66274f2e16ea6334f4e29d364165ad079069e41"
+  integrity sha512-tPQAF6b1wak7rBO49tL2N5nNVknyHBAzJVylF5rIYkfXbFkrNpbBLFMFUjxHzuuBiR7Si7T/X4eh6IRhZxO1tQ==
 
 "@types/node@^9.6.0":
   version "9.6.32"
@@ -2043,7 +1461,7 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
-"@types/rimraf@^2.0.2":
+"@types/rimraf@^2.0.2", "@types/rimraf@^2.0.3":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
   integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
@@ -2382,10 +1800,10 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-abortcontroller-polyfill@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.3.0.tgz#de69af32ae926c210b7efbcc29bf644ee4838b00"
-  integrity sha512-lbWQgf+eRvku3va8poBlDBO12FigTQr9Zb7NIjXrePrhxWVKdCP2wbDl1tLDaYa18PWTom3UEWwdH13S46I+yA==
+abortcontroller-polyfill@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.5.0.tgz#2c562f530869abbcf88d949a2b60d1d402e87a7c"
+  integrity sha512-O6Xk757Jb4o0LMzMOMdWvxpHWrQzruYBaUruFaIOfAQRnWFxfdXYobw12jrVHGtoXk6WiiyYzc0QWN9aL62HQA==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
@@ -2410,38 +1828,36 @@ acorn-globals@^4.3.0:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
-  dependencies:
-    acorn "^3.0.4"
-
-acorn-jsx@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f"
-  integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==
+acorn-jsx@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
 acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.0.0, acorn@^5.1.1, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
+acorn@^5.0.0, acorn@^5.1.1, acorn@^5.5.3, acorn@^5.6.2:
   version "5.7.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.7, acorn@^6.4.1:
+acorn@^6.0.1, acorn@^6.0.2:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
+acorn@^6.4.1:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
+
+acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
 addressparser@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
@@ -2457,42 +1873,27 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
-
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0, ajv@^6.12.2, ajv@^6.12.3:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
-  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.10.2, ajv@^6.9.1:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+ajv@^6.12.2:
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.3.tgz#18c5af38a111ddeb4f2697bd78d68abc1cabd706"
+  integrity sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
@@ -2533,16 +1934,23 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
 ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -2563,6 +1971,11 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -2575,10 +1988,32 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi_up@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ansi_up/-/ansi_up-2.0.3.tgz#2b5d31df72121dab78ea34f5b2daf626e01578a2"
-  integrity sha1-K10x33ISHat46jT1str2JuAVeKI=
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
+ansi-to-html@^0.6.6:
+  version "0.6.14"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
+  integrity sha512-7ZslfB1+EnFSDO5Ju+ue5Y6It19DRnZXWv8jrGHgIlPna5Mh4jz7BV5jCbQneXNFurQcKoolaaAjHtgSBfOIuA==
+  dependencies:
+    entities "^1.1.2"
+
+ansi_up@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/ansi_up/-/ansi_up-4.0.4.tgz#5b8c35f0b02e4476f3f18cf89c3bf48d15d054f6"
+  integrity sha512-vRxC8q6QY918MbehO869biJW4tiunJdjOhi5fpY6NLOliBQlZhOkKgABJKJqH+JZfb/WfjvjN1chLWI6tODerw==
 
 ansicolors@~0.2.1:
   version "0.2.1"
@@ -2601,13 +2036,6 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aot-test-generators@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/aot-test-generators/-/aot-test-generators-0.1.0.tgz#43f0f615f97cb298d7919c1b0b4e6b7310b03cd0"
-  integrity sha1-Q/D2Ffl8spjXkZwbC05rcxCwPNA=
-  dependencies:
-    jsesc "^2.5.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -2655,11 +2083,6 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-  integrity sha1-fajPLiZijtcygDWB/SH2fKzS7uw=
-
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -2670,16 +2093,6 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-  integrity sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=
-
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-  integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
-
 array-to-error@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
@@ -2692,23 +2105,11 @@ array-to-sentence@^1.1.0:
   resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
   integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
 
-array-union@^1.0.1, array-union@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
@@ -2724,11 +2125,6 @@ arraybuffer.slice@~0.0.7:
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
   integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -2769,20 +2165,20 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-ast-types@0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
-  integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=
+ast-types@0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7"
+  integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA==
 
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-async-csv@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/async-csv/-/async-csv-2.1.2.tgz#4bfce2ced117c664e7cf68f78485e27759bb09fa"
-  integrity sha512-guc5Uy0zeChvSMFOMzeey5hAt++UzzKWMLCHnm5Cv5Mm6A54CTJTGKR2TB1XOgmJaao9uKWJ5JoOzcoQON0qCQ==
+async-csv@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/async-csv/-/async-csv-2.1.3.tgz#d6e43c61050ed3501b57f53c4c28943c5da59172"
+  integrity sha512-mpsCN+D7mzZeqrlDw7UTPhvDQDlx1i819E9fbKIt8drkgED5FSOlBv3Rk/+sXdevnO2wwlRkVOQ4kdT0AyqPqQ==
   dependencies:
     csv "^5.1.3"
 
@@ -2799,6 +2195,19 @@ async-disk-cache@^1.2.1:
     rsvp "^3.0.18"
     username-sync "^1.0.2"
 
+async-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-2.1.0.tgz#e0f37b187ed8c41a5991518a9556d206ae2843a2"
+  integrity sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==
+  dependencies:
+    debug "^4.1.1"
+    heimdalljs "^0.2.3"
+    istextorbinary "^2.5.1"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    rsvp "^4.8.5"
+    username-sync "^1.0.2"
+
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -2814,7 +2223,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async-promise-queue@^1.0.3:
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
   integrity sha512-xi0aQ1rrjPWYmqbwr18rrSKbSaXIeIwSd1J4KAgVfkq8utNbdZoht7GfvfY6swFUAMJ9obkc4WPJmtGwl+B8dw==
@@ -2822,14 +2231,6 @@ async-promise-queue@^1.0.3:
     async "^2.4.1"
     debug "^2.6.8"
 
-async-promise-queue@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.4.tgz#308baafbc74aff66a0bb6e7f4a18d4fe8434440c"
-  integrity sha512-GQ5X3DT+TefYuFPHdvIPXFTlKnh39U7dwtl+aUBGeKjMea9nBpv3c91DXgeyBQmY07vQ97f3Sr9XHqkamEameQ==
-  dependencies:
-    async "^2.4.1"
-    debug "^2.6.8"
-
 async.ensureasync@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/async.ensureasync/-/async.ensureasync-0.5.2.tgz#c3c7e4a4e9b31d96875d56b8504598446e1e305d"
@@ -2899,12 +2300,10 @@ async.util.setimmediate@0.5.2:
   resolved "https://registry.yarnpkg.com/async.util.setimmediate/-/async.util.setimmediate-0.5.2.tgz#2812ebabf2a58027758d4bc7793d1ccfaf10255f"
   integrity sha1-KBLrq/KlgCd1jUvHeT0cz68QJV8=
 
-async@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.1.2.tgz#612a4ab45ef42a70cde806bad86ee6db047e8385"
-  integrity sha1-YSpKtF70KnDN6Aa62G7m2wR+g4U=
-  dependencies:
-    lodash "^4.14.0"
+async@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
 
 async@^2.4.1, async@^2.6.2:
   version "2.6.3"
@@ -2923,6 +2322,11 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -2938,7 +2342,7 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
   integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
@@ -2947,7 +2351,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.24.1, babel-core@^6.26.0, babel-core@^6.26.3:
+babel-core@^6.26.0, babel-core@^6.26.3:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
@@ -2972,29 +2376,17 @@ babel-core@^6.24.1, babel-core@^6.26.0, babel-core@^6.26.3:
     slash "^1.0.0"
     source-map "^0.5.7"
 
-babel-eslint@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed"
-  integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==
+babel-eslint@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
+  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    eslint-scope "3.7.1"
-    eslint-visitor-keys "^1.0.0"
-
-babel-eslint@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
-  integrity sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    eslint-scope "3.7.1"
+    "@babel/parser" "^7.7.0"
+    "@babel/traverse" "^7.7.0"
+    "@babel/types" "^7.7.0"
     eslint-visitor-keys "^1.0.0"
+    resolve "^1.12.0"
 
 babel-generator@^6.26.0:
   version "6.26.1"
@@ -3153,13 +2545,6 @@ babel-plugin-compact-reexports@^1.1.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-compact-reexports/-/babel-plugin-compact-reexports-1.1.0.tgz#d329cf70ff882e1b3c916da15b312338caf29490"
   integrity sha512-+KgjNJ5yMeZzJxYZdLEy9m82m92aL7FLvNJcK6dYJbW06t+UTpFJ2FVSs35zMfURcPnrQELYhLG4VC+kt/4gvw==
 
-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"
@@ -3174,13 +2559,6 @@ babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3:
   dependencies:
     semver "^5.3.0"
 
-babel-plugin-dynamic-import-node@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
@@ -3195,27 +2573,13 @@ babel-plugin-ember-data-packages-polyfill@^0.1.2:
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
 
-babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.5.0:
+babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-polyfill@^2.5.0, babel-plugin-ember-modules-api-polyfill@^2.6.0:
   version "2.13.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.13.4.tgz#cf62bc9bfd808c48d810d5194f4329e9453bd603"
   integrity sha512-uxQPkEQAzCYdwhZk16O9m1R4xtCRNy4oEUTBrccOPfzlIahRZJic/JeP/ZEL0BC6Mfq6r55eOg6gMF/zdFoCvA==
   dependencies:
     ember-rfc176-data "^0.3.13"
 
-babel-plugin-ember-modules-api-polyfill@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.6.0.tgz#9524a65ef0c31ee82536a19c243fbaec1b977cbb"
-  integrity sha512-BSbLv3+ju1mcUUoPe7vPJgnGawrNxp6LfFBRHlNOKeMlQlml9Wo2MRRUrbpNDlmVc761xSKj8+cde7R0Lwpq7g==
-  dependencies:
-    ember-rfc176-data "^0.3.6"
-
-babel-plugin-ember-modules-api-polyfill@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.7.0.tgz#dcd6a9999da0d47d8c9185362bda6244ca525f4a"
-  integrity sha512-+QXPqmRngp13d7nKWrBcL6iIixpuyMNq107XV1dKvsvAO5BGFQ0mSk7Dl6/OgG+z2F1KquxkFfdXYBwbREQI6A==
-  dependencies:
-    ember-rfc176-data "^0.3.7"
-
 babel-plugin-ember-modules-api-polyfill@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.8.0.tgz#70244800f750bf1c9f380910c1b2eed1db80ab4a"
@@ -3230,17 +2594,35 @@ babel-plugin-ember-modules-api-polyfill@^3.1.1:
   dependencies:
     ember-rfc176-data "^0.3.15"
 
+babel-plugin-filter-imports@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"
+  integrity sha512-jDLlxI8QnfKd7PtieH6pl4tZJzymzfCDCPGdTq/grgbiYAikwDPp/oL0IlFJn0HQjLpcLkyYhPKkUVneRESw5w==
+  dependencies:
+    "@babel/types" "^7.7.2"
+    lodash "^4.17.15"
+
 babel-plugin-htmlbars-inline-precompile@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
   integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==
 
-babel-plugin-htmlbars-inline-precompile@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.0.1.tgz#e1e38a4087f446578e419a21c112530c8df02345"
-  integrity sha512-ZiFY0nQjtdMPGIDwp/5LYOs6rCr54QfcSV5nPbrA7C++Fv4Vb2Q/qrKYx78t+dwmARJztnOBlObFk4z8veHxNA==
+babel-plugin-htmlbars-inline-precompile@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-2.1.1.tgz#59edd4eab28d27fbafa26d51bc19795278d103a9"
+  integrity sha512-obo5//IFrEZNAQovcXxOXLn5nwkQ0Y+xhR7AMg1sYR6W7KxQLZI9/XzbIytVhjwwY+Bd2e0+qyHEplJbHyZ1Og==
 
-babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
+babel-plugin-htmlbars-inline-precompile@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-3.2.0.tgz#c4882ea875d0f5683f0d91c1f72e29a4f14b5606"
+  integrity sha512-IUeZmgs9tMUGXYu1vfke5I18yYJFldFGdNFQOWslXTnDWXzpwPih7QFduUqvT+awDpDuNtXpdt5JAf43Q1Hhzg==
+
+babel-plugin-htmlbars-inline-precompile@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-4.2.0.tgz#73e7a199c14db139b9c9aea240e03b7112784c81"
+  integrity sha512-n2jMGcFKvubnYi8Ink7zJnC+aQor97v5FJKYUOUKijj5gIDy/sOIAZ7BxDWb0co1VzZokdN7tvtLnQtiWfD1Gw==
+
+babel-plugin-module-resolver@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
   integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
@@ -3251,6 +2633,17 @@ babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
+babel-plugin-module-resolver@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.0.0.tgz#8f3a3d9d48287dc1d3b0d5595113adabd36a847f"
+  integrity sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==
+  dependencies:
+    find-babel-config "^1.2.0"
+    glob "^7.1.6"
+    pkg-up "^3.1.0"
+    reselect "^4.0.0"
+    resolve "^1.13.1"
+
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -3672,10 +3065,10 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-bignumber.js@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
-  integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==
+bignumber.js@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075"
+  integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==
 
 binary-extensions@^1.0.0:
   version "1.13.1"
@@ -3687,7 +3080,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9"
   integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==
 
-"binaryextensions@1 || 2":
+"binaryextensions@1 || 2", binaryextensions@^2.1.2:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
   integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
@@ -3709,10 +3102,12 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-bluebird@^2.10.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-  integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
+  dependencies:
+    inherits "~2.0.0"
 
 bluebird@^3.1.1, bluebird@^3.4.6, bluebird@^3.5.5:
   version "3.7.2"
@@ -3725,25 +3120,9 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0:
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
 bn.js@^5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.2.tgz#c9686902d3c9a27729f43ab10f9d79c2004da7b0"
-  integrity sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==
-
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  integrity sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
+  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
 
 body-parser@1.19.0:
   version "1.19.0"
@@ -3776,7 +3155,7 @@ bottleneck@^1.12.0:
   resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-1.16.0.tgz#d6ce13808527afc80b69092f15606655e5b21f1a"
   integrity sha1-1s4TgIUnr8gLaQkvFWBmVeWyHxo=
 
-bower-config@^1.4.1:
+bower-config@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
   integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
@@ -3892,24 +3271,7 @@ broccoli-babel-transpiler@^7.1.0:
     rsvp "^4.8.3"
     workerpool "^2.3.1"
 
-broccoli-babel-transpiler@^7.1.2:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.2.0.tgz#5c0d694c4055106abb385e2d3d88936d35b7cb18"
-  integrity sha512-lkP9dNFfK810CRHHWsNl9rjyYqcXH3qg0kArnA6tV9Owx3nlZm3Eyr0cGo6sMUQCNLH+2oKrRjOdUGSc6Um6Cw==
-  dependencies:
-    "@babel/core" "^7.3.3"
-    "@babel/polyfill" "^7.0.0"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
-    broccoli-persistent-filter "^2.2.1"
-    clone "^2.1.2"
-    hash-for-dep "^1.4.7"
-    heimdalljs-logger "^0.1.9"
-    json-stable-stringify "^1.0.1"
-    rsvp "^4.8.4"
-    workerpool "^3.1.1"
-
-broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.7.0:
+broccoli-babel-transpiler@^7.1.2, broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.6.0, broccoli-babel-transpiler@^7.7.0:
   version "7.7.0"
   resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.7.0.tgz#271d401e713bfd338d5ef0435d3c4c68f6eddd2a"
   integrity sha512-U8Cmnv0/AcQKehiIVi6UDzqq3jqhAEbY9CvOW5vdeNRmYhFpK6bXPmVczS/nUz5g4KsPc/FdnC3zbU6yVf4e7w==
@@ -3927,23 +3289,6 @@ broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.3.0, broccoli-bab
     rsvp "^4.8.4"
     workerpool "^3.1.1"
 
-broccoli-babel-transpiler@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.4.0.tgz#f3069f0f77e8017aa17e1e757dfb4a30de044182"
-  integrity sha512-DzPXQr1C+zOgzXG40wqPjtjSSa6wRKb+Ls45Qtq7Pn+GxL3/jIvQOBZi0/irZ5dlYVbRMEZiUnaIBIOha2ygIw==
-  dependencies:
-    "@babel/core" "^7.8.3"
-    "@babel/polyfill" "^7.8.3"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
-    broccoli-persistent-filter "^2.2.1"
-    clone "^2.1.2"
-    hash-for-dep "^1.4.7"
-    heimdalljs-logger "^0.1.9"
-    json-stable-stringify "^1.0.1"
-    rsvp "^4.8.4"
-    workerpool "^3.1.1"
-
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
@@ -3991,42 +3336,6 @@ broccoli-clean-css@^1.1.0:
     inline-source-map-comment "^1.0.5"
     json-stable-stringify "^1.0.0"
 
-broccoli-concat@^3.2.2:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.1.tgz#22ba97420b33f5254549adc5bc41163f97bd1793"
-  integrity sha512-3qvGPoxQygYb76EYR2m7Ji7jhCTmJlcAlbyjwJkPJAZmMLcnkCmPzq7nFa1lXW/3HDhktQyuQqGqskXWCCG66g==
-  dependencies:
-    broccoli-debug "^0.6.4"
-    broccoli-kitchen-sink-helpers "^0.3.1"
-    broccoli-plugin "^1.3.0"
-    ensure-posix-path "^1.0.2"
-    fast-sourcemap-concat "^1.4.0"
-    find-index "^1.1.0"
-    fs-extra "^4.0.3"
-    fs-tree-diff "^0.5.7"
-    lodash.merge "^4.3.1"
-    lodash.omit "^4.1.0"
-    lodash.uniq "^4.2.0"
-    walk-sync "^0.3.2"
-
-broccoli-concat@^3.7.1:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.3.tgz#0dca01311567ffb13180e6b4eb111824628e4885"
-  integrity sha512-2Ma9h81EJ0PRb9n4sW0i8KZlcnpTQfKxcj87zvi5DFe1fd8CTDEdseHDotK2beuA2l+LbgVPfd8EHaBJKm/Y8g==
-  dependencies:
-    broccoli-debug "^0.6.5"
-    broccoli-kitchen-sink-helpers "^0.3.1"
-    broccoli-plugin "^1.3.0"
-    ensure-posix-path "^1.0.2"
-    fast-sourcemap-concat "^1.4.0"
-    find-index "^1.1.0"
-    fs-extra "^4.0.3"
-    fs-tree-diff "^0.5.7"
-    lodash.merge "^4.3.1"
-    lodash.omit "^4.1.0"
-    lodash.uniq "^4.2.0"
-    walk-sync "^0.3.2"
-
 broccoli-concat@^3.7.3:
   version "3.7.5"
   resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.5.tgz#223beda8c1184252cf08ae020a3d45ffa6a48218"
@@ -4045,6 +3354,23 @@ broccoli-concat@^3.7.3:
     lodash.uniq "^4.2.0"
     walk-sync "^0.3.2"
 
+broccoli-concat@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.4.tgz#78e359ddc540b999d815355163bf3cfb6bd67322"
+  integrity sha512-NgdBIE57r+U/AslBohQr0mCS7PopIWL8dihMI1CzqffQkisAgqWMuddjYmizqRBQlml7crBFaBeUnPDHhf4/RQ==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^4.0.2"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^2.1.0"
+    find-index "^1.1.0"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+
 broccoli-config-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
@@ -4062,18 +3388,6 @@ broccoli-config-replace@^1.1.2:
     debug "^2.2.0"
     fs-extra "^0.24.0"
 
-broccoli-debug@^0.6.1:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150"
-  integrity sha512-CixMUndBqTljCc26i6ubhBrGbAWXpWBsGJFce6ZOr76Tul2Ev1xxM0tmf7OjSzdYhkr5BrPd/CNbR9VMPi+NBg==
-  dependencies:
-    broccoli-plugin "^1.2.1"
-    fs-tree-diff "^0.5.2"
-    heimdalljs "^0.2.1"
-    heimdalljs-logger "^0.1.7"
-    symlink-or-copy "^1.1.8"
-    tree-sync "^1.2.2"
-
 broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.5.tgz#164a5cdafd8936e525e702bf8f91f39d758e2e78"
@@ -4148,7 +3462,7 @@ broccoli-funnel@2.0.1:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
+broccoli-funnel@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
   integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
@@ -4187,6 +3501,22 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
+broccoli-funnel@^3.0.1, broccoli-funnel@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
+  integrity sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^4.0.1"
+    debug "^4.1.1"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    path-posix "^1.0.0"
+    walk-sync "^2.0.2"
+
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
@@ -4203,19 +3533,6 @@ broccoli-kitchen-sink-helpers@^0.3.1:
     glob "^5.0.10"
     mkdirp "^0.5.1"
 
-broccoli-lint-eslint@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-lint-eslint/-/broccoli-lint-eslint-5.0.0.tgz#05365879d597dd78496a1c718db0e5ea5d4a2bde"
-  integrity sha512-V7M6U4th21bf1X4u3KoZa0xkcPq9JCSyKxB/nCWCBFMI3rkrB8nlyDLd8DKIUTqL+ojlFOGV5lohPZwndw0sZw==
-  dependencies:
-    aot-test-generators "^0.1.0"
-    broccoli-concat "^3.2.2"
-    broccoli-persistent-filter "^2.1.0"
-    eslint "^5.6.0"
-    json-stable-stringify "^1.0.1"
-    lodash.defaultsdeep "^4.6.0"
-    md5-hex "^2.0.0"
-
 broccoli-merge-trees@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz#10aea46dd5cebcc8b8f7d5a54f0a84a4f0bb90b9"
@@ -4262,7 +3579,15 @@ broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
     broccoli-plugin "^1.3.0"
     merge-trees "^2.0.0"
 
-broccoli-middleware@^2.0.1:
+broccoli-merge-trees@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
+  integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
+  dependencies:
+    broccoli-plugin "^4.0.2"
+    merge-trees "^2.0.0"
+
+broccoli-middleware@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
   integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
@@ -4272,25 +3597,6 @@ broccoli-middleware@^2.0.1:
     has-ansi "^3.0.0"
     mime-types "^2.1.18"
 
-broccoli-module-normalizer@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz#f9982d9cbb776b4ed754161cc6547784d3eb19de"
-  integrity sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==
-  dependencies:
-    broccoli-plugin "^1.3.0"
-    merge-trees "^1.0.1"
-    rimraf "^2.6.2"
-    symlink-or-copy "^1.1.8"
-
-broccoli-module-unification-reexporter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz#031909c5d3f159ec11d5f9e2346f2861db8acb3e"
-  integrity sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A==
-  dependencies:
-    broccoli-plugin "^1.3.0"
-    mkdirp "^0.5.1"
-    walk-sync "^0.3.2"
-
 broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
@@ -4313,24 +3619,14 @@ broccoli-output-wrapper@^2.0.0:
   dependencies:
     heimdalljs-logger "^0.1.10"
 
-broccoli-persistent-filter@^1.0.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1"
-  integrity sha512-JwNLDvvXJlhUmr+CHcbVhCyp33NbCIAITjQZmJY9e8QzANXh3jpFWlhSFvkWghwKA8rTAKcXkW12agtiZjxr4g==
+broccoli-output-wrapper@^3.2.1:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.3.tgz#e5c9de7c881570eb4c0b0d194bb12d9671b25a9b"
+  integrity sha512-vzbm4j59Wr5vr/O50LD43Np1jbLBWJ/vhppzL/UXWf39xac9grJtrlx9SSy+pDRNT2LGBHNIGPOhdqwp94q2Pg==
   dependencies:
-    async-disk-cache "^1.2.1"
-    async-promise-queue "^1.0.3"
-    broccoli-plugin "^1.0.0"
-    fs-tree-diff "^0.5.2"
-    hash-for-dep "^1.0.2"
-    heimdalljs "^0.2.1"
-    heimdalljs-logger "^0.1.7"
-    mkdirp "^0.5.1"
-    promise-map-series "^0.2.1"
-    rimraf "^2.6.1"
-    rsvp "^3.0.18"
-    symlink-or-copy "^1.0.1"
-    walk-sync "^0.3.1"
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
 
 broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
   version "1.4.6"
@@ -4351,7 +3647,7 @@ broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.3:
     symlink-or-copy "^1.0.1"
     walk-sync "^0.3.1"
 
-broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.1.1, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
+broccoli-persistent-filter@^2.1.1, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
   integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
@@ -4371,6 +3667,23 @@ broccoli-persistent-filter@^2.1.0, broccoli-persistent-filter@^2.1.1, broccoli-p
     sync-disk-cache "^1.3.3"
     walk-sync "^1.0.0"
 
+broccoli-persistent-filter@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.1.tgz#318c68a82d5759582bb60e7e2c0f3ca008176224"
+  integrity sha512-gP797MF87JjkcwhGBkE0fhF3aIbGnOF3K3A0iZpQSxtpmSNt+rbNzuqDOmgiKwWpx6v0+APkM5HUA0NiIZpgsQ==
+  dependencies:
+    async-disk-cache "^2.0.0"
+    async-promise-queue "^1.0.3"
+    broccoli-plugin "^4.0.3"
+    fs-tree-diff "^2.0.0"
+    hash-for-dep "^1.5.0"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.7"
+    promise-map-series "^0.2.1"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.0.1"
+    sync-disk-cache "^2.0.0"
+
 broccoli-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
@@ -4414,6 +3727,19 @@ broccoli-plugin@^3.1.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
+broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.3.tgz#9dcfbfb6a1b27a37cc22e65c071719ce9f92bc1e"
+  integrity sha512-CtAIEYq5K+4yQv8c/BHymOteuyjDAJfvy/asu4LudIWcMSS7dTn3yGI5gNBkwHG+qlRangYkHJNVAcDZMQbSVQ==
+  dependencies:
+    broccoli-node-api "^1.6.0"
+    broccoli-output-wrapper "^3.2.1"
+    fs-merger "^3.1.0"
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^3.0.0"
+    symlink-or-copy "^1.3.0"
+
 broccoli-rollup@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d"
@@ -4442,7 +3768,7 @@ broccoli-sass-source-maps@^4.0.0:
     object-assign "^2.0.0"
     rsvp "^3.0.6"
 
-broccoli-slow-trees@^3.0.1:
+broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz#8e48903f59e061bf1213963733b9e61dec2ee5d7"
   integrity sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==
@@ -4472,26 +3798,6 @@ broccoli-sri-hash@^2.1.0:
     sri-toolbox "^0.2.0"
     symlink-or-copy "^1.0.1"
 
-broccoli-stew@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.6.0.tgz#01f6d92806ed6679ddbe48d405066a0e164dfbef"
-  integrity sha512-sUwCJNnYH4Na690By5xcEMAZqKgquUQnMAEuIiL3Z2k63mSw9Xg+7Ew4wCrFrMmXMcLpWjZDOm6Yqnq268N+ZQ==
-  dependencies:
-    broccoli-debug "^0.6.1"
-    broccoli-funnel "^2.0.0"
-    broccoli-merge-trees "^2.0.0"
-    broccoli-persistent-filter "^1.1.6"
-    broccoli-plugin "^1.3.0"
-    chalk "^2.4.1"
-    debug "^3.1.0"
-    ensure-posix-path "^1.0.1"
-    fs-extra "^5.0.0"
-    minimatch "^3.0.4"
-    resolve "^1.8.1"
-    rsvp "^4.8.3"
-    symlink-or-copy "^1.2.0"
-    walk-sync "^0.3.0"
-
 broccoli-stew@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.1.0.tgz#ba73add17fda3b9b01d8cfb343a8b613b7136a0a"
@@ -4555,36 +3861,37 @@ broccoli-test-helper@^2.0.0:
     tmp "^0.0.33"
     walk-sync "^0.3.3"
 
-broccoli-uglify-sourcemap@^2.1.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.2.0.tgz#2ff49389bdf342a550c3596750ba2dde95a8f7d4"
-  integrity sha1-L/STib3zQqVQw1lnULot3pWo99Q=
+broccoli-uglify-sourcemap@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
+  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
   dependencies:
-    async-promise-queue "^1.0.4"
+    async-promise-queue "^1.0.5"
     broccoli-plugin "^1.2.1"
-    debug "^3.1.0"
-    lodash.defaultsdeep "^4.6.0"
-    matcher-collection "^1.0.5"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.0"
     mkdirp "^0.5.0"
     source-map-url "^0.4.0"
     symlink-or-copy "^1.0.1"
-    terser "^3.7.5"
-    walk-sync "^0.3.2"
-    workerpool "^2.3.0"
+    terser "^4.3.9"
+    walk-sync "^1.1.3"
+    workerpool "^5.0.1"
 
 broccoli@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-2.0.1.tgz#3611d643bf4b2666b565dc24cc5307fc80f62bf6"
-  integrity sha512-ipHuKVjO8jPJE3DKFHLXlj8DcsbGH8OQ1DlHaAWfuQya1qe6lgEi1+kyeKWCccaJlEtEq40EQ50Eiq2M0hxOfQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-2.3.0.tgz#b3f71b2c3d02fc042988e208827a09c75dd7b350"
+  integrity sha512-TeYMYlCGFK8EGk4Wce1G1uU3i52+YxRqP3WPOVDojC1zUk+Gi40wHBzUT2fncQZDl26dmCQMNugtHKjvUpcGQg==
   dependencies:
     broccoli-node-info "1.1.0"
     broccoli-slow-trees "^3.0.1"
     broccoli-source "^1.1.0"
     commander "^2.15.1"
     connect "^3.6.6"
+    esm "^3.2.4"
     findup-sync "^2.0.0"
     handlebars "^4.0.11"
-    heimdalljs "^0.2.5"
+    heimdalljs "^0.2.6"
     heimdalljs-logger "^0.1.9"
     mime-types "^2.1.19"
     promise.prototype.finally "^3.1.0"
@@ -4596,7 +3903,7 @@ broccoli@^2.0.0:
     underscore.string "^3.2.2"
     watch-detector "^0.1.0"
 
-broccoli@^3.1.1:
+broccoli@^3.4.2:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.4.2.tgz#a0c2605bea285c50cac304f482b86670630f4701"
   integrity sha512-OZ0QEyL2i08xJWwhg9Fe0x5IScjBur986QRWrj5mAyHRZqF1nShEz01BPFoLt6L2tqJT0gyZsf8nfUvm8CcJgA==
@@ -4714,25 +4021,15 @@ browserslist@^4.0.0:
     electron-to-chromium "^1.3.137"
     node-releases "^1.1.21"
 
-browserslist@^4.12.0:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000"
-  integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==
+browserslist@^4.12.0, browserslist@^4.8.5:
+  version "4.14.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
+  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
   dependencies:
-    caniuse-lite "^1.0.30001111"
-    electron-to-chromium "^1.3.523"
-    escalade "^3.0.2"
-    node-releases "^1.1.60"
-
-browserslist@^4.8.3, browserslist@^4.9.1:
-  version "4.11.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.11.1.tgz#92f855ee88d6e050e7e7311d987992014f1a1f1b"
-  integrity sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==
-  dependencies:
-    caniuse-lite "^1.0.30001038"
-    electron-to-chromium "^1.3.390"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
+    caniuse-lite "^1.0.30001135"
+    electron-to-chromium "^1.3.571"
+    escalade "^3.1.0"
+    node-releases "^1.1.61"
 
 bser@2.1.1:
   version "2.1.1"
@@ -4741,24 +4038,6 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -4864,28 +4143,11 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
-
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
   integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -4931,20 +4193,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971:
-  version "1.0.30000973"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000973.tgz#2f8e8e54f9e6c5b7a631c9e69bfa1093d8cfd360"
-  integrity sha512-/F3t/Yo8LEdRSEPCmI15fLu5vepVh9UCg/9inJXF5AAfW7xRRJkbaM2ut52iRMQMnGCLQouLbFdbOA+VEFOIsg==
-
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001111:
-  version "1.0.30001113"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz#22016ab55b5a8b04fa00ca342d9ee1b98df48065"
-  integrity sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA==
-
-caniuse-lite@^1.0.30001038:
-  version "1.0.30001039"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz#b3814a1c38ffeb23567f8323500c09526a577bbe"
-  integrity sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000971, caniuse-lite@^1.0.30001135:
+  version "1.0.30001143"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001143.tgz#560f2cfb9f313d1d7e52eb8dac0e4e36c8821c0d"
+  integrity sha512-p/PO5YbwmCpBJPxjOiKBvAlUPgF8dExhfEpnsH+ys4N/791WHrYrGg0cyHiAURl5hSbx5vIcjKmQAP6sHDYH3w==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -4953,13 +4205,13 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-card@2.4.0, card@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/card/-/card-2.4.0.tgz#7c10131c544e67dabfde82608b30dd0a538b12fa"
-  integrity sha1-fBATHFROZ9q/3oJgizDdClOLEvo=
+card@2.5.0, card@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/card/-/card-2.5.0.tgz#62bdfdc5b9f92faec3de2201489673bf844d22da"
+  integrity sha512-vShS/L9APZtmlo/GrDQApHdpkM8EBbpfCLequdN6epuE2q2Il5w81+j+6U6sh3BTxYD53r7YyE6Vl8zGtEwN5g==
   dependencies:
     node.extend "~1.1.3"
-    payment "^2.3.0"
+    payment "^2.4.0"
     qj "^2.0.0"
 
 cardinal@^1.0.0:
@@ -5012,10 +4264,13 @@ chalk@^2.3.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-  integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
 chardet@^0.7.0:
   version "0.7.0"
@@ -5063,7 +4318,7 @@ chokidar@^3.4.1:
   optionalDependencies:
     fsevents "~2.1.2"
 
-chownr@^1.1.1, chownr@^1.1.3:
+chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -5088,11 +4343,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -5142,12 +4392,13 @@ clean-css-promise@^0.1.0:
     clean-css "^3.4.5"
     pinkie-promise "^2.0.0"
 
-clean-css@^3.4.5, clean-css@^4.1.11:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
+clean-css@^3.4.5:
+  version "3.4.28"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
+  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
   dependencies:
-    source-map "~0.6.0"
+    commander "2.8.x"
+    source-map "0.4.x"
 
 clean-up-path@^1.0.0:
   version "1.0.0"
@@ -5161,7 +4412,14 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-spinners@^2.0.0:
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
+cli-spinners@^2.0.0, cli-spinners@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
   integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
@@ -5178,6 +4436,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
   integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 clipboard@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.1.tgz#a12481e1c13d8a50f5f036b0560fe5d16d74e46a"
@@ -5187,6 +4450,15 @@ clipboard@^2.0.0:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
+clipboard@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
+  integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==
+  dependencies:
+    good-listener "^1.2.2"
+    select "^1.1.2"
+    tiny-emitter "^2.0.0"
+
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -5205,6 +4477,15 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -5222,11 +4503,6 @@ clone@^2.0.0, clone@^2.1.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -5252,16 +4528,33 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
   integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
+colors@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
 colors@~0.6.0-1:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
@@ -5274,36 +4567,38 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.12.2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
-  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
+commander@2.8.x:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
+  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
 
-commander@^2.10.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
-  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
+commander@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.0.0.tgz#2b270da94f8fb9014455312f829a1129dbf8887e"
+  integrity sha512-s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA==
 
 commander@^2.15.1, commander@^2.20.0, commander@^2.6.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.1.1:
+commander@^4.0.0, commander@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
+commander@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
+  integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==
+
 commander@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781"
   integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=
 
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
 common-tags@^1.4.0, common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -5359,7 +4654,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -5369,17 +4664,17 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-configstore@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
-  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
+configstore@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
   dependencies:
-    dot-prop "^4.1.0"
+    dot-prop "^5.2.0"
     graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
 
 connect@^3.6.6:
   version "3.7.0"
@@ -5401,7 +4696,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-console-ui@^3.0.2, console-ui@^3.0.4:
+console-ui@^3.0.4, console-ui@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171"
   integrity sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ==
@@ -5424,11 +4719,6 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
-
 content-disposition@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
@@ -5491,11 +4781,11 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.6.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
-  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+  version "3.6.5"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"
+  integrity sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==
   dependencies:
-    browserslist "^4.8.3"
+    browserslist "^4.8.5"
     semver "7.0.0"
 
 core-js@2.4.1:
@@ -5508,11 +4798,6 @@ core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
-
 core-object@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
@@ -5564,16 +4849,7 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -5584,6 +4860,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.0, cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -5601,10 +4886,10 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
 cssom@0.3.x, cssom@^0.3.4:
   version "0.3.8"
@@ -5618,29 +4903,29 @@ cssstyle@^1.1.1:
   dependencies:
     cssom "0.3.x"
 
-csv-generate@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-3.2.3.tgz#24004f21de61c2ea1c4474d3e65a18261f638a80"
-  integrity sha512-IcR3K0Nx+nJAkcU2eAglVR7DuHnxcuhUM2w2cR+aHOW7bZp2S5LyN2HF3zTkp6BV/DjR6ykoKznUm+AjnWcOKg==
+csv-generate@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/csv-generate/-/csv-generate-3.2.4.tgz#440dab9177339ee0676c9e5c16f50e2b3463c019"
+  integrity sha512-qNM9eqlxd53TWJeGtY1IQPj90b563Zx49eZs8e0uMyEvPgvNVmX1uZDtdzAcflB3PniuH9creAzcFOdyJ9YGvA==
 
-csv-parse@^4.8.0:
-  version "4.8.2"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.8.2.tgz#c717cc8d87f619dbd556d5a15222a83b6d7a6d06"
-  integrity sha512-WfYwyJepTbjS5jWAWpVskOJ8Z10231HaFw6qJhSjGrpfMPf3yuoRohlasYsP/6/3YgTQcvZpTvoUo37eaei9Fw==
+csv-parse@^4.8.8:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.12.0.tgz#fd42d6291bbaadd51d3009f6cadbb3e53b4ce026"
+  integrity sha512-wPQl3H79vWLPI8cgKFcQXl0NBgYYEqVnT1i6/So7OjMpsI540oD7p93r3w6fDSyPvwkTepG05F69/7AViX2lXg==
 
-csv-stringify@^5.3.3:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-5.3.3.tgz#c4725686a33db9f61e70d87af712285baefebe21"
-  integrity sha512-q8Qj+/lN74LRmG7Mg0LauE5WcnJOD5MEGe1gI57IYJCB61KWuEbAFHm1uIPDkI26aqElyBB57SlE2GGwq2EY5A==
+csv-stringify@^5.3.6:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-5.5.1.tgz#f42cdd379b0f7f142933a11f674b1a91ebd0fcd0"
+  integrity sha512-HM0/86Ks8OwFbaYLd495tqTs1NhscZL52dC4ieKYumy8+nawQYC0xZ63w1NqLf0M148T2YLYqowoImc1giPn0g==
 
 csv@^5.1.3:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/csv/-/csv-5.3.0.tgz#d1ff56847b81d75e91986a08266adc877add4356"
-  integrity sha512-Q4Kid1hhScm0ciMVhMMl3gMZaIk0YNJnnpfp7LNXGnvnntjf4BMhB9h15v6A4ftNh7QRc/wPBot9pQgManKAuQ==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/csv/-/csv-5.3.2.tgz#50b344e25dfbb8c62684a1bcec18c22468b2161e"
+  integrity sha512-odDyucr9OgJTdGM2wrMbJXbOkJx3nnUX3Pt8SFOwlAMOpsUQlz1dywvLMXJWX/4Ib0rjfOsaawuuwfI5ucqBGQ==
   dependencies:
-    csv-generate "^3.2.3"
-    csv-parse "^4.8.0"
-    csv-stringify "^5.3.3"
+    csv-generate "^3.2.4"
+    csv-parse "^4.8.8"
+    csv-stringify "^5.3.6"
     stream-transform "^2.0.1"
 
 currently-unhandled@^0.4.1:
@@ -5655,10 +4940,10 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
-cytoscape@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.3.2.tgz#7c81a5a07ddbe573044ad2a176b10e6350f58cc3"
-  integrity sha512-DkLcpbxZ1tHCT6x9RevtYuFWdxvc8ZvLXAktgBf++YGWOdkwH/6qE25Omzk2vnbZnYjf2dy81gIYay+wF0z1RQ==
+cytoscape@3.16.1:
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.16.1.tgz#eed220bb2ee96426491709a492aa58974095e1de"
+  integrity sha512-/v5x34izBlUs0ELZP5ELYJzKZjHLkgWtoe4Uu0OEUcagzo/198hUzTze2R1Td8Ve9ASeU5y36C355aR1I2pd7w==
   dependencies:
     heap "^0.2.6"
     lodash.debounce "^4.0.8"
@@ -5718,7 +5003,14 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
+debug@^4.0.0, debug@^4.1.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.0.1, debug@^4.1.1, debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -5749,7 +5041,7 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
-deep-is@~0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -5761,7 +5053,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -5790,19 +5082,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -5818,12 +5097,7 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-  integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -5873,7 +5147,7 @@ diff-match-patch@^1.0.0:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
-diff@^4.0.1:
+diff@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
@@ -5887,13 +5161,6 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
-  dependencies:
-    path-type "^3.0.0"
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -5901,13 +5168,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -5927,30 +5187,38 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
-dompurify@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.8.tgz#6ef89d2d227d041af139c7b01d9f67ed59c2eb3c"
-  integrity sha512-vIOSyOXkMx81ghEalh4MLBtDHMx1bhKlaqHDMqM2yeitJ996SLOk5mGdDpI9ifJAgokred8Rmu219fX4OltqXw==
+dompurify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.1.1.tgz#b5aa988676b093a9c836d8b855680a8598af25fe"
+  integrity sha512-NijiNVkS/OL8mdQL1hUbCD6uty/cgFpmNiuFxrmJ5YPH2cXrPKIewoixoji56rbZ6XBPmtM8GA8/sf9unlSuwg==
 
-dot-object@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-1.7.0.tgz#3b8ecda78b0f2aa52b8871c180fe1b3e09926a41"
-  integrity sha512-X91KaxzQmhQvfokXCdM8EkJVDHe5HlffhT4eaS6CsLk8Nhs9ChA6KWmrt8kgCz5rmLKzoOEP2tmRK/kBvomFwg==
+dot-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
   dependencies:
-    commander "^2.10.0"
-    glob "^7.1.2"
+    no-case "^3.0.3"
+    tslib "^1.10.0"
 
-dot-prop@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
+dot-object@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-2.1.4.tgz#c6c54e9fca510b4d0ea4d65acf33726963843b5f"
+  integrity sha512-7FXnyyCLFawNYJ+NhkqyP9Wd2yzuo+7n9pGiYpkmXCTYa8Ci2U0eUNDVg5OuO5Pm6aFXI2SWN8/N/w7SJWu1WA==
   dependencies:
-    is-obj "^1.0.0"
+    commander "^4.0.0"
+    glob "^7.1.5"
 
-dotenv@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
-  integrity sha512-FlWbnhgjtwD+uNLUGHbMykMOYQaTivdHEmYwAKFjn6GKe/CqY0fNae93ZHTd20snh9ZLr8mTzIL9m0APQ1pjQg==
+dot-prop@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
+  dependencies:
+    is-obj "^2.0.0"
+
+dotenv@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
+  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
 duplexer3@^0.1.4:
   version "0.1.4"
@@ -5975,18 +5243,26 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-echarts@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.1.0.tgz#d588c95f73c1a9928b9c73d5b769751c3185bcdc"
-  integrity sha512-gP1e1fNnAj9KJpTDLXV21brklbfJlqeINmpQDJCDta9TX3cPoqyQOiDVcEPzbOVHqgBRgTOwNxC5iGwJ89014A==
+echarts@4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.9.0.tgz#a9b9baa03f03a2a731e6340c55befb57a9e1347d"
+  integrity sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==
   dependencies:
-    zrender "4.0.4"
+    zrender "4.3.2"
 
 editions@^1.1.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
   integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
 
+editions@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.1.tgz#3bc9962f1978e801312fbd0aebfed63b49bfe698"
+  integrity sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==
+  dependencies:
+    errlop "^2.0.0"
+    semver "^6.3.0"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -5997,15 +5273,10 @@ electron-to-chromium@^1.3.137:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.144.tgz#d742d2c451090798303a4a5eea4f33f5e60f5d94"
   integrity sha512-jNRFJpfNrYm5uJ4x0q9oYMOfbL0JPOlkNli8GS/5zEmCjnE5jAtoCo4BYajHiqSPqEeAjtTdItL4p7EZw+jSfg==
 
-electron-to-chromium@^1.3.390:
-  version "1.3.398"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d"
-  integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w==
-
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.523:
-  version "1.3.533"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.533.tgz#d7e5ca4d57e9bc99af87efbe13e7be5dde729b0f"
-  integrity sha512-YqAL+NXOzjBnpY+dcOKDlZybJDCOzgsq4koW3fvyty/ldTmsb4QazZpOWmVvZ2m0t5jbBf7L0lIGU3BUipwG+A==
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.571:
+  version "1.3.576"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz#2e70234484e03d7c7e90310d7d79fd3775379c34"
+  integrity sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==
 
 elliptic@^6.5.3:
   version "6.5.3"
@@ -6033,12 +5304,13 @@ ember-asset-loader@^0.6.1:
     object-assign "^4.1.0"
     walk-sync "^1.1.3"
 
-ember-assign-helper@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ember-assign-helper/-/ember-assign-helper-0.1.2.tgz#3d1d575f3d4457b3662b214d4c6e671bd462cad0"
-  integrity sha1-PR1XXz1EV7NmKyFNTG5nG9RiytA=
+ember-assign-helper@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/ember-assign-helper/-/ember-assign-helper-0.3.0.tgz#7a023dd165ef56b28f77f70fd20e88261380aca7"
+  integrity sha512-kDY0IRP6PUSJjghM2gIq24OD7d6XcZ1666zmZrywxEVjCenhaR0Oi/BXUU8JEATrIcXIExMIu34GKrHHlCLw0Q==
   dependencies:
-    ember-cli-babel "^6.0.0-beta.9"
+    ember-cli-babel "^7.19.0"
+    ember-cli-htmlbars "^4.3.1"
 
 ember-assign-polyfill@^2.6.0:
   version "2.6.0"
@@ -6048,7 +5320,7 @@ ember-assign-polyfill@^2.6.0:
     ember-cli-babel "^6.16.0"
     ember-cli-version-checker "^2.0.0"
 
-ember-auto-import@^1.5.2:
+ember-auto-import@^1.5.2, ember-auto-import@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.6.0.tgz#00a498172b04f7084a5d2a327f76f577038ed403"
   integrity sha512-BRBrmbDXRuXG/WYbn/2DXM7bFNyQuT80du1scUrrX0+xFVkDOU08s46ZPCvzYprzSg2htgrztQ/nVdnfbIBV+Q==
@@ -6116,14 +5388,20 @@ ember-auto-import@^1.5.3:
     walk-sync "^0.3.3"
     webpack "~4.28"
 
-ember-basic-dropdown@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-1.1.3.tgz#0506045ccc60db4972fc78b963c1324f6415818a"
-  integrity sha512-zIFk5yzu31L4E5lz3DfXF1IGGMcMAGYssh7hCoemjB7iqkL7Sf1UhUg/yEHcr5aEdfyGc1V3G2s740cRY+VLiQ==
+ember-basic-dropdown@^3.0.10:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-3.0.10.tgz#47ed9fe9ff9e69d1a021771a91823c730985ffe0"
+  integrity sha512-TabEKUIlLPQLZqyXx1N8M/tDhrf/2meXjK2mNw6RfiOvwMHYJ41MwIhJusnlQd/Rn7cL0MbA+EGCnjdI0HhB/w==
   dependencies:
-    ember-cli-babel "^7.2.0"
-    ember-cli-htmlbars "^3.0.1"
-    ember-maybe-in-element "^0.2.0"
+    "@ember/render-modifiers" "^1.0.2"
+    "@glimmer/component" "^1.0.1"
+    "@glimmer/tracking" "^1.0.1"
+    ember-cli-babel "^7.21.0"
+    ember-cli-htmlbars "^5.2.0"
+    ember-cli-typescript "^3.1.2"
+    ember-element-helper "^0.2.0"
+    ember-maybe-in-element "^2.0.1"
+    ember-truth-helpers "2.1.0"
 
 ember-cli-app-version@^3.2.0:
   version "3.2.0"
@@ -6133,12 +5411,12 @@ ember-cli-app-version@^3.2.0:
     ember-cli-babel "^6.12.0"
     git-repo-version "^1.0.2"
 
-ember-cli-babel-plugin-helpers@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
-  integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
+  integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
+ember-cli-babel@^6.0.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.8.1:
   version "6.17.2"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.17.2.tgz#f0d53d2fb95e70c15d8db84760d045f88f458f69"
   integrity sha512-9KcCvF1PcelEFTSiJ/Ld20tfuW9acMkwHC/xINLsmwqJVDbm3oEqWtiFDZ5ebaC278O5I0GqNJWJLYNoWMNZ8g==
@@ -6157,7 +5435,7 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^6.6.0:
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.10.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.2:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
   integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
@@ -6176,30 +5454,6 @@ ember-cli-babel@^6.6.0:
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.4.0.tgz#8fc38a650629c0408adf50a46deef91fcd9d0f1d"
-  integrity sha512-nCEniuWcZMZ12uJopHAMEzj0J55fDEKVEr0adoYZNl7e3E6Pz4WyixyddhhzNa+WcOl9ZULYbH/1R0AL4Tyzjg==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-transform-modules-amd" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.2.0"
-    "@babel/polyfill" "^7.0.0"
-    "@babel/preset-env" "^7.0.0"
-    "@babel/runtime" "^7.2.0"
-    amd-name-resolver "^1.2.1"
-    babel-plugin-debug-macros "^0.2.0-beta.6"
-    babel-plugin-ember-modules-api-polyfill "^2.6.0"
-    babel-plugin-module-resolver "^3.1.1"
-    broccoli-babel-transpiler "^7.1.0"
-    broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.1"
-    broccoli-source "^1.1.0"
-    clone "^2.1.2"
-    ember-cli-version-checker "^2.1.2"
-    ensure-posix-path "^1.0.2"
-    semver "^5.5.0"
-
 ember-cli-babel@^7.1.0:
   version "7.7.3"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.7.3.tgz#f94709f6727583d18685ca6773a995877b87b8a0"
@@ -6227,7 +5481,31 @@ ember-cli-babel@^7.1.0:
     ensure-posix-path "^1.0.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.10.0:
+ember-cli-babel@^7.1.2:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.4.0.tgz#8fc38a650629c0408adf50a46deef91fcd9d0f1d"
+  integrity sha512-nCEniuWcZMZ12uJopHAMEzj0J55fDEKVEr0adoYZNl7e3E6Pz4WyixyddhhzNa+WcOl9ZULYbH/1R0AL4Tyzjg==
+  dependencies:
+    "@babel/core" "^7.0.0"
+    "@babel/plugin-transform-modules-amd" "^7.0.0"
+    "@babel/plugin-transform-runtime" "^7.2.0"
+    "@babel/polyfill" "^7.0.0"
+    "@babel/preset-env" "^7.0.0"
+    "@babel/runtime" "^7.2.0"
+    amd-name-resolver "^1.2.1"
+    babel-plugin-debug-macros "^0.2.0-beta.6"
+    babel-plugin-ember-modules-api-polyfill "^2.6.0"
+    babel-plugin-module-resolver "^3.1.1"
+    broccoli-babel-transpiler "^7.1.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.1"
+    broccoli-source "^1.1.0"
+    clone "^2.1.2"
+    ember-cli-version-checker "^2.1.2"
+    ensure-posix-path "^1.0.2"
+    semver "^5.5.0"
+
+ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.2, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.5.0:
   version "7.22.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.22.1.tgz#cad28b89cf0e184c93b863d09bc5ba4ce1d2e453"
   integrity sha512-kCT8WbC1AYFtyOpU23ESm22a+gL6fWv8Nzwe8QFQ5u0piJzM9MEudfbjADEaoyKTrjMQTDsrWwEf3yjggDsOng==
@@ -6259,63 +5537,7 @@ ember-cli-babel@^7.10.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
-ember-cli-babel@^7.11.1:
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
-  integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
-  dependencies:
-    "@babel/core" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/plugin-proposal-class-properties" "^7.8.3"
-    "@babel/plugin-proposal-decorators" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-runtime" "^7.9.0"
-    "@babel/plugin-transform-typescript" "^7.9.0"
-    "@babel/polyfill" "^7.8.7"
-    "@babel/preset-env" "^7.9.0"
-    "@babel/runtime" "^7.9.0"
-    amd-name-resolver "^1.2.1"
-    babel-plugin-debug-macros "^0.3.0"
-    babel-plugin-ember-data-packages-polyfill "^0.1.2"
-    babel-plugin-ember-modules-api-polyfill "^2.12.0"
-    babel-plugin-module-resolver "^3.1.1"
-    broccoli-babel-transpiler "^7.4.0"
-    broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.1"
-    broccoli-source "^1.1.0"
-    clone "^2.1.2"
-    ember-cli-babel-plugin-helpers "^1.1.0"
-    ember-cli-version-checker "^4.1.0"
-    ensure-posix-path "^1.0.2"
-    fixturify-project "^1.10.0"
-    rimraf "^3.0.1"
-    semver "^5.5.0"
-
-ember-cli-babel@^7.2.0, ember-cli-babel@^7.5.0:
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.5.0.tgz#af654dcef23630391d2efe85aaa3bdf8b6ca17b7"
-  integrity sha512-wWXqPPQNRxCtEHvYaLBNiIVgCVCy8YqZ0tM8Dpql1D5nGnPDbaK073sS1vlOYBP7xe5Ab2nXhvQkFwUxFacJ2g==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    "@babel/plugin-transform-modules-amd" "^7.0.0"
-    "@babel/plugin-transform-runtime" "^7.2.0"
-    "@babel/polyfill" "^7.0.0"
-    "@babel/preset-env" "^7.0.0"
-    "@babel/runtime" "^7.2.0"
-    amd-name-resolver "^1.2.1"
-    babel-plugin-debug-macros "^0.3.0"
-    babel-plugin-ember-modules-api-polyfill "^2.7.0"
-    babel-plugin-module-resolver "^3.1.1"
-    broccoli-babel-transpiler "^7.1.2"
-    broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.1"
-    broccoli-source "^1.1.0"
-    clone "^2.1.2"
-    ember-cli-version-checker "^2.1.2"
-    ensure-posix-path "^1.0.2"
-    semver "^5.5.0"
-
-ember-cli-babel@^7.7.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0:
+ember-cli-babel@^7.7.3:
   version "7.11.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.11.1.tgz#77bc8f4001d47b91d80e3d36a4754412616fc0d8"
   integrity sha512-Qgd7y9NVbRLEtwjBW/vPHXdTQrIgfgoCSFHfvBpEmLuWSWNpE/J6qwXrSbB9nEIlfzyjH0Almv4m0jwuJsB3ow==
@@ -6342,32 +5564,21 @@ ember-cli-babel@^7.7.0, ember-cli-babel@^7.7.3, ember-cli-babel@^7.8.0:
     ensure-posix-path "^1.0.2"
     semver "^5.5.0"
 
-ember-cli-broccoli-sane-watcher@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe"
-  integrity sha512-sLn+wy6FJpGMHtSwAGUjQK3nJFvw2b6H8bR2EgMIXxkUI3DYFLi6Xnyxm02XlMTcfTxF10yHFhHJe0O+PcJM7A==
+ember-cli-clipboard@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.15.0.tgz#3704baaeab1f0a2df13b3d77632dea7266aabe54"
+  integrity sha512-gcjm2ofr3NOGH6/MFp+2AVqEKTYkdRUvRsVovTg45Iy414jKyWwxu9l3jWM0ZZkRc2IqjE0V2ta9JJe2/HRPUA==
   dependencies:
-    broccoli-slow-trees "^3.0.1"
-    heimdalljs "^0.2.1"
-    heimdalljs-logger "^0.1.7"
-    rsvp "^3.0.18"
-    sane "^4.0.0"
+    "@ember/render-modifiers" "^1.0.1"
+    clipboard "^2.0.6"
+    ember-auto-import "^1.5.3"
+    ember-cli-babel "^7.20.2"
+    ember-cli-htmlbars "^4.2.3"
 
-ember-cli-clipboard@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-clipboard/-/ember-cli-clipboard-0.9.0.tgz#c0cfce1a8a81ba1646e54bff9d41249b8bc507f7"
-  integrity sha1-wM/OGoqBuhZG5Uv/nUEkm4vFB/c=
-  dependencies:
-    broccoli-funnel "^1.1.0"
-    clipboard "^2.0.0"
-    ember-cli-babel "^6.8.0"
-    ember-cli-htmlbars "^2.0.2"
-    fastboot-transform "0.1.1"
-
-ember-cli-dependency-checker@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.1.0.tgz#b39c6b537a1457d77892edf5ddcfa025cd1401e2"
-  integrity sha512-Y/V2senOyIjQnZohYeZeXs59rWHI2m8KRF9IesMv1ypLRSc/h/QS6UX51wAyaZnxcgU6ljFXpqL5x38UxM3XzA==
+ember-cli-dependency-checker@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
+  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
   dependencies:
     chalk "^2.3.0"
     find-yarn-workspace-root "^1.1.0"
@@ -6375,16 +5586,6 @@ ember-cli-dependency-checker@^3.1.0:
     resolve "^1.5.0"
     semver "^5.3.0"
 
-ember-cli-eslint@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-5.1.0.tgz#acdb9b072911e04b07c313b610f514db4086d21a"
-  integrity sha512-o6787b0tgkRNp+KJo5BiQxtkLuz/yyYqVWF31LPrh+ZCC8jETrfyjsuk8VPDxKLGq7qEiQNJUgOEW87HTad7Vg==
-  dependencies:
-    broccoli-lint-eslint "^5.0.0"
-    ember-cli-version-checker "^3.0.0"
-    rsvp "^4.6.1"
-    walk-sync "^1.0.0"
-
 ember-cli-get-component-path-option@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
@@ -6401,31 +5602,22 @@ ember-cli-htmlbars-inline-precompile@^2.1.0:
     heimdalljs-logger "^0.1.9"
     silent-error "^1.1.0"
 
-ember-cli-htmlbars@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.3.tgz#e116e1500dba12f29c94b05b9ec90f52cb8bb042"
-  integrity sha512-oyWtJebOwxAqWZwMc0NKFJ8FJdxVixM7zl0FaXq1vTAG6bOgnU7yAhXEASlaO5f+PptZueZfOpdpvRwZW/Gk1A==
+ember-cli-htmlbars-inline-precompile@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-3.0.1.tgz#dc1f6fbc3bb5e51d01ca334e692c7f0b5e298d57"
+  integrity sha512-mLGJjxEPiOFty9HVM7LHg+5cfM1M9lwbEBmlanZMM333cnwvgZulKjTYU0/e0tpWDvNvPdX8rM+/Leh0TIrqqA==
   dependencies:
-    broccoli-persistent-filter "^1.0.3"
-    hash-for-dep "^1.0.2"
-    json-stable-stringify "^1.0.0"
-    strip-bom "^3.0.0"
+    babel-plugin-htmlbars-inline-precompile "^2.1.0"
+    ember-cli-version-checker "^3.1.3"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.9"
+    semver "^6.3.0"
+    silent-error "^1.1.0"
 
-ember-cli-htmlbars@^1.1.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353"
-  integrity sha512-5lycG6z35QHr3WZF1OkVvT+N/GGAVuemtM6m8NUgBWoeA2TqOgPFRcI0eRqoLA0HAfe0R2MReKmMI7y1LEM1+w==
-  dependencies:
-    broccoli-persistent-filter "^1.0.3"
-    ember-cli-version-checker "^1.0.2"
-    hash-for-dep "^1.0.2"
-    json-stable-stringify "^1.0.0"
-    strip-bom "^2.0.0"
-
-ember-cli-htmlbars@^2.0.2, ember-cli-htmlbars@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.4.tgz#0bcda483f14271663c38756e1fd1cb89da6a50cf"
-  integrity sha512-WSGODKKG65M/Q7QcLflmxnJKMA32JqFLyX0a5ghMRDWRqvUVkKWSZDbjJsNsCw/OCeBbPWQLQWq0wtpCnTTjwA==
+ember-cli-htmlbars@^2.0.1, ember-cli-htmlbars@^2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.5.tgz#b5a105429a6bce4f7c9c97b667e3b8926e31397f"
+  integrity sha512-3f3PAxdnQ/fhQa8XP/3z4RLRgLHxV8j4Ln75aHbRdemOCjBa048KxL9l+acRLhCulbGQCMnLiIUIC89PAzLrcA==
   dependencies:
     broccoli-persistent-filter "^1.4.3"
     hash-for-dep "^1.2.3"
@@ -6433,13 +5625,13 @@ ember-cli-htmlbars@^2.0.2, ember-cli-htmlbars@^2.0.3:
     strip-bom "^3.0.0"
 
 ember-cli-htmlbars@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.0.0.tgz#4977b9eddbc725f8da25090ecdbba64533b2eadc"
-  integrity sha512-0ahGkm/b/wrQVjjBd8m1ArMh1XrbaTGxWHxawUNnRrn7u+5uTzfRUW9VWtMuxka4BNJsZzPrDbyFdCT3uDitMw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99"
+  integrity sha512-cgvRJM73IT0aePUG7oQ/afB7vSRBV3N0wu9BrWhHX2zkR7A7cUBI7KC9VPk6tbctCXoM7BRGsCC4aIjF7yrfXA==
   dependencies:
-    broccoli-persistent-filter "^1.4.3"
-    hash-for-dep "^1.2.3"
-    json-stable-stringify "^1.0.0"
+    broccoli-persistent-filter "^2.3.1"
+    hash-for-dep "^1.5.1"
+    json-stable-stringify "^1.0.1"
     strip-bom "^3.0.0"
 
 ember-cli-htmlbars@^3.0.1:
@@ -6452,13 +5644,13 @@ ember-cli-htmlbars@^3.0.1:
     json-stable-stringify "^1.0.0"
     strip-bom "^3.0.0"
 
-ember-cli-htmlbars@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.0.tgz#841b16f59076b13664a2bb9b8e94902f35c3c18c"
-  integrity sha512-/UlxHqKWEw8xDDANleh1onLK0ekJ54Ky76tl0XG2+Uo5TqFzLB8U9WMQhjbitBlV/CnMQc08ujZB+vAWvegdvQ==
+ember-cli-htmlbars@^4.2.3, ember-cli-htmlbars@^4.3.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-4.4.0.tgz#7ca17d5ca8f7550984346d9e6e93da0c3323f8d9"
+  integrity sha512-ohgctqk7dXIZR4TgN0xRoUYltWhghFJgqmtuswQTpZ7p74RxI9PKx+E8WV/95mGcPzraesvMNBg5utQNvcqgNg==
   dependencies:
     "@ember/edition-utils" "^1.2.0"
-    babel-plugin-htmlbars-inline-precompile "^3.0.1"
+    babel-plugin-htmlbars-inline-precompile "^3.2.0"
     broccoli-debug "^0.6.5"
     broccoli-persistent-filter "^2.3.1"
     broccoli-plugin "^3.1.0"
@@ -6472,13 +5664,34 @@ ember-cli-htmlbars@^4.0.0:
     strip-bom "^4.0.0"
     walk-sync "^2.0.2"
 
-ember-cli-inject-live-reload@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.1.tgz#1bf3a6ea1747bceddc9f62f7ca8575de6b53ddaf"
-  integrity sha512-vrW/3KSrku+Prqmp7ZkpCxYkabnLrTHDEvV9B1yphTP++dhiV7n7Dv9NrmyubkoF3Inm0xrbbhB5mScvvuTQSg==
+ember-cli-htmlbars@^5.1.2, ember-cli-htmlbars@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.3.1.tgz#61793964fc2599ce750db9e972ab55c6dd177c48"
+  integrity sha512-ZjQTt44euDoqLvUkWbt1svgNCXgLzOztEbc2qqYMQvhQig416LMrWK7l3SSbNU+BtLD5UIxmwvLfF1tsO2CVyA==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-htmlbars-inline-precompile "^4.2.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.0"
+    broccoli-plugin "^4.0.3"
+    common-tags "^1.8.0"
+    ember-cli-babel-plugin-helpers "^1.1.0"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    json-stable-stringify "^1.0.1"
+    semver "^7.3.2"
+    silent-error "^1.1.1"
+    strip-bom "^4.0.0"
+    walk-sync "^2.2.0"
+
+ember-cli-inject-live-reload@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.0.2.tgz#95edb543b386239d35959e5ea9579f5382976ac7"
+  integrity sha512-HDD6o/kBHT/kUtazklU0OW23q2jigIN42QmcpFdXUSvJ2/2SYA6yIqSUxWfJgISmtn5gTNZ2KPq1p3dLkhJxSQ==
   dependencies:
     clean-base-url "^1.0.0"
-    ember-cli-version-checker "^2.1.2"
+    ember-cli-version-checker "^3.1.3"
 
 ember-cli-inline-content@^0.4.1:
   version "0.4.1"
@@ -6515,13 +5728,14 @@ ember-cli-normalize-entity-name@^1.0.0:
     silent-error "^1.0.0"
 
 ember-cli-pagination@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/ember-cli-pagination/-/ember-cli-pagination-3.1.4.tgz#9e4e9d4135da0e3714ffb3c69177cd5fdccd562e"
-  integrity sha512-xRyM4YDYV5LBuIUIEtbXkoL7oph2t6jA51B6+l7AK02HBs9ZU2JEMvsm0M5k2B3GeCuf/kRQrU7Q/NSYaOJKtQ==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/ember-cli-pagination/-/ember-cli-pagination-3.1.5.tgz#5278d49fe1b41aa2a717d5c13b62a4aac9a64205"
+  integrity sha512-c5aQoiIe/2zfqR+Fjw6aGloLi0AWky5cb4N6IrmHXUfgNB1v8AsaIPtcORn7h5BMXzlsEE56BMtd5sti9dlBXg==
   dependencies:
     ember-cli-babel "^6.8.2"
     ember-cli-htmlbars "^2.0.3"
     ember-cli-version-checker "^2.1.0"
+    ember-inflector "^3.0.1"
 
 ember-cli-path-utils@^1.0.0:
   version "1.0.0"
@@ -6538,21 +5752,6 @@ ember-cli-preprocess-registry@^3.3.0:
     debug "^3.0.1"
     process-relative-require "^1.0.0"
 
-ember-cli-release@^0.2.9:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/ember-cli-release/-/ember-cli-release-0.2.9.tgz#5e8de3d034c65597933748023058470ec1231adb"
-  integrity sha1-Xo3j0DTGVZeTN0gCMFhHDsEjGts=
-  dependencies:
-    chalk "^1.0.0"
-    git-tools "^0.1.4"
-    make-array "^0.1.2"
-    merge "^1.2.0"
-    moment-timezone "^0.3.0"
-    nopt "^3.0.3"
-    rsvp "^3.0.17"
-    semver "^4.3.1"
-    silent-error "^1.0.0"
-
 ember-cli-rtlcss@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-rtlcss/-/ember-cli-rtlcss-0.2.0.tgz#d3fe7c1846d2eecf4643d07e9dbbf7619fd0d433"
@@ -6584,23 +5783,6 @@ ember-cli-string-utils@^1.1.0:
   resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
   integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
 
-ember-cli-template-lint@^1.0.0-beta.1:
-  version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/ember-cli-template-lint/-/ember-cli-template-lint-1.0.0-beta.2.tgz#0ebd2f8c1f9ca47f9ee3b42755d66262440c14f6"
-  integrity sha512-i37mJhz+dll7eP/Y3Yh8oLw5aRqfdnIiutqdLsrvTSLb4VphDXbujXCO8XravvZtGeGBVYKXGsjTxobbPXgsgw==
-  dependencies:
-    aot-test-generators "^0.1.0"
-    broccoli-concat "^3.7.1"
-    broccoli-persistent-filter "^1.4.3"
-    chalk "^2.4.1"
-    debug "^3.1.0"
-    ember-cli-version-checker "^2.1.2"
-    ember-template-lint "^1.0.0-beta.5"
-    json-stable-stringify "^1.0.1"
-    md5-hex "^2.0.0"
-    strip-ansi "^4.0.0"
-    walk-sync "^0.3.3"
-
 ember-cli-test-loader@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243"
@@ -6608,22 +5790,77 @@ ember-cli-test-loader@^2.2.0:
   dependencies:
     ember-cli-babel "^6.8.1"
 
-ember-cli-uglify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.1.0.tgz#4a0641fe4768d7ab7d4807aca9924cc77c544184"
-  integrity sha512-lDzdAUfhGx5AMBsgyR54ibENVp/LRQuHNWNaP2SDjkAXDyuYFgW0iXIAfGbxF6+nYaesJ9Tr9AKOfTPlwxZDSg==
+ember-cli-test-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-3.0.0.tgz#1c036fc48de36155355fcda3266af63f977826f1"
+  integrity sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==
   dependencies:
-    broccoli-uglify-sourcemap "^2.1.1"
+    ember-cli-babel "^7.13.2"
+
+ember-cli-typescript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
+  integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
+  dependencies:
+    "@babel/plugin-transform-typescript" "~7.5.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^2.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-typescript@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-2.0.2.tgz#464984131fbdc05655eb61d1c3cdd911d3137f0d"
+  integrity sha512-7I5azCTxOgRDN8aSSnJZIKSqr+MGnT+jLTUbBYqF8wu6ojs2DUnTePxUcQMcvNh3Q3B1ySv7Q/uZFSjdU9gSjA==
+  dependencies:
+    "@babel/plugin-proposal-class-properties" "^7.1.0"
+    "@babel/plugin-transform-typescript" "~7.4.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^1.0.0"
+    fs-extra "^7.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^1.0.0"
+
+ember-cli-typescript@^3.1.2, ember-cli-typescript@^3.1.3:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.1.4.tgz#21d6ccd670d1f2e34c9cce68c6e32c442f46806b"
+  integrity sha512-HJ73kL45OGRmIkPhBNFt31I1SGUvdZND+LCH21+qpq3pPlFpJG8GORyXpP+2ze8PbnITNLzwe5AwUrpyuRswdQ==
+  dependencies:
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.4.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.6.0"
+    "@babel/plugin-transform-typescript" "~7.8.0"
+    ansi-to-html "^0.6.6"
+    broccoli-stew "^3.0.0"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^3.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.3.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-uglify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6"
+  integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g==
+  dependencies:
+    broccoli-uglify-sourcemap "^3.1.0"
     lodash.defaultsdeep "^4.6.0"
 
-ember-cli-version-checker@^1.0.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72"
-  integrity sha1-C8LRNMgwFC2mS/lieg7e0QthrnI=
-  dependencies:
-    semver "^5.3.0"
-
-ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0:
+ember-cli-version-checker@^2.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98"
   integrity sha512-sjkHGr4IGXnO3EUcY21380Xo9Qf6bC8HWH4D62bVnrQop/8uha5XgMQRoAflMCeH6suMrezQL287JUoYc2smEw==
@@ -6631,7 +5868,7 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0:
     resolve "^1.3.3"
     semver "^5.3.0"
 
-ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
+ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
   integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==
@@ -6639,7 +5876,7 @@ ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
     resolve "^1.3.3"
     semver "^5.3.0"
 
-ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.1.3:
+ember-cli-version-checker@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
   integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==
@@ -6648,130 +5885,135 @@ ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.1.3:
     semver "^5.6.0"
 
 ember-cli-version-checker@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7"
-  integrity sha512-yLf2YqotTSsjiXwx9Dt6H7AU0QcldFn5SLk/pG3Zqb0aHNeanBOPlx4/Ysa46ILGWYIh0fDH34AEVRueXTrQBQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.1.tgz#27b938228306cb0dbc4f74e95c536cdd6448e499"
+  integrity sha512-bzEWsTMXUGEJfxcAGWPe6kI7oHEGD3jaxUWDYPTqzqGhNkgPwXTBgoWs9zG1RaSMaOPFnloWuxRcoHi4TrYS3Q==
   dependencies:
     resolve-package-path "^2.0.0"
     semver "^6.3.0"
     silent-error "^1.1.1"
 
-ember-cli@~3.12.1:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.12.1.tgz#b387c206d4091f91685ba7323ececbbcfb80282a"
-  integrity sha512-eYHU5+8ctqShI4XgJsG+C5lkDZW8c73XZu5xQqYNZfBZ10vTy3I6f5DwQ8c+29wtFSZ72COyorhgYWBZUVGfrw==
+ember-cli-version-checker@^5.0.2, ember-cli-version-checker@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.1.tgz#3185c526c14671609cbd22ab0d0925787fc84f3d"
+  integrity sha512-YziSW1MgOuVdJSyUY2CKSC4vXrGQIHF6FgygHkJOxYGjZNQYwf5MK0sbliKatvJf7kzDSnXs+r8JLrD74W/A8A==
   dependencies:
-    "@babel/core" "^7.4.3"
-    "@babel/plugin-transform-modules-amd" "^7.2.0"
+    resolve-package-path "^2.0.0"
+    semver "^7.3.2"
+    silent-error "^1.1.1"
+
+ember-cli@~3.20.2:
+  version "3.20.2"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.20.2.tgz#4a5411afc32a91eb81e4fa1e6f4bc950e838c132"
+  integrity sha512-8ggRX+NXD9VkQt/9/GSMLcnswWNYTgE7Aw1uelexHdxGA1TqcjOjQ07ljVmgRwYVieknhDzhK3M0u3Xoa3x0HA==
+  dependencies:
+    "@babel/core" "^7.10.2"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
     amd-name-resolver "^1.3.1"
-    babel-plugin-module-resolver "^3.2.0"
-    bower-config "^1.4.1"
+    babel-plugin-module-resolver "^4.0.0"
+    bower-config "^1.4.3"
     bower-endpoint-parser "0.2.2"
-    broccoli "^3.1.1"
+    broccoli "^3.4.2"
     broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.2.0"
+    broccoli-babel-transpiler "^7.6.0"
     broccoli-builder "^0.18.14"
-    broccoli-concat "^3.7.3"
+    broccoli-concat "^4.2.4"
     broccoli-config-loader "^1.0.1"
     broccoli-config-replace "^1.1.2"
     broccoli-debug "^0.6.5"
     broccoli-funnel "^2.0.2"
     broccoli-funnel-reducer "^1.0.0"
     broccoli-merge-trees "^3.0.2"
-    broccoli-middleware "^2.0.1"
-    broccoli-module-normalizer "^1.3.0"
-    broccoli-module-unification-reexporter "^1.0.0"
-    broccoli-slow-trees "^3.0.1"
-    broccoli-source "^1.1.0"
-    broccoli-stew "^2.1.0"
+    broccoli-middleware "^2.1.1"
+    broccoli-slow-trees "^3.1.0"
+    broccoli-source "^3.0.0"
+    broccoli-stew "^3.0.0"
     calculate-cache-key-for-tree "^2.0.0"
     capture-exit "^2.0.0"
-    chalk "^2.4.2"
+    chalk "^4.0.0"
     ci-info "^2.0.0"
     clean-base-url "^1.0.0"
     compression "^1.7.4"
-    configstore "^4.0.0"
-    console-ui "^3.0.2"
+    configstore "^5.0.1"
+    console-ui "^3.1.1"
     core-object "^3.1.5"
     dag-map "^2.0.2"
-    diff "^4.0.1"
-    ember-cli-broccoli-sane-watcher "^3.0.0"
+    diff "^4.0.2"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-lodash-subset "^2.0.1"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-preprocess-registry "^3.3.0"
     ember-cli-string-utils "^1.1.0"
-    ember-source-channel-url "^1.1.0"
-    ensure-posix-path "^1.0.2"
+    ember-source-channel-url "^2.0.1"
+    ensure-posix-path "^1.1.1"
     execa "^1.0.0"
     exit "^0.1.2"
-    express "^4.16.4"
-    filesize "^4.1.2"
-    find-up "^3.0.0"
+    express "^4.17.1"
+    filesize "^6.1.0"
+    find-up "^4.1.0"
     find-yarn-workspace-root "^1.2.1"
-    fs-extra "^7.0.1"
+    fixturify-project "^2.1.0"
+    fs-extra "^9.0.0"
     fs-tree-diff "^2.0.1"
     get-caller-file "^2.0.5"
-    git-repo-info "^2.1.0"
-    glob "^7.1.4"
+    git-repo-info "^2.1.1"
+    glob "^7.1.6"
     heimdalljs "^0.2.6"
     heimdalljs-fs-monitor "^0.2.3"
-    heimdalljs-graph "^0.3.5"
+    heimdalljs-graph "^1.0.0"
     heimdalljs-logger "^0.1.10"
-    http-proxy "^1.17.0"
+    http-proxy "^1.18.1"
     inflection "^1.12.0"
     is-git-url "^1.0.0"
-    isbinaryfile "^3.0.3"
+    isbinaryfile "^4.0.6"
     js-yaml "^3.13.1"
     json-stable-stringify "^1.0.1"
     leek "0.0.24"
-    lodash.template "^4.4.0"
-    markdown-it "^8.4.2"
-    markdown-it-terminal "0.1.0"
+    lodash.template "^4.5.0"
+    markdown-it "^11.0.0"
+    markdown-it-terminal "0.2.1"
     minimatch "^3.0.4"
-    morgan "^1.9.1"
+    morgan "^1.10.0"
     nopt "^3.0.6"
-    npm-package-arg "^6.1.0"
-    p-defer "^2.1.0"
-    portfinder "^1.0.20"
-    promise-map-series "^0.2.3"
-    promise.prototype.finally "^3.1.0"
+    npm-package-arg "^8.0.1"
+    p-defer "^3.0.0"
+    portfinder "^1.0.26"
+    promise-map-series "^0.3.0"
+    promise.hash.helper "^1.0.6"
     quick-temp "^0.1.8"
-    resolve "^1.10.1"
-    resolve-package-path "^1.2.7"
-    rsvp "^4.8.4"
+    resolve "^1.17.0"
+    resolve-package-path "^2.0.0"
     sane "^4.1.0"
-    semver "^6.0.0"
+    semver "^7.3.2"
     silent-error "^1.1.1"
-    sort-package-json "^1.22.1"
-    symlink-or-copy "^1.2.0"
-    temp "0.9.0"
-    testem "^2.14.0"
+    sort-package-json "^1.44.0"
+    symlink-or-copy "^1.3.1"
+    temp "0.9.1"
+    testem "^3.1.0"
     tiny-lr "^1.1.1"
-    tree-sync "^1.4.0"
-    uuid "^3.3.2"
-    walk-sync "^1.1.3"
-    watch-detector "^0.1.0"
+    tree-sync "^2.1.0"
+    uuid "^8.1.0"
+    walk-sync "^2.2.0"
+    watch-detector "^1.0.0"
     yam "^1.0.0"
 
-ember-compatibility-helpers@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.0.tgz#feee16c5e9ef1b1f1e53903b241740ad4b01097e"
-  integrity sha512-pUW4MzJdcaQtwGsErYmitFRs0rlCYBAnunVzlFFUBr4xhjlCjgHJo0b53gFnhTgenNM3d3/NqLarzRhDTjXRTg==
+ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.1.tgz#87c92c4303f990ff455c28ca39fb3ee11441aa16"
+  integrity sha512-6wzYvnhg1ihQUT5yGqnLtleq3Nv5KNv79WhrEuNU9SwR4uIxCO+KpyC7r3d5VI0EM7/Nmv9Nd0yTkzmTMdVG1A==
   dependencies:
     babel-plugin-debug-macros "^0.2.0"
     ember-cli-version-checker "^2.1.1"
     semver "^5.4.1"
 
 ember-concurrency@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.0.0.tgz#3b650672fdd5dc1d45007626119135829076c2b6"
-  integrity sha512-76aKC0lo2LAPoQYz7vMRlpolWTIQerszr8PPf3JMM5cTOzPwXUtzDcjfso3JAEDdhyUF9fkv2V1DmHagFbC2YQ==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-1.3.0.tgz#66f90fb792687470bcee1172adc0ebf33f5e8b9c"
+  integrity sha512-DwGlfWFpYyAkTwsedlEtK4t1DznJSculAW6Vq5S1C0shVPc5b6tTpHB2FFYisannSYkm+wpm1f1Pd40qiNPtOQ==
   dependencies:
-    babel-core "^6.24.1"
-    ember-cli-babel "^6.8.2"
+    ember-cli-babel "^7.7.3"
     ember-compatibility-helpers "^1.2.0"
-    ember-maybe-import-regenerator "^0.1.5"
+    ember-maybe-import-regenerator "^0.1.6"
 
 ember-cookies@^0.4.0:
   version "0.4.0"
@@ -6789,16 +6031,16 @@ ember-copy@^1.0.0:
     ember-cli-babel "^6.6.0"
 
 ember-credit-card@^2.4.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/ember-credit-card/-/ember-credit-card-2.11.0.tgz#bd17e8334bde635a89c9c9e1b6e96a540986d09c"
-  integrity sha512-pGqLoYmrr6o0RHtz66PXj8wE1SraiWqusbohrECBxBaqB0DA6R6cI5wBlYE+ydHJSNwBmez252ggYJlLr+uYnw==
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/ember-credit-card/-/ember-credit-card-2.13.0.tgz#5cd019264c370e5d7c25401bd6cde6b176d85dba"
+  integrity sha512-YcQUl83M6WdqavtgGFdoiO2kmhaph0WtV5MuSsviolRk2O34RbctjQUDhBqdBJpo4CSaSXTMI4PGGtHv9qUQrA==
   dependencies:
     broccoli-funnel "2.0.1"
     broccoli-merge-trees "2.0.0"
     card "^2.4.0"
-    ember-cli-babel "^6.6.0"
-    ember-cli-htmlbars "2.0.3"
-    ember-model-validator "^2.18.0"
+    ember-cli-babel "^7.1.2"
+    ember-cli-htmlbars "^3.0.0"
+    ember-model-validator "^3.7.0"
 
 ember-deep-set@^0.2.0:
   version "0.2.0"
@@ -6807,24 +6049,17 @@ ember-deep-set@^0.2.0:
   dependencies:
     ember-cli-babel "^7.1.2"
 
-ember-diff-attrs@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/ember-diff-attrs/-/ember-diff-attrs-0.2.2.tgz#57baf6907957de004d9aff947809dfe78a054b3b"
-  integrity sha512-dziQ8G8QVRMqSFMg2l9E+Te19kcwk7+Aad7Q8lOci2b3EAiU7s0IFB3Z8rRed0JRJ3e6mPJyRmNbyUuNoyCM8g==
+ember-element-helper@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.2.0.tgz#eacdf4d8507d6708812623206e24ad37bad487e7"
+  integrity sha512-/WV0PNLyxDvLX/YETb/8KICFTr719OYqFWXqV5XUkh9YhhBGDU/mr1OtlQaWOlsx+sHm42HD2UAICecqex8ziw==
   dependencies:
     ember-cli-babel "^6.16.0"
 
-ember-drag-drop@^0.4.7:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/ember-drag-drop/-/ember-drag-drop-0.4.8.tgz#59d0d89c30068abd3edcdec47f84edd26fa8ef02"
-  integrity sha1-WdDYnDAGir0+3N7Ef4Tt0m+o7wI=
-  dependencies:
-    ember-cli-babel "^6.6.0"
-
 ember-engines@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.5.tgz#7a21eec7ce77f5e6636cc9126b898aec8d9917c9"
-  integrity sha512-ezbH+OBjGSa6fPSHqpNSVGdz1k9rHpV7tiP1SaEkbHwfuikl28TRY8Am6fgdnL8K6pP5qcSrSl+yUIaGULqOSg==
+  version "0.8.6"
+  resolved "https://registry.yarnpkg.com/ember-engines/-/ember-engines-0.8.6.tgz#151d2fff6929a86b501acd1c650770d9c3593997"
+  integrity sha512-0MXMtUmhA3aY3F4iW0nbrVL1yr/0ExeijY/BrEk0qbbVt+IJ8jJpaSQd2a/q/ksujuGxF0ZclG0rUU8gfWPE1Q==
   dependencies:
     amd-name-resolver "1.3.1"
     babel-plugin-compact-reexports "^1.1.0"
@@ -6838,19 +6073,17 @@ ember-engines@^0.8.5:
     broccoli-test-helper "^2.0.0"
     calculate-cache-key-for-tree "^2.0.0"
     ember-asset-loader "^0.6.1"
-    ember-cli-babel "^7.11.1"
-    ember-cli-htmlbars "^4.0.0"
+    ember-cli-babel "^7.18.0"
+    ember-cli-htmlbars "^4.2.3"
     ember-cli-preprocess-registry "^3.3.0"
     ember-cli-string-utils "^1.1.0"
     ember-cli-version-checker "^3.1.3"
     lodash "^4.17.11"
 
-ember-export-application-global@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.0.tgz#8d6d7619ac8a1a3f8c43003549eb21ebed685bd2"
-  integrity sha1-jW12GayKGj+MQwA1Sesh6+1oW9I=
-  dependencies:
-    ember-cli-babel "^6.0.0-beta.7"
+ember-export-application-global@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.1.tgz#b120a70e322ab208defc9e2daebe8d0dfc2dcd46"
+  integrity sha512-B7wiurPgsxsSGzJuPFkpBWnaeuCu2PGpG2BjyrfA1VcL7//o+5RSnZqiCEY326y7qmxb2GoCgo0ft03KBU0rRw==
 
 ember-factory-for-polyfill@^1.3.1:
   version "1.3.1"
@@ -6859,34 +6092,37 @@ ember-factory-for-polyfill@^1.3.1:
   dependencies:
     ember-cli-version-checker "^2.1.0"
 
-ember-fetch@^6.5.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-6.7.1.tgz#778390bc9993d31cc32d429ae69a591e431e85ac"
-  integrity sha512-B/s0HZWcIrDDz3wOxvAsWM2SyT4nND274aH3Othzxzax/lOJnGHKbNa+IGLrXKSja+ANeD5P8sVwDaAUw8pzpQ==
+ember-fetch@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-8.0.2.tgz#9838b9f01e33fcd23550ccf38ae4f1f90cc47113"
+  integrity sha512-BMwm8jLP5LCeT8Jbgz0jA04RsRyt06ZGMaC3Tx2DbHgoWOPlLMfkEKlCFE0dZVW8ZhuICKuyRZTzt4e8GrnnNA==
   dependencies:
-    abortcontroller-polyfill "^1.3.0"
-    broccoli-concat "^3.2.2"
+    abortcontroller-polyfill "^1.4.0"
+    broccoli-concat "^4.2.4"
     broccoli-debug "^0.6.5"
-    broccoli-merge-trees "^3.0.0"
+    broccoli-merge-trees "^4.2.0"
     broccoli-rollup "^2.1.1"
-    broccoli-stew "^2.1.0"
+    broccoli-stew "^3.0.0"
     broccoli-templater "^2.0.1"
     calculate-cache-key-for-tree "^2.0.0"
     caniuse-api "^3.0.0"
-    ember-cli-babel "^6.8.2"
+    ember-cli-babel "^7.19.0"
+    ember-cli-typescript "^3.1.3"
     node-fetch "^2.6.0"
-    whatwg-fetch "^3.0.0"
+    whatwg-fetch "^3.4.0"
 
-ember-flatpickr@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/ember-flatpickr/-/ember-flatpickr-2.7.0.tgz#a660b7f60de8bca1fdaa765e6c8caa958c205915"
-  integrity sha512-s9ptxe8EdrXjyeCIrtE+pl8wp/UsYHevhYvDmWq7wyEAdeQFr51x0Nf+fcxg0GiFBnlpi1RkZBkzFCtr4LUn0w==
+ember-flatpickr@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ember-flatpickr/-/ember-flatpickr-3.0.1.tgz#e8a56dea1230984220cb0a13cd5e7f8dea064300"
+  integrity sha512-16aUvlV7nkm/GA+0aXHJmvcRzJYY+A2V9rtsCqrPHEch00x1udJicrNonSV4YQ/JmnjScuC/nY/61T2jYfVqgg==
   dependencies:
-    ember-cli-babel "^6.16.0"
-    ember-cli-node-assets "^0.2.2"
-    ember-diff-attrs "^0.2.1"
-    fastboot-transform "^0.1.3"
-    flatpickr "^4.5.2"
+    "@ember/render-modifiers" "^1.0.2"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-stew "^3.0.0"
+    ember-cli-babel "^7.21.0"
+    ember-cli-htmlbars "^5.2.0"
+    flatpickr "^4.6.6"
 
 "ember-getowner-polyfill@^1.1.0 || ^2.0.0":
   version "2.2.0"
@@ -6896,13 +6132,29 @@ ember-flatpickr@^2.7.0:
     ember-cli-version-checker "^2.1.0"
     ember-factory-for-polyfill "^1.3.1"
 
-ember-href-to@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-href-to/-/ember-href-to-2.0.1.tgz#87c88daccf4b02c77f0a0292ab793ea7c6a25ced"
-  integrity sha512-dsMXJTIUd4dQKN7Sd93T5xKqltbYRnr9J4pgFs1bwvDXXQb7XP4WWPozn48+YGptmzvCbDaLsIMfwETuwl7RTA==
+ember-href-to@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-href-to/-/ember-href-to-4.1.0.tgz#daa8b398bc5a51ba3ba5ff736e099f0a0d010b7b"
+  integrity sha512-h8xSzt9lQAUzk4JvXNnZjRj29hOWKo92VIHzH68io13UurDBaMmJ4WtXa0iy/awlSFs6h8BwpEWQeaCYIZDRuQ==
   dependencies:
-    ember-cli-babel "^6.8.2"
-    ember-router-service-polyfill "^1.0.2"
+    ember-cli-babel "^7.13.2"
+
+ember-in-element-polyfill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.0.tgz#10365af6fe31bc59e71ec463ed209d4ba4caecda"
+  integrity sha512-0eSfWWgkOMvj7lcjo20VX8uX4HYxSOxm6MY3bAzqW5RpnHcpcrRf6o4y80xLGh5pp9z8FobiUfFwubphACP8mQ==
+  dependencies:
+    debug "^4.1.1"
+    ember-cli-babel "^7.19.0"
+    ember-cli-htmlbars "^4.3.1"
+    ember-cli-version-checker "^5.0.2"
+
+ember-inflector@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-3.0.1.tgz#04be6df4d7e4000f6d6bd70787cdc995f77be4ab"
+  integrity sha512-fngrwMsnhkBt51KZgwNwQYxgURwV4lxtoHdjxf7RueGZ5zM7frJLevhHw7pbQNGqXZ3N+MRkhfNOLkdDK9kFdA==
+  dependencies:
+    ember-cli-babel "^6.6.0"
 
 ember-intl@^4.3.0:
   version "4.4.1"
@@ -6937,23 +6189,24 @@ ember-intl@^4.3.0:
     silent-error "^1.1.1"
     walk-sync "^2.0.1"
 
-ember-load-initializers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.0.0.tgz#d4b3108dd14edb0f9dc3735553cc96dadd8a80cb"
-  integrity sha512-GQ0x7jGcPovmIFsLQO0dFERHCjkFNAWeuVErXHR466oPHvi479in/WtSJK707pmr3GA5QXXRJy6U8fAdJeJcxA==
+ember-load-initializers@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-2.1.1.tgz#d1a8bead00bc44222b0ab181840869992beb30f5"
+  integrity sha512-Ho5sBeaZPN3HmZkYkcLrjSBF3DTNmzC5h0DizzDj8cjpnCvaqeofphJDnH41k6kLv/QHMk4pMRISPcwc+bOceQ==
   dependencies:
-    ember-cli-babel "^7.0.0"
+    ember-cli-babel "^7.11.0"
+    ember-cli-typescript "^2.0.2"
 
 ember-math-helpers@^2.2.3:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.7.0.tgz#50971918c48142c03b2501a96fe6cf36d61f053c"
-  integrity sha512-5M5YIgDjna8cLlbUwZnuRMm7oFczKe8H60UDd6yLJyRFcZ7fPVr2fwRHU0edK4cSHE7rOj65sG1BVrNzMotJyw==
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/ember-math-helpers/-/ember-math-helpers-2.15.0.tgz#3feb3328354589e4508f7035bd6b37d7df275096"
+  integrity sha512-dxHU0jgErvK+ihl/GEn7FZycgZFZeUgS1P0DlEqSOuzbZ0klikntUgBDfUS1xuF31gRxnDx2V9com28htZJHaA==
   dependencies:
-    broccoli-funnel "^2.0.0"
-    ember-cli-babel "^6.16.0"
-    ember-cli-htmlbars "^3.0.0"
+    broccoli-funnel "^3.0.1"
+    ember-cli-babel "^7.20.5"
+    ember-cli-htmlbars "^5.1.2"
 
-ember-maybe-import-regenerator@^0.1.5, ember-maybe-import-regenerator@^0.1.6:
+ember-maybe-import-regenerator@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/ember-maybe-import-regenerator/-/ember-maybe-import-regenerator-0.1.6.tgz#35d41828afa6d6a59bc0da3ce47f34c573d776ca"
   integrity sha1-NdQYKK+m1qWbwNo85H80xXPXdso=
@@ -6963,130 +6216,156 @@ ember-maybe-import-regenerator@^0.1.5, ember-maybe-import-regenerator@^0.1.6:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
-ember-maybe-in-element@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-0.2.0.tgz#9ac51cbbd9d83d6230ad996c11e33f0eca3032e0"
-  integrity sha512-R5e6N8yDbfNbA/3lMZsFs2KEzv/jt80TsATiKMCqdqKuSG82KrD25cRdU5VkaE8dTQbziyBeuJs90bBiqOnakQ==
+ember-maybe-in-element@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-maybe-in-element/-/ember-maybe-in-element-2.0.1.tgz#fa3a26cc2c522a27129d6528b400b9c820943be6"
+  integrity sha512-Mp/HTVOGu9H7kWoq5xncVLEvPFgRuHdsqWyZ1v/gBA8Y3d2q2LdrmDK9Zg59i+cCs4oa9LrMeFyKMAbBS3vyDw==
   dependencies:
-    ember-cli-babel "^7.1.0"
+    ember-cli-babel "^7.21.0"
+    ember-cli-htmlbars "^5.2.0"
+    ember-cli-version-checker "^5.1.1"
+    ember-in-element-polyfill "^1.0.0"
 
-ember-model-validator@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/ember-model-validator/-/ember-model-validator-2.18.0.tgz#423d43d71c519b09a364d6d37210a4008df48375"
-  integrity sha512-8jrv/n4Wj8eXcf5gkKCWhi1vkvFrglw76wXDJbODkz8ECZ5XSNHvrUwx6SlW6QOEdNyX9BSzF5qWvwNZdDYQOg==
+ember-model-validator@^3.7.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/ember-model-validator/-/ember-model-validator-3.10.0.tgz#fe413c433a8cf5feed770aeb2dca2e89dfff97b6"
+  integrity sha512-/33l9zxbT59AaitEy2n5ohnpUNEVSiUsUl+y9CG2nZjfUSTjxyx+ee9v6uyy1wISyftBlJlGZGlZ5aFECUrNTA==
   dependencies:
-    ember-cli-babel "^6.6.0"
+    ember-cli-babel "^7.12.0"
 
-ember-qunit@^4.4.1:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.5.1.tgz#dc4b0a794fbeb6702a02f28bf19091de0f90fd5a"
-  integrity sha512-fOxXQLFdellP0yiMd9f3n7pIGggiDo8kBuswdGvsCrqTKq5aB1Cb49eeoNyBDQYGlhcxY0pOGUe+xElppChDBA==
+ember-modifier-manager-polyfill@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda"
+  integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==
   dependencies:
-    "@ember/test-helpers" "^1.6.0"
+    ember-cli-babel "^7.10.0"
+    ember-cli-version-checker "^2.1.2"
+    ember-compatibility-helpers "^1.2.0"
+
+ember-qunit@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-4.6.0.tgz#ad79fd3ff00073a8779400cc5a4b44829517590f"
+  integrity sha512-i5VOGn0RP8XH+5qkYDOZshbqAvO6lHgF65D0gz8vRx4DszCIvJMJO+bbftBTfYMxp6rqG85etAA6pfNxE0DqsQ==
+  dependencies:
+    "@ember/test-helpers" "^1.7.1"
     broccoli-funnel "^2.0.2"
     broccoli-merge-trees "^3.0.2"
     common-tags "^1.4.0"
-    ember-cli-babel "^7.8.0"
+    ember-cli-babel "^7.12.0"
     ember-cli-test-loader "^2.2.0"
-    qunit "^2.9.2"
+    qunit "^2.9.3"
 
-ember-resolver@^5.0.1:
-  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@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-8.0.2.tgz#8a45a744aaf5391eb52b4cb393b3b06d2db1975c"
+  integrity sha512-BmCoPT8nf5uv0g2QkhMsrG1Gmu6MtXd6igfhCVzCTMTwZ97SxhJKqoMY62EP/av5HVSWBC/Sa1uGU5cQvX1Aog==
   dependencies:
-    "@glimmer/resolver" "^0.4.1"
-    babel-plugin-debug-macros "^0.1.10"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.0"
-    ember-cli-babel "^6.16.0"
-    ember-cli-version-checker "^3.1.3"
-    resolve "^1.12.0"
+    babel-plugin-debug-macros "^0.3.3"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
+    ember-cli-babel "^7.22.1"
+    ember-cli-version-checker "^5.1.1"
+    resolve "^1.17.0"
 
-ember-rfc176-data@^0.3.11:
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz#90d82878e69e2ac9a5438e8ce14d12c6031c5bd2"
-  integrity sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==
+ember-rfc176-data@^0.3.13:
+  version "0.3.16"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.16.tgz#2ace0ac9cf9016d493a74a1d931643a308679803"
+  integrity sha512-IYAzffS90r2ybAcx8c2qprYfkxa70G+/UPkxMN1hw55DU5S2aLOX6v3umKDZItoRhrvZMCnzwsdfKSrKdC9Wbg==
 
-ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15:
+ember-rfc176-data@^0.3.15:
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.15.tgz#af3f1da5a0339b6feda380edc2f7190e0f416c2d"
   integrity sha512-GPKa7zRDBblRy0orxTXt5yrpp/Pf5CkuRFSIR8qMFDww0CqCKjCRwdZnWYzCM4kAEfZnXRIDDefe1tBaFw7v7w==
 
-ember-rfc176-data@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.6.tgz#7138db8dfccec39c9a832adfbd4c49d670028907"
-  integrity sha512-kPY94VCukPUPj+/6sZ9KvphD42KnpX2IS31p5z07OFVIviDogR0cQuld5c7Irzfgq7a0YACj0HlToROFn7dLYQ==
-
-ember-rfc176-data@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.7.tgz#ecff7d74987d09296d3703343fed934515a4be33"
-  integrity sha512-AbTlD+q7sfyrD4diZqE7r9Y9/Je+HntVn7TlpHAe+nP5BNXxUXJIfDs5w5e3MxPcMs6Dz/yY90YfW8h1oKEvGg==
-
 ember-rfc176-data@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.8.tgz#d46bbef9a0d57c803217b258cfd2e90d8e191848"
   integrity sha512-SQup3iG7SDLZNuf7nMMx5BC5truO8AYKRi80gApeQ07NsbuXV4LH75i5eOaxF0i8l9+H1tzv34kGe6rEh0C1NQ==
 
-ember-router-generator@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"
-  integrity sha1-jtLKhv8yM2MSD8FCeBkeno8TFe4=
+ember-router-generator@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
+  integrity sha512-89oVHVJwmLDvGvAUWgS87KpBoRhy3aZ6U0Ql6HOmU4TrPkyaa8pM0W81wj9cIwjYprcQtN9EwzZMHnq46+oUyw==
   dependencies:
-    recast "^0.11.3"
+    "@babel/parser" "^7.4.5"
+    "@babel/traverse" "^7.4.5"
+    recast "^0.18.1"
 
-ember-router-service-polyfill@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ember-router-service-polyfill/-/ember-router-service-polyfill-1.0.3.tgz#506d7fbd7179951410b7ffe8db171540601d88b1"
-  integrity sha1-UG1/vXF5lRQQt//o2xcVQGAdiLE=
-  dependencies:
-    ember-cli-babel "^6.8.2"
-
-ember-source-channel-url@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.2.0.tgz#77eb9d0889e5f5370e6c70fcb2696c63ff4a34a1"
-  integrity sha512-CLClcHzVf+8GoFk4176R16nwXoel70bd7DKVAY6D8M0m5fJJhbTrAPYpDA0lY8A60HZo9j/s8A8LWiGh1YmdZg==
+ember-source-channel-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-2.0.1.tgz#18b88f8a00b7746e7a456b3551abb3aea18729cc"
+  integrity sha512-YlLUHW9gNvxEaohIj5exykoTZb4xj9ZRTcR4J3svv9S8rjAHJUnHmqC5Fd9onCs+NGxHo7KwR/fDwsfadbDu5Q==
   dependencies:
     got "^8.0.1"
 
-ember-source@~3.12.1:
-  version "3.12.4"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.12.4.tgz#c7d43954097aafefaa14fc88e3f3466a5e4bb254"
-  integrity sha512-e4c9ZB1aO2HxwRSWjCuKtZNhRkCxwZ4bENe8jUEreIPXp0hmiuviRMANAkRaMGbIXm0/RbAuYDX+KBmQlIY/Qw==
+ember-source@^3.20.2:
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.22.0.tgz#aa09db2cc8e4f78de4bf9a12ce9ff499d416adc2"
+  integrity sha512-6F/fWA5et4AMFXm+siCIhpM2XrO8Emwqln71qK67JyUhvD3MJJtvwtBoKq7bzK9I/86LLw13JYm4o6T3d2gXBw==
   dependencies:
+    "@babel/helper-module-imports" "^7.8.3"
+    "@babel/plugin-transform-block-scoping" "^7.8.3"
+    "@babel/plugin-transform-object-assign" "^7.8.3"
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-debug-macros "^0.3.3"
+    babel-plugin-filter-imports "^4.0.0"
+    broccoli-concat "^4.2.4"
+    broccoli-debug "^0.6.4"
     broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
-    chalk "^2.4.2"
-    ember-cli-babel "^7.7.0"
+    broccoli-merge-trees "^4.2.0"
+    chalk "^4.0.0"
+    ember-cli-babel "^7.19.0"
     ember-cli-get-component-path-option "^1.0.0"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-path-utils "^1.0.0"
     ember-cli-string-utils "^1.1.0"
-    ember-cli-version-checker "^3.1.3"
-    ember-router-generator "^1.2.3"
+    ember-cli-version-checker "^5.1.1"
+    ember-router-generator "^2.0.0"
     inflection "^1.12.0"
-    jquery "^3.4.1"
-    resolve "^1.11.1"
+    jquery "^3.5.0"
+    resolve "^1.17.0"
+    semver "^6.1.1"
+    silent-error "^1.1.1"
 
-ember-template-lint@^1.0.0-beta.5:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-1.1.0.tgz#312e101728452bf082f54cbe429ed9b52273ba64"
-  integrity sha512-DPEWdjaNVIC58wJqeJStvQzk2gyKN5/u6dJfDKQ7mRJaouoLP1hZjSZwwpyO9bj10E9/3OJZnLmx1jjJ9/nqWA==
+ember-template-lint@^2.9.1:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.13.0.tgz#560b5a8a25db56a16ffee1604efc9d79e8f54536"
+  integrity sha512-68VgGaocC++BA4D90mKZMPoUBA2kRTEXcHMoWHnXqtRzXP5S35y2m9+nEUHdX9YWjGJTFHW5Tga58gvrvdl3wQ==
   dependencies:
-    "@glimmer/compiler" "^0.38.0"
-    chalk "^2.0.0"
-    globby "^9.0.0"
-    minimatch "^3.0.4"
-    resolve "^1.1.3"
-    strip-bom "^3.0.0"
+    chalk "^4.0.0"
+    ember-template-recast "^4.1.5"
+    find-up "^5.0.0"
+    get-stdin "^8.0.0"
+    globby "^11.0.1"
+    is-valid-glob "^1.0.0"
+    micromatch "^4.0.2"
+    resolve "^1.17.0"
+    v8-compile-cache "^2.1.1"
+    yargs "^15.4.1"
 
-ember-test-waiters@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.1.1.tgz#7df6e7a47e0fdca814aa351f7f7f9a006e15fdcd"
-  integrity sha512-ra71ZWTGBGLeDPa308aeAg9+/nYxv2fk4OEzmXdhvbSa5Dtbei94sr5pbLXx2IiK3Re2gDAvDzxg9PVhLy9fig==
+ember-template-recast@^4.1.5:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-4.2.0.tgz#58325ae3216c0a91b5ddb1a1075106e4d7f39e9d"
+  integrity sha512-c1v5rXKBbCi8z9BEiLzEiI35/zwJJkuy/QdqQnZtZtHbb1ZMJb/2bwGi8JH8nWbvoTADIGhvGmkwPuaAKKcf2A==
   dependencies:
-    ember-cli-babel "^7.1.2"
+    "@glimmer/syntax" "^0.62.1"
+    async-promise-queue "^1.0.5"
+    colors "^1.4.0"
+    commander "^6.1.0"
+    globby "^11.0.1"
+    ora "^5.1.0"
+    slash "^3.0.0"
+    tmp "^0.2.1"
+    workerpool "^6.0.1"
+
+ember-test-waiters@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe"
+  integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==
+  dependencies:
+    ember-cli-babel "^7.11.0"
+    semver "^6.3.0"
 
 ember-truth-helpers@2.1.0:
   version "2.1.0"
@@ -7095,19 +6374,24 @@ ember-truth-helpers@2.1.0:
   dependencies:
     ember-cli-babel "^6.6.0"
 
-ember-wormhole@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.5.2.tgz#cc0ceb7db4f8b8da0fd852edc81d75cb1dcd92f1"
-  integrity sha1-zAzrfbT4uNoP2FLtyB11yx3NkvE=
+ember-wormhole@0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.5.5.tgz#db417ff748cb21e574cd5f233889897bc27096cb"
+  integrity sha512-z8l3gpoKmRA2BnTwvnYRk4jKVcETKHpddsD6kpS+EJ4EfyugadFS3zUqBmRDuJhFbNP8BVBLXlbbATj+Rk1Kgg==
   dependencies:
-    ember-cli-babel "^6.0.0"
-    ember-cli-htmlbars "^1.1.1"
+    ember-cli-babel "^6.10.0"
+    ember-cli-htmlbars "^2.0.1"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -7181,16 +6465,33 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.3.0:
     memory-fs "^0.5.0"
     tapable "^1.0.0"
 
-ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0, ensure-posix-path@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
   integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
 
-entities@~1.1.1:
+entities@^1.1.2, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
+entities@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
+  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
+
+errlop@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.2.0.tgz#1ff383f8f917ae328bebb802d6ca69666a42d21b"
+  integrity sha512-e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -7213,35 +6514,41 @@ error@^7.0.0:
     string-template "~0.2.1"
 
 es-abstract@^1.17.0-next.0, es-abstract@^1.17.5:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
+  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
     has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
+    is-callable "^1.2.2"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
+    object.assign "^4.1.1"
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-abstract@^1.5.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+es-abstract@^1.18.0-next.0:
+  version "1.18.0-next.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
+  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
   dependencies:
-    es-to-primitive "^1.2.0"
+    es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.2"
+    is-negative-zero "^2.0.0"
+    is-regex "^1.1.1"
+    object-inspect "^1.8.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.1"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
 
-es-to-primitive@^1.2.0, es-to-primitive@^1.2.1:
+es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
   integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
@@ -7250,15 +6557,10 @@ es-to-primitive@^1.2.0, es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-promise@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
-
-escalade@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4"
-  integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==
+escalade@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz#e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"
+  integrity sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -7282,43 +6584,36 @@ escodegen@^1.11.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-plugin-ember@^6.2.0:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-6.10.1.tgz#ca7a5cc28b91a247c31b1686421a66281467f238"
-  integrity sha512-RZI0+UoR4xeD6UE3KQCUwbN2nZOIIPaFCCXqBIRXDr0rFuwvknAHqYtDPJVZicvTzNHa4TEZvAKqfbE8t7SztQ==
+eslint-plugin-ember@^8.9.1:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-8.14.0.tgz#fc4c5119b5a1c87604a7bf920ca397783b96b7be"
+  integrity sha512-PQhR58omMAZzcJOB8GLWzL6l/vjRZ2Uo1eohxOmgPUyeBkHfZAMlvK+OSeneMLIr4azLQ4GISkklwv6lxb8qnw==
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
-    ember-rfc176-data "^0.3.11"
-    snake-case "^2.1.0"
+    ember-rfc176-data "^0.3.15"
+    lodash.kebabcase "^4.1.1"
+    snake-case "^3.0.3"
 
-eslint-plugin-es@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998"
-  integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==
+eslint-plugin-es@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
+  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
   dependencies:
-    eslint-utils "^1.4.2"
-    regexpp "^2.0.1"
+    eslint-utils "^2.0.0"
+    regexpp "^3.0.0"
 
-eslint-plugin-node@^9.0.1:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.2.0.tgz#b1911f111002d366c5954a6d96d3cd5bf2a3036a"
-  integrity sha512-2abNmzAH/JpxI4gEOwd6K8wZIodK3BmHbTxz4s79OIYwwIt2gkpEXlAouJXu4H1c9ySTnRso0tsuthSOZbUMlA==
+eslint-plugin-node@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
+  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
   dependencies:
-    eslint-plugin-es "^1.4.1"
-    eslint-utils "^1.4.2"
+    eslint-plugin-es "^3.0.0"
+    eslint-utils "^2.0.0"
     ignore "^5.1.1"
     minimatch "^3.0.4"
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-scope@3.7.1, eslint-scope@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
-  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-scope@^4.0.0, eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -7327,10 +6622,18 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1, eslint-utils@^1.4.2:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
@@ -7344,115 +6647,69 @@ eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
-  integrity sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    regexpp "^1.0.1"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
+eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint@^5.6.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+eslint@^7.5.0:
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9"
+  integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    "@eslint/eslintrc" "^0.1.3"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
-    esquery "^1.0.1"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^1.3.0"
+    espree "^7.3.0"
+    esquery "^1.2.0"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.11"
+    levn "^0.4.1"
+    lodash "^4.17.19"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
+    optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
     table "^5.2.3"
     text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
 
 esm@^3.2.4:
   version "3.2.25"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==
+espree@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
+  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
   dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
+    acorn "^7.4.0"
+    acorn-jsx "^5.2.0"
+    eslint-visitor-keys "^1.3.0"
 
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
-  dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
-
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -7462,35 +6719,30 @@ esprima@~3.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
   integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
 
-esprima@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
-
-esquery@^1.0.0, esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+esquery@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+esrecurse@^4.1.0, esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"
 
-estraverse@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 estree-walker@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
@@ -7547,6 +6799,37 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
+execa@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89"
+  integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exists-sync@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
@@ -7591,7 +6874,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.10.7, express@^4.16.4:
+express@^4.10.7, express@^4.17.1, express@^4.8.5:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -7627,42 +6910,6 @@ express@^4.10.7, express@^4.16.4:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.8.5:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  integrity sha1-avilAjUNsyRuzEvs9rWjTSL37VM=
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -7683,15 +6930,6 @@ extend@^3.0.2, extend@~3.0.0, extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^2.0.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
-  integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
-  dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
-    tmp "^0.0.33"
-
 external-editor@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
@@ -7732,34 +6970,12 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
-  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
-  dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
-
-fast-glob@^3.0.3:
+fast-glob@^3.0.3, fast-glob@^3.1.1:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
   integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
@@ -7776,7 +6992,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -7807,20 +7023,19 @@ fast-sourcemap-concat@^1.4.0:
     source-map-url "^0.3.0"
     sourcemap-validator "^1.1.0"
 
-fastboot-transform@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.1.tgz#de55550d85644ec94cb11264c2ba883e3ea3b255"
-  integrity sha512-aY3wh4kFCYOZWZM88f2svB9OL8UNpqBtOQxV3hHxjeRncQUKLD81I2GXayIFaGEQiS8g34awXfq46WZv8uIHvQ==
+fast-sourcemap-concat@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-2.1.0.tgz#12dd36bfc38c804093e4bd1de61dd6216f574211"
+  integrity sha512-L9uADEnnHOeF4U5Kc3gzEs3oFpNCFkiTJXvT+nKmR0zcFqHZJJbszWT7dv4t9558FJRGpCj8UxUpTgz2zwiIZA==
   dependencies:
-    broccoli-stew "^1.5.0"
-
-fastboot-transform@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd"
-  integrity sha512-6otygPIJw1ARp1jJb+6KVO56iKBjhO+5x59RSC9qiZTbZRrv+HZAuP00KD3s+nWMvcFDemtdkugki9DNFTTwCQ==
-  dependencies:
-    broccoli-stew "^1.5.0"
-    convert-source-map "^1.5.1"
+    chalk "^2.0.0"
+    fs-extra "^5.0.0"
+    heimdalljs-logger "^0.1.9"
+    memory-streams "^0.1.3"
+    mkdirp "^0.5.0"
+    source-map "^0.4.2"
+    source-map-url "^0.3.0"
+    sourcemap-validator "^1.1.0"
 
 fastq@^1.6.0:
   version "1.8.0"
@@ -7855,13 +7070,12 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
+    escape-string-regexp "^1.0.5"
 
 file-entry-cache@^5.0.1:
   version "5.0.1"
@@ -7870,10 +7084,10 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-saver@^1.3.8:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
-  integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
+file-saver@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.2.tgz#06d6e728a9ea2df2cce2f8d9e84dfcdc338ec17a"
+  integrity sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==
 
 file-uri-to-path@1.0.0:
   version "1.0.0"
@@ -7890,6 +7104,11 @@ filesize@^4.1.2:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.2.1.tgz#ab1cb2069db5d415911c1a13e144c0e743bc89bc"
   integrity sha512-bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==
 
+filesize@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
+
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
@@ -7918,19 +7137,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
-    unpipe "~1.0.0"
-
 finalhandler@1.1.2, finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -7944,7 +7150,7 @@ finalhandler@1.1.2, finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0:
+find-babel-config@^1.1.0, find-babel-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
@@ -7988,6 +7194,22 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
@@ -8043,6 +7265,15 @@ fixturify-project@^1.10.0:
     fixturify "^1.2.0"
     tmp "^0.0.33"
 
+fixturify-project@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-2.1.0.tgz#1677be3f116ec3f6b2b2ebb75b393d5860c4668e"
+  integrity sha512-B59wD4I5HDbokvmZatZTyNIjuSBjZzcZoEYdr9kdG9qRc/FSDjzUzzvHbrZL7oWfu9qsbyJBjzf0R0WC5hIZsA==
+  dependencies:
+    fixturify "^2.1.0"
+    tmp "^0.0.33"
+    type-fest "^0.11.0"
+
 fixturify@^0.3.2:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-0.3.4.tgz#c676de404a7f8ee8e64d0b76118e62ec95ab7b25"
@@ -8062,15 +7293,17 @@ fixturify@^1.2.0:
     fs-extra "^7.0.1"
     matcher-collection "^2.0.0"
 
-flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
-  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
+fixturify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.0.tgz#a0437faac9b6e4aeb35910a1214df866aeec5d75"
+  integrity sha512-gHq6UCv8DE91EpiaRSzrmvLoRvFOBzI961IQ3gXE5wfmMM1TtApDcZAonG2hnp6GJrVFCxHwP01wSw9VQJiJ1w==
   dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
+    "@types/fs-extra" "^8.1.0"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.3"
+    fs-extra "^8.1.0"
+    matcher-collection "^2.0.1"
+    walk-sync "^2.0.2"
 
 flat-cache@^2.0.1:
   version "2.0.1"
@@ -8081,10 +7314,10 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
-flatpickr@^4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.5.2.tgz#47c8ad472a096e5fb7e74b809b0703535383f20d"
-  integrity sha512-jDy4QYGpmiy7+Qk8QvKJ4spjDdxcx9cxMydmq1x427HkKWBw0qizLYeYM2F6tMcvvqGjU5VpJS55j4LnsaBblA==
+flatpickr@^4.6.6:
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.6.tgz#34d2ad80adfa34254e62583a34264d472f1038d6"
+  integrity sha512-EZ48CJMttMg3maMhJoX+GvTuuEhX/RbA1YeuI19attP3pwBdbYy6+yqAEVm0o0hSBFYBiLbVxscLW6gJXq6H3A==
 
 flatted@^2.0.0:
   version "2.0.1"
@@ -8104,7 +7337,7 @@ follow-redirects@^1.0.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
   integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
@@ -8212,7 +7445,7 @@ fs-extra@^6.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.1:
+fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
   integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
@@ -8221,7 +7454,7 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.0.1:
+fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
@@ -8230,10 +7463,20 @@ fs-extra@^8.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-merger@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.0.2.tgz#bf111334b89b8d65b95580d33c587dc79620a4e3"
-  integrity sha512-63wmgjPDClP5XcTSKdIXz66X5paYy/m2Ymq5c5YpGxRQEk1HFZ8rtti3LMNSOSw1ketbBMGbSFFcQeEnpnzDpQ==
+fs-extra@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^1.0.0"
+
+fs-merger@^3.0.1, fs-merger@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.1.0.tgz#f30f74f6c70b2ff7333ec074f3d2f22298152f3b"
+  integrity sha512-RZ9JtqugaE8Rkt7idO5NSwcxEGSDZpLmVFjtVQUm3f+bWun7JAU6fKyU6ZJUeUnKdJwGx8uaro+K4QQfOR7vpA==
   dependencies:
     broccoli-node-api "^1.7.0"
     broccoli-node-info "^2.1.0"
@@ -8242,13 +7485,6 @@ fs-merger@^3.0.1:
     rimraf "^2.6.3"
     walk-sync "^2.0.2"
 
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
 fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7, fs-tree-diff@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
@@ -8375,6 +7611,11 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
+get-stdin@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -8387,6 +7628,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -8409,7 +7657,7 @@ git-repo-info@^1.4.1:
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
   integrity sha1-KgcoIyVKr2L88HZgB9e2ZRvUGUM=
 
-git-repo-info@^2.1.0:
+git-repo-info@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
   integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
@@ -8421,13 +7669,6 @@ git-repo-version@^1.0.2:
   dependencies:
     git-repo-info "^1.4.1"
 
-git-tools@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/git-tools/-/git-tools-0.1.4.tgz#5e43e59443b8a5dedb39dba663da49e79f943978"
-  integrity sha1-XkPllEO4pd7bOdumY9pJ55+UOXg=
-  dependencies:
-    spawnback "~1.0.0"
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -8451,18 +7692,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.0, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
     is-glob "^4.0.1"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
-
 glob@^5.0.1, glob@^5.0.10:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -8474,7 +7710,7 @@ glob@^5.0.1, glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -8486,7 +7722,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.4, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -8518,21 +7754,28 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-globals@^11.0.1:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
-
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  dependencies:
+    type-fest "^0.8.1"
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
+globalyzer@^0.1.0:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.4.tgz#bc8e273afe1ac7c24eea8def5b802340c5cc534f"
+  integrity sha512-LeguVWaxgHN0MNbWC6YljNMzHkrCny9fzjmEUdnF1kQ7wATFD1RHFRqA1qxaX2tgxGENlcxjOflopBwj3YZiXA==
+
 globby@10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.0.tgz#abfcd0630037ae174a88590132c2f6804e291072"
@@ -8547,30 +7790,22 @@ globby@10.0.0:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
   dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
-globby@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.0.0.tgz#3800df736dc711266df39b4ce33fe0d481f94c23"
-  integrity sha512-q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw==
-  dependencies:
-    array-union "^1.0.2"
-    dir-glob "^2.2.1"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
+globrex@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
 globule@^1.0.0:
   version "1.2.1"
@@ -8611,15 +7846,15 @@ got@^8.0.1:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
 graphlib@^2.1.7:
   version "2.1.7"
@@ -8633,7 +7868,7 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.0.6, handlebars@^4.3.1, handlebars@^4.4.5, handlebars@^4.7.3:
+handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.3:
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
   integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
@@ -8689,12 +7924,17 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
   integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
+has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -8791,10 +8031,10 @@ heimdalljs-fs-monitor@^0.2.3:
     heimdalljs "^0.2.3"
     heimdalljs-logger "^0.1.7"
 
-heimdalljs-graph@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-0.3.5.tgz#420fbbc8fc3aec5963ddbbf1a5fb47921c4a5927"
-  integrity sha512-szOy9WZUc7eUInEBQEsoa1G2d+oYHrn6ndZPf76eh8A9ID1zWUCEEsxP3F+CvQx9+EDrg1srdyLUmfVAr8EB4g==
+heimdalljs-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-1.0.0.tgz#0059857952988e54f3a74bb23edaf669f8eaf6af"
+  integrity sha512-v2AsTERBss0ukm/Qv4BmXrkwsT5x6M1V5Om6E8NcDQ/ruGkERsfsuLi5T8jx8qWzKMGYlwzAd7c/idymxRaPzA==
 
 heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
   version "0.1.10"
@@ -8840,10 +8080,12 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
   integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
-hosted-git-info@^2.7.1:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+hosted-git-info@^3.0.2:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.5.tgz#bea87905ef7317442e8df3087faa3c842397df03"
+  integrity sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==
+  dependencies:
+    lru-cache "^6.0.0"
 
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
@@ -8857,16 +8099,6 @@ http-cache-semantics@3.8.1:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  integrity sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
-
 http-errors@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
@@ -8904,7 +8136,7 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz#da2e31d237b393aae72ace43882dd7e270a8ff77"
   integrity sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==
 
-http-proxy@^1.13.1, http-proxy@^1.17.0, http-proxy@^1.18.1:
+http-proxy@^1.13.1, http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
@@ -8932,12 +8164,12 @@ https@^1.0.0:
   resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
   integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -8959,12 +8191,7 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore@^3.3.3:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
-ignore@^4.0.3, ignore@^4.0.6:
+ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
@@ -8974,6 +8201,11 @@ ignore@^5.1.1:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -8987,6 +8219,14 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-fresh@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -9063,27 +8303,7 @@ inline-source-map-comment@^1.0.5:
     sum-up "^1.0.1"
     xtend "^4.0.0"
 
-inquirer@^3.0.6, inquirer@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
-  integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^2.0.4"
-    figures "^2.0.0"
-    lodash "^4.3.0"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-inquirer@^6, inquirer@^6.2.2:
+inquirer@^6:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
   integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
@@ -9102,6 +8322,25 @@ inquirer@^6, inquirer@^6.2.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
+inquirer@^7.3.3:
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.19"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.6.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+
 intl@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
@@ -9127,10 +8366,10 @@ ipaddr.js@1.9.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-ipaddr.js@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
-  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
+ipaddr.js@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.0.tgz#77ccccc8063ae71ab65c55f21b090698e763fc6e"
+  integrity sha512-S54H9mIj0rbxRIyrDMEuuER86LdlgUg9FSeZ8duQb6CUG2iRrA36MYVQBSprTF/ZeAwvyQ5mDGuNvIPM0BIl3w==
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
@@ -9165,6 +8404,11 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -9172,10 +8416,10 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.4, is-callable@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
-  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+is-callable@^1.1.4, is-callable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -9265,6 +8509,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
@@ -9291,6 +8540,16 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
+is-negative-zero@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
+  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -9315,35 +8574,16 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
   integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
-
 is-plain-obj@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -9354,7 +8594,7 @@ is-plain-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -9378,18 +8618,13 @@ is-reference@^1.1.0:
   dependencies:
     "@types/estree" "0.0.38"
 
-is-regex@^1.0.4, is-regex@^1.1.0:
+is-regex@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
   integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
   dependencies:
     has-symbols "^1.0.1"
 
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
 is-retry-allowed@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
@@ -9400,6 +8635,11 @@ is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
 is-symbol@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
@@ -9414,7 +8654,7 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -9424,6 +8664,11 @@ is-utf8@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
+is-valid-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -9454,12 +8699,10 @@ isarray@2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
   integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
-isbinaryfile@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
-  dependencies:
-    buffer-alloc "^1.2.0"
+isbinaryfile@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -9492,6 +8735,15 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
+istextorbinary@^2.5.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.6.0.tgz#60776315fb0fa3999add276c02c69557b9ca28ab"
+  integrity sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==
+  dependencies:
+    binaryextensions "^2.1.2"
+    editions "^2.2.0"
+    textextensions "^2.5.0"
+
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
@@ -9510,24 +8762,31 @@ ivy-codemirror@^2.1.0:
     ember-cli-node-assets "^0.2.2"
 
 jgrowl@~1.4.2:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/jgrowl/-/jgrowl-1.4.6.tgz#2736e332aaee73ccf0a14a5f0066391a0a13f4a3"
-  integrity sha1-JzbjMqruc8zwoUpfAGY5GgoT9KM=
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/jgrowl/-/jgrowl-1.4.7.tgz#20e4c5bd9e18d01fd0180053afe83cbcfc912751"
+  integrity sha512-4QkV9cmLPbQ43FDx46ZOCeaUNv4LBDA29n8C+oOI7AM+xFWoAGvCFBAOjhs5n3W1rEab2bR8jyPnJ874h8SOaw==
+  dependencies:
+    jquery "^3.4.1"
 
 jquery@^3.4.1:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
   integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
+jquery@^3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
+
 js-base64@^2.1.8:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
   integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
 
-js-reporters@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.1.tgz#f88c608e324a3373a95bcc45ad305e5c979c459b"
-  integrity sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs=
+js-reporters@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.3.tgz#8febcab370539df62e09b95da133da04b11f6168"
+  integrity sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A==
 
 js-string-escape@^1.0.1:
   version "1.0.1"
@@ -9544,15 +8803,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.13.1, js-yaml@^3.13.0, js-yaml@^3.9.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.12.2, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@3.14.0, js-yaml@^3.12.2, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
   integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
@@ -9601,11 +8852,6 @@ jsesc@^1.3.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
-jsesc@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -9631,11 +8877,6 @@ json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -9689,10 +8930,10 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
-jsondiffpatch@^0.3.11:
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz#43f9443a0d081b5f79d413fe20f302079e493201"
-  integrity sha512-Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA==
+jsondiffpatch@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz#9fb085036767f03534ebd46dcd841df6070c5773"
+  integrity sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==
   dependencies:
     chalk "^2.3.0"
     diff-match-patch "^1.0.0"
@@ -9718,6 +8959,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
+  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+  dependencies:
+    universalify "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -9734,15 +8984,14 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6"
+  integrity sha512-WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA==
   dependencies:
-    core-js "~2.3.0"
-    es6-promise "~3.0.2"
-    lie "~3.1.0"
+    lie "~3.3.0"
     pako "~1.0.2"
-    readable-stream "~2.0.6"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
 
 keyv@3.0.0:
   version "3.0.0"
@@ -9751,7 +9000,26 @@ keyv@3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -9794,7 +9062,15 @@ levenary@^1.1.1:
   dependencies:
     leven "^3.1.0"
 
-levn@^0.3.0, levn@~0.3.0:
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
@@ -9802,10 +9078,10 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lie@~3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
   dependencies:
     immediate "~3.0.5"
 
@@ -9816,15 +9092,22 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-it@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 linkifyjs@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.9.tgz#af06e45a2866ff06c4766582590d098a4d584702"
   integrity sha512-74ivurkK6WHvHFozVaGtQWV38FzBwSTGNmJolEgFp7QgR2bl6ArUWlvT4GcHKbPe1z3nWYi+VUdDZk16zDOVug==
 
-liquid-fire@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/liquid-fire/-/liquid-fire-0.30.0.tgz#20e6673f9db32d503f909592fd2c691452b07d6d"
-  integrity sha512-5ffmsrPvAzc4EQdjVHouiPc0m+c+wt4YOBgABrPgO+30cSAlYLYuIhQIQ5j+zX87oa61btq0BJVjjtxunG1Nrg==
+liquid-fire@^0.31.0:
+  version "0.31.0"
+  resolved "https://registry.yarnpkg.com/liquid-fire/-/liquid-fire-0.31.0.tgz#6dc9f4785b5a06dcbe1a7ca4e8b130ac595ee2f5"
+  integrity sha512-KVI2vBB+6I1kvkOSD/S/Vjq5hYqlFw3zBLiRoCSIDj9LMWmm2GEKvQcmpxiqgsdjMS2VAFaqUd+9BJFRvCmIjA==
   dependencies:
     broccoli-funnel "^2.0.2"
     broccoli-merge-trees "^3.0.2"
@@ -9832,7 +9115,6 @@ liquid-fire@^0.30.0:
     ember-cli-babel "^7.7.3"
     ember-cli-htmlbars "^3.0.1"
     ember-cli-version-checker "^3.1.3"
-    ember-copy "^1.0.0"
     match-media "^0.2.0"
     velocity-animate "^1.5.2"
 
@@ -9897,6 +9179,20 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -10026,10 +9322,10 @@ lodash.isarray@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
   integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
 
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+lodash.kebabcase@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+  integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY=
 
 lodash.keys@^3.0.0:
   version "3.1.2"
@@ -10050,16 +9346,11 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
-lodash.merge@^4.3.1, lodash.merge@^4.6.0, lodash.merge@^4.6.2:
+lodash.merge@^4.6.0, lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.mergewith@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.omit@^4.1.0, lodash.omit@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -10100,11 +9391,16 @@ lodash.uniqby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.1, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.10:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.5.1:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
 log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -10112,6 +9408,13 @@ log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
+log-symbols@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
+  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
+  dependencies:
+    chalk "^4.0.0"
+
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -10132,10 +9435,12 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+lower-case@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+  dependencies:
+    tslib "^1.10.0"
 
 lowercase-keys@1.0.0:
   version "1.0.0"
@@ -10162,6 +9467,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 magic-string@^0.24.0:
   version "0.24.1"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.1.tgz#7e38e5f126cae9f15e71f0cf8e450818ca7d5a8f"
@@ -10179,18 +9491,6 @@ mailparser@^0.6.1:
     mimelib "^0.3.0"
     uue "^3.1.0"
 
-make-array@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef"
-  integrity sha1-M14267DFpDFU0hIToeyuriobs+8=
-
-make-dir@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
 make-dir@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -10199,6 +9499,13 @@ make-dir@^2.0.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-dir@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 make-plural@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-2.1.3.tgz#2f85208c37fa7ee8c5e36bb5a6c05c5e00a44e31"
@@ -10211,13 +9518,6 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -10235,18 +9535,29 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it-terminal@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
-  integrity sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k=
+markdown-it-terminal@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705"
+  integrity sha512-e8hbK9L+IyFac2qY05R7paP+Fqw1T4pSQW3miK3VeG9QmpqBjg5Qzjv/v6C7YNxSNRS2Kp8hUFtm5lWU9eK4lw==
   dependencies:
     ansi-styles "^3.0.0"
     cardinal "^1.0.0"
     cli-table "^0.3.1"
-    lodash.merge "^4.6.0"
+    lodash.merge "^4.6.2"
     markdown-it "^8.3.1"
 
-markdown-it@^8.3.1, markdown-it@^8.4.2:
+markdown-it@^11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.1.tgz#b54f15ec2a2193efa66dda1eb4173baea08993d6"
+  integrity sha512-aU1TzmBKcWNNYvH9pjq6u92BML+Hz3h5S/QpfTFwiQF852pLT+9qHsrhM9JYipkOXZxGn+sGH8oyJE9FD9WezQ==
+  dependencies:
+    argparse "^1.0.7"
+    entities "~2.0.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
+markdown-it@^8.3.1:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
   integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
@@ -10257,31 +9568,24 @@ markdown-it@^8.3.1, markdown-it@^8.4.2:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-marked@^0.3.15:
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
-  integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==
+marked@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.0.tgz#7221ce2395fa6cf6d722e6f2871a32d3513c85ca"
+  integrity sha512-tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==
 
 match-media@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/match-media/-/match-media-0.2.0.tgz#ea4e09742e7253cc7d7e1599ba627e0fa29fbc50"
   integrity sha1-6k4JdC5yU8x9fhWZumJ+D6KfvFA=
 
-matcher-collection@^1.0.0, matcher-collection@^1.1.1:
+matcher-collection@^1.0.0, matcher-collection@^1.0.4, matcher-collection@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.1.2.tgz#1076f506f10ca85897b53d14ef54f90a5c426838"
   integrity sha512-YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g==
   dependencies:
     minimatch "^3.0.2"
 
-matcher-collection@^1.0.4, matcher-collection@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339"
-  integrity sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==
-  dependencies:
-    minimatch "^3.0.2"
-
-matcher-collection@^2.0.0:
+matcher-collection@^2.0.0, matcher-collection@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
   integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
@@ -10294,18 +9598,6 @@ math-random@^1.0.1:
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
   integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
-md5-hex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
-  integrity sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=
-  dependencies:
-    md5-o-matic "^0.1.1"
-
-md5-o-matic@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
-  integrity sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=
-
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -10325,15 +9617,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
 memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -10378,6 +9661,11 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 merge-trees@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
@@ -10408,11 +9696,6 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-merge@^1.2.0, merge@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -10484,11 +9767,6 @@ mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.19, mime-types@^2.1.26,
   dependencies:
     mime-db "1.44.0"
 
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
 mime@1.6.0, mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -10507,7 +9785,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.0.0:
+mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -10527,18 +9805,28 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8, minimist@^0.2.1, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
   integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
 
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minipass@^2.2.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
@@ -10547,21 +9835,6 @@ minipass@^2.2.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minipass@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
-  integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==
-  dependencies:
-    yallist "^4.0.0"
-
-minizlib@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
-  integrity sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -10578,15 +9851,18 @@ mississippi@^3.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
-"mixin-deep@>=1.3.2 <2.0.0 || >=2.0.1", mixin-deep@^1.2.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-2.0.1.tgz#9a6946bef4a368401b784970ae3caaaa6bab02fa"
-  integrity sha512-imbHQNRglyaplMmjBLL3V5R6Bfq5oM+ivds3SKgc6oRtzErEnBUUc5No11Z2pilkUvl42gJvi285xTNswcKCMA==
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
 
 mixme@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/mixme/-/mixme-0.3.2.tgz#cbda53e3009da0b5035361954232019d776720da"
-  integrity sha512-tilCZOvIhRETXJuTmxxpz8mgplF7gmFhcH05JuR/YL+JLO98gLRQ1Mk4XpYQxxbPMKupSOv+Bidw7EKv8wds1w==
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/mixme/-/mixme-0.3.5.tgz#304652cdaf24a3df0487205e61ac6162c6906ddd"
+  integrity sha512-SyV9uPETRig5ZmYev0ANfiGeB+g6N2EnqqEfBbCGmmJ6MgZ3E4qv5aPbnHVdZ60KAHHXV+T3sXopdrnIXQdmjQ==
 
 "mkdirp@>=0.5 0":
   version "0.5.1"
@@ -10607,7 +9883,7 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.0:
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^1.0.3:
+mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -10617,19 +9893,17 @@ mktemp@~0.4.0:
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
   integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
-moment-timezone@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.3.1.tgz#3ef47856b02d53b718a10a5ec2023aa299e07bf5"
-  integrity sha1-PvR4VrAtU7cYoQpewgI6opnge/U=
-  dependencies:
-    moment ">= 2.6.0"
-
-"moment@>= 2.6.0", moment@^2.8.4, moment@~2.22.1:
+moment@^2.8.4:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
 
-morgan@^1.9.1:
+moment@~2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.0.tgz#fcbef955844d91deb55438613ddcec56e86a3425"
+  integrity sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==
+
+morgan@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
   integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
@@ -10676,7 +9950,7 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -10691,13 +9965,18 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 mysql@^2.15.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.16.0.tgz#b23b22ab5de44fc2d5d32bd4f5af6653fc45e2ba"
-  integrity sha512-dPbN2LHonQp7D5ja5DJXNbCLe/HRdu+f3v61aguzNRQIrmZLOeRoymBYyeThrR6ug+FqzDL95Gc9maqZUJS+Gw==
+  version "2.18.1"
+  resolved "https://registry.yarnpkg.com/mysql/-/mysql-2.18.1.tgz#2254143855c5a8c73825e4522baf2ea021766717"
+  integrity sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==
   dependencies:
-    bignumber.js "4.1.0"
-    readable-stream "2.3.6"
+    bignumber.js "9.0.0"
+    readable-stream "2.3.7"
     safe-buffer "5.1.2"
     sqlstring "2.3.1"
 
@@ -10748,12 +10027,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+no-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
   dependencies:
-    lower-case "^1.1.1"
+    lower-case "^2.0.1"
+    tslib "^1.10.0"
 
 node-fetch@^2.3.0, node-fetch@^2.6.0:
   version "2.6.1"
@@ -10840,15 +10120,10 @@ node-releases@^1.1.21:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.53:
-  version "1.1.53"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
-  integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
-
-node-releases@^1.1.60:
-  version "1.1.60"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084"
-  integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==
+node-releases@^1.1.61:
+  version "1.1.61"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
+  integrity sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==
 
 node-sass@^4.14.1:
   version "4.14.1"
@@ -10873,10 +10148,10 @@ node-sass@^4.14.1:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
-node-watch@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.0.tgz#ab0703b60cd270783698e57a428faa0010ed8fd0"
-  integrity sha512-XAgTL05z75ptd7JSVejH1a2Dm1zmXYhuDr9l230Qk6Z7/7GPcnAs/UyJJ4ggsXSvWil8iOzwQLW0zuGUvHpG8g==
+node-watch@0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.4.tgz#50e564046eb7be15151c25f9c5aac4b5f495c291"
+  integrity sha512-cI6CHzivIFESe8djiK3Wh90CtWQBxLwMem8x8S+2GSvCvFgoMuOKVlfJtQ/2v3Afg3wOnHl/+tXotEs8z5vOrg==
 
 node.extend@~1.1.3:
   version "1.1.8"
@@ -10886,7 +10161,7 @@ node.extend@~1.1.3:
     has "^1.0.3"
     is "^3.2.1"
 
-"nopt@2 || 3", nopt@^3.0.3, nopt@^3.0.6:
+"nopt@2 || 3", nopt@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
@@ -10924,14 +10199,13 @@ normalize-url@2.0.1:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
-npm-package-arg@^6.1.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
-  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+npm-package-arg@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.0.1.tgz#9d76f8d7667b2373ffda60bb801a27ef71e3e270"
+  integrity sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==
   dependencies:
-    hosted-git-info "^2.7.1"
-    osenv "^0.1.5"
-    semver "^5.6.0"
+    hosted-git-info "^3.0.2"
+    semver "^7.0.0"
     validate-npm-package-name "^3.0.0"
 
 npm-run-path@^2.0.0:
@@ -10941,6 +10215,20 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 "npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -10995,12 +10283,12 @@ object-hash@^1.3.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
-object-inspect@^1.7.0:
+object-inspect@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
   integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -11012,23 +10300,15 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.1.0, object.assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
+  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.0"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.omit@^2.0.0:
   version "2.0.1"
@@ -11046,11 +10326,11 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 objects-to-csv@^1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/objects-to-csv/-/objects-to-csv-1.3.5.tgz#477b7c34bc239604246e4616db92a3c5ed0e9ea8"
-  integrity sha512-U5pzEoYUIQZauMCvWGyy9XdB4TuxQCbih6rVocEjWPRGOigFj64JWVqn95XlrvM8pqDMtMxvhUE0hH25Hy6FAQ==
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/objects-to-csv/-/objects-to-csv-1.3.6.tgz#05f25144099151ee915d2dd1458d4dd3ea96d84a"
+  integrity sha512-383eSpS3hmgCksW85KIqBtcbgSW5DDVsCmzLoM6C3q4yzOX2rmtWxF4pbLJ76fz+ufA+4/SwAT4QdaY6IUWmAg==
   dependencies:
-    async-csv "^2.1.2"
+    async-csv "^2.1.3"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -11078,6 +10358,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 optionator@^0.8.1:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -11090,17 +10377,17 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
   dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
 
 ora@^3.4.0:
   version "3.4.0"
@@ -11114,6 +10401,20 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
+ora@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.1.0.tgz#b188cf8cd2d4d9b13fd25383bc3e5cba352c94f8"
+  integrity sha512-9tXIMPvjZ7hPTbk8DFq1f7Kow/HU/pQYB60JbNq+QnGwcyhWVZaQ4hM9zQDEsPxw/muLpgiHSaumUZxCAmod/w==
+  dependencies:
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.4.0"
+    is-interactive "^1.0.0"
+    log-symbols "^4.0.0"
+    mute-stream "0.0.8"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -11129,7 +10430,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.3, osenv@^0.1.5:
+osenv@0, osenv@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -11142,31 +10443,26 @@ p-cancelable@^0.4.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
   integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-defer@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-2.1.0.tgz#d9c97b40f8fb5c256a70b4aabec3c1c8c42f1fae"
-  integrity sha512-xMwL9id1bHn/UfNGFEMFwlULOprQUEOg6vhqSfr6oKxPFB0oSh0zhGq/9/tPSE+cyij2+RW6H8+0Ke4xsPdZ7Q==
+p-defer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
+  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -11174,13 +10470,20 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe"
+  integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -11195,6 +10498,20 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
@@ -11212,12 +10529,7 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-pako@~1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
-
-pako@~1.0.5:
+pako@~1.0.2, pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
@@ -11295,7 +10607,7 @@ parseuri@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -11327,21 +10639,26 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
+path-key@^3.0.0, path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -11378,22 +10695,15 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
-  dependencies:
-    pify "^3.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-payment@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/payment/-/payment-2.3.0.tgz#b2a95e9c3052459647da3926b8b66c553d93098f"
-  integrity sha1-sqlenDBSRZZH2jkmuLZsVT2TCY8=
+payment@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/payment/-/payment-2.4.0.tgz#e9d81de364fa919633bae71829808ac1236da9f8"
+  integrity sha512-FjVkqu1GW0epmWRuA7853cfEdjZx61z1vKagcvfvKWeXwEuUlOKr2nkdrCjue5qJWNSzj235pidaK3GsCbY84A==
   dependencies:
     qj "~2.0.0"
 
@@ -11459,17 +10769,19 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
 
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
   integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
-portfinder@^1.0.20:
+portfinder@^1.0.26:
   version "1.0.28"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
   integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
@@ -11492,6 +10804,11 @@ postcss@^6.0.14:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -11534,16 +10851,11 @@ prismjs@^1.21.0:
   optionalDependencies:
     clipboard "^2.0.0"
 
-private@^0.1.6, private@^0.1.8, private@~0.1.5:
+private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -11571,13 +10883,23 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-promise-map-series@^0.2.1, promise-map-series@^0.2.3:
+promise-map-series@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
   integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
   dependencies:
     rsvp "^3.0.14"
 
+promise-map-series@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
+  integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
+
+promise.hash.helper@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.7.tgz#2f39d8495df40dcdfbc1d5be9e9e56efeae7f180"
+  integrity sha512-0qhWYyCV9TYDMSooYw1fShIb7R6hsWYja7JLqbeb1MvHqDTvP/uy/R1RsyVqDi6GCiHOI4G5p2Hpr3IA+/l/+Q==
+
 promise.prototype.finally@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz#b8af89160c9c673cefe3b4c4435b53cfd0287067"
@@ -11587,7 +10909,7 @@ promise.prototype.finally@^3.1.0:
     es-abstract "^1.17.0-next.0"
     function-bind "^1.1.1"
 
-proxy-addr@~2.0.3, proxy-addr@~2.0.5:
+proxy-addr@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
   integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
@@ -11667,26 +10989,16 @@ qj@^2.0.0, qj@~2.0.0:
   resolved "https://registry.yarnpkg.com/qj/-/qj-2.0.0.tgz#054dd3b75ce018728d23a0605f030dfda0bd158a"
   integrity sha1-BU3Tt1zgGHKNI6BgXwMN/aC9FYo=
 
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
-
 qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.4.0:
+qs@^6.4.0, qs@^6.6.0:
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
   integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
 
-qs@~6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.0.4.tgz#51019d84720c939b82737e84556a782338ecea7b"
-  integrity sha1-UQGdhHIMk5uCc36EVWp4Izjs6ns=
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -11720,24 +11032,23 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit-dom@^0.8.4:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-0.8.5.tgz#34b7cffb338e631c39955b21bdbe4d774090124e"
-  integrity sha512-I4GSy22ESUkoZYDSYsqFJoMvqhpmgd2iCYlrN7aWLEOdmumUkao3qz24/qVNZd1PAnoOQA78FefzNPRHePFx1A==
+qunit-dom@^1.2.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/qunit-dom/-/qunit-dom-1.5.0.tgz#f3e062562c18fb354b7657afd31890d89a24691d"
+  integrity sha512-VTFApYbzcYkL5Zg7XgZMgLgMI9JXEX+lwBS5bFy5hRkIaz9V38q7rN44svxFBNHWs96y3UaFaAYpOEmlQ0j+fw==
   dependencies:
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.1"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
 
-qunit@^2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.9.2.tgz#97919440c9c0ae838bcd3c33a2ee42f35c5ef4a0"
-  integrity sha512-wTOYHnioWHcx5wa85Wl15IE7D6zTZe2CQlsodS14yj7s2FZ3MviRnQluspBZsueIDEO7doiuzKlv05yfky1R7w==
+qunit@^2.9.3:
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.11.2.tgz#ff68b57672053824a670620e7bd341e47561c542"
+  integrity sha512-lvvKQYK2YFU+L7lTXnTD8+qE49cNs2sK2gr1j8KV4Bj+s1eDrdmwaZf5a8pEcW+rB1cEtCH0ZeQ0Z9K76OQjGA==
   dependencies:
-    commander "2.12.2"
-    js-reporters "1.2.1"
-    minimatch "3.0.4"
-    node-watch "0.6.0"
-    resolve "1.9.0"
+    commander "6.0.0"
+    js-reporters "1.2.3"
+    node-watch "0.6.4"
+    tiny-glob "0.2.6"
 
 rancher-cytoscape-dagre@2.2.7:
   version "2.2.7"
@@ -11770,21 +11081,11 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-range-parser@~1.2.0, range-parser@~1.2.1:
+range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  integrity sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
-
 raw-body@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
@@ -11820,7 +11121,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -11842,19 +11143,6 @@ read-pkg@^1.0.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -11865,18 +11153,6 @@ readable-stream@~1.0.2:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -11893,15 +11169,15 @@ readdirp@~3.4.0:
   dependencies:
     picomatch "^2.2.1"
 
-recast@^0.11.3:
-  version "0.11.23"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
-  integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
+recast@^0.18.1:
+  version "0.18.10"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
+  integrity sha512-XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ==
   dependencies:
-    ast-types "0.9.6"
-    esprima "~3.1.0"
-    private "~0.1.5"
-    source-map "~0.5.0"
+    ast-types "0.13.3"
+    esprima "~4.0.0"
+    private "^0.1.8"
+    source-map "~0.6.1"
 
 redent@^1.0.0:
   version "1.0.0"
@@ -11960,12 +11236,11 @@ regenerator-transform@^0.10.0:
     private "^0.1.6"
 
 regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
+  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-cache@^0.4.2:
   version "0.4.4"
@@ -11982,15 +11257,10 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-  integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==
-
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+regexpp@^3.0.0, regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
 regexpu-core@^2.0.0:
   version "2.0.0"
@@ -12002,9 +11272,9 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
   dependencies:
     regenerate "^1.4.0"
     regenerate-unicode-properties "^8.2.0"
@@ -12019,9 +11289,9 @@ regjsgen@^0.2.0:
   integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.1.4:
   version "0.1.5"
@@ -12080,33 +11350,7 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.83.0, request@^2.87.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-request@^2.88.0:
+request@^2.83.0, request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -12132,6 +11376,32 @@ request@^2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -12147,14 +11417,6 @@ require-relative@^0.8.7:
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
   integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -12165,6 +11427,11 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
+reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
+
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -12173,17 +11440,12 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6, resolve-package-path@^1.2.7:
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -12212,28 +11474,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
-  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.1.3:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.1.7, resolve@^1.5.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.7.1, resolve@^1.8.1:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.7.1, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -12247,12 +11488,12 @@ resolve@^1.12.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.13.1:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
+resolve@^1.5.0:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
-    path-parse "^1.0.6"
+    path-parse "^1.0.5"
 
 responselike@1.0.2:
   version "1.0.2"
@@ -12269,6 +11510,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -12307,7 +11556,7 @@ rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimra
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.1, rimraf@^3.0.2:
+rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -12352,12 +11601,7 @@ rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
   integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
-rsvp@^4.6.1, rsvp@^4.8.3:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911"
-  integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA==
-
-rsvp@^4.7.0, rsvp@^4.8.2, rsvp@^4.8.4, rsvp@^4.8.5:
+rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.2, rsvp@^4.8.3, rsvp@^4.8.4, rsvp@^4.8.5:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
@@ -12378,7 +11622,7 @@ rtlcss@^2.0.3:
     postcss "^6.0.14"
     strip-json-comments "^2.0.0"
 
-run-async@^2.2.0:
+run-async@^2.2.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -12395,18 +11639,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
-  integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=
-  dependencies:
-    rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-  integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
-
 rxjs@^6.4.0:
   version "6.6.2"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.2.tgz#8096a7ac03f2cc4fe5860ef6e572810d9e01c0d2"
@@ -12414,10 +11646,12 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
+rxjs@^6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
+  dependencies:
+    tslib "^1.9.0"
 
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -12517,7 +11751,7 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1:
+"semver@2 || 3 || 4 || 5":
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
@@ -12527,45 +11761,26 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^4.3.1:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
-
-semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+semver@^7.0.0, semver@^7.2.1, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
   integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -12590,10 +11805,10 @@ sendgrid-rest@^2.3.0:
   resolved "https://registry.yarnpkg.com/sendgrid-rest/-/sendgrid-rest-2.4.0.tgz#88e11a86375ec0e14b5faf1b4a0a191639ce90ef"
   integrity sha512-3VRHhTnln17jPQNzBjEHO6u2Y7kLlhVnOvX0aGjr7yRVZpq5LXo0ilAFMsaHUfKVH+jFdCrHMAVLOAdtu6wLJA==
 
-sendgrid@^4.7.1:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/sendgrid/-/sendgrid-4.10.0.tgz#fd64ae3b3f3a94e14aa0ee587db2a01333b07f53"
-  integrity sha1-/WSuOz86lOFKoO5YfbKgEzOwf1M=
+sendgrid@^5.2.3:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/sendgrid/-/sendgrid-5.2.3.tgz#37cd28ddd93fca2d3fa7dda10a323b1f43ffecfc"
+  integrity sha512-FD7oR9TbJFUew1p0Vw9JX0wBetDyq634LzylSXz4n9+hwaf+6a9dNloZl8CcjpsX4NuEc3HJanTN4GjDwNyi4A==
   dependencies:
     async.ensureasync "^0.5.2"
     async.queue "^0.5.2"
@@ -12617,16 +11832,6 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
-
 serve-static@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
@@ -12642,28 +11847,31 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-cookie-parser@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.2.1.tgz#eae9e36c48667c9b385246ab6f450aade889aaf4"
-  integrity sha1-6unjbEhmfJs4Ukarb0UKreiJqvQ=
+set-cookie-parser@^2.4.6:
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.4.6.tgz#43bdea028b9e6f176474ee5298e758b4a44799c3"
+  integrity sha512-mNCnTUF0OYPwYzSHbdRdCfNNHqrne+HS5tS5xNb6yJbdP9wInV0q5xPLE0EyfV/Q3tImo3y/OXpD8Jn0Jtnjrg==
 
-"set-value@>=2.0.1 <3.0.0 || >=3.0.1", set-value@^2.0.0, set-value@^2.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-3.0.2.tgz#74e8ecd023c33d0f77199d415409a40f21e61b90"
-  integrity sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
-    is-plain-object "^2.0.4"
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
 
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
-  integrity sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=
-
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -12689,20 +11897,27 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shell-quote@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  integrity sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
+  integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
 shellwords@^0.1.1:
   version "0.1.1"
@@ -12721,33 +11936,21 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1
   dependencies:
     debug "^2.2.0"
 
-simple-html-tokenizer@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.7.tgz#8eca336ecfbe2b3c6166cbb31b2682088de79f40"
-  integrity sha512-APW9iYbkJ5cijjX4Ljhf3VG8SwYPUJT5gZrwci/wieMabQxWFiV5VwsrP5c6GMRvXKEQMGkAB1d9dvW66dTqpg==
+simple-html-tokenizer@^0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
+  integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
-  integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -12757,12 +11960,13 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
-snake-case@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
-  integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=
+snake-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.3.tgz#c598b822ab443fcbb145ae8a82c5e43526d5bbee"
+  integrity sha512-WM1sIXEO+rsAHBKjGf/6R1HBBcgbncKS08d2Aqec/mrDSpU80SiOU41hO7ny6DToHSyrlwTYzQBIK1FPSx4Y3Q==
   dependencies:
-    no-case "^2.2.0"
+    dot-case "^3.0.3"
+    tslib "^1.10.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -12861,10 +12065,10 @@ sort-object-keys@^1.1.3:
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@^1.22.1:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.44.0.tgz#470330be868f8a524a4607b26f2a0233e93d8b6d"
-  integrity sha512-u9GUZvpavUCXV5SbEqXu9FRbsJrYU6WM10r3zA0gymGPufK5X82MblCLh9GW9l46pXKEZvK+FA3eVTqC4oMp4A==
+sort-package-json@^1.44.0:
+  version "1.46.0"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.46.0.tgz#ea30a03d17c23762bfbf115fa54500459508c9ca"
+  integrity sha512-Fn5iiGKkATkEOQ0rol45dClfvNNW3r6PZ87mU4rbpz/M0Dxz+0D6oEU8nfpwUB5rd8u+WzsH2BQ/kRDwz+yVDQ==
   dependencies:
     detect-indent "^6.0.0"
     detect-newline "3.1.0"
@@ -12904,14 +12108,6 @@ source-map-support@~0.5.12:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.5.6:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
@@ -12922,19 +12118,19 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.4.2:
+source-map@0.4.x, source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -12966,11 +12162,6 @@ spawn-args@^0.2.0:
   resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
   integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
 
-spawnback@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/spawnback/-/spawnback-1.0.0.tgz#f73662f7e54d95367eca74d6426c677dd7ea686f"
-  integrity sha1-9zZi9+VNlTZ+ynTWQmxnfdfqaG8=
-
 spdx-correct@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.1.tgz#434434ff9d1726b4d9f4219d1004813d80639e30"
@@ -12997,7 +12188,7 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
   integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
-split-string@^3.0.2:
+split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
@@ -13046,6 +12237,13 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
+stagehand@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  dependencies:
+    debug "^4.1.0"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -13054,16 +12252,11 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
@@ -13109,9 +12302,9 @@ stream-shift@^1.0.0:
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 stream-transform@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-2.0.1.tgz#112ef2b4d8b9b517f9a6994b0bf7b946fa4d51bc"
-  integrity sha512-GiTcO/rRvZP2R8WPwxmxCFP+Of1yIATuFAmYkvSLDfcD93X2WHiPwdgIqeFT2CvL1gyAsjQvu1nB6RDNQ5b2jw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-transform/-/stream-transform-2.0.2.tgz#3cb7a14c802eb39bc40caaab0535e584f3a65caf"
+  integrity sha512-J+D5jWPF/1oX+r9ZaZvEXFbu7znjxSkbNAHJ9L44bt/tCVuOEWZlDqU9qJk7N2xBU1S+K2DPpSKeR/MucmCA1Q==
   dependencies:
     mixme "^0.3.1"
 
@@ -13134,7 +12327,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -13151,6 +12344,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
@@ -13207,6 +12409,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -13229,6 +12438,11 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
@@ -13236,20 +12450,23 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@^2.0.0, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-stripe@^4.15.0:
-  version "4.25.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-4.25.0.tgz#16af99c255e4fe22adbaf629f392af0715370760"
-  integrity sha512-sSRPSQ4BTSbdcevVSrtIJzlOCTIAXm8T38DE4zPL6ysYpIWGfIBdo2XnhouLK12/6cuLvaEInlfCZQgoEVzXpQ==
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+stripe@^8.107.0:
+  version "8.107.0"
+  resolved "https://registry.yarnpkg.com/stripe/-/stripe-8.107.0.tgz#d69b143c19d36bbe77db198fc66f951e01d9daa6"
+  integrity sha512-K0CJUK+f9EJKPys6u3NjO3juFb95q16R7yWGCIUgBLIEh1Vbhk3sp56A4EXSMepIflO9P4C9T67TlPb5fzGn7Q==
   dependencies:
-    bluebird "^2.10.2"
-    lodash.isplainobject "^4.0.6"
-    object-assign "^4.1.0"
-    qs "~6.0.4"
+    "@types/node" ">=8.1.0"
+    qs "^6.6.0"
 
 styled_string@0.0.1:
   version "0.0.1"
@@ -13275,12 +12492,19 @@ supports-color@^5.3.0, supports-color@^5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.0, symlink-or-copy@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
   integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
@@ -13296,17 +12520,16 @@ sync-disk-cache@^1.3.3:
     rimraf "^2.2.8"
     username-sync "^1.0.2"
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
+sync-disk-cache@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz#01e879edc41c34a01fcdda5b39d47dd496e154a6"
+  integrity sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==
   dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
+    debug "^4.1.1"
+    heimdalljs "^0.2.6"
+    mkdirp "^0.5.0"
+    rimraf "^3.0.0"
+    username-sync "^1.0.2"
 
 table@^5.2.3:
   version "5.4.6"
@@ -13332,22 +12555,19 @@ tapable@^1.0.0, tapable@^1.1.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-"tar@>=2.2.2 <3.0.0 || >=4.4.2", tar@^2.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz#7b3bd6c313cb6e0153770108f8d70ac298607efa"
-  integrity sha512-bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==
+tar@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
   dependencies:
-    chownr "^1.1.3"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.0"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
+    block-stream "*"
+    fstream "^1.0.12"
+    inherits "2"
 
-temp@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
-  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
+temp@0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.1.tgz#2d666114fafa26966cd4065996d7ceedd4dd4697"
+  integrity sha512-WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==
   dependencies:
     rimraf "~2.6.2"
 
@@ -13366,16 +12586,7 @@ terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^3.7.5:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.9.2.tgz#d139d8292eb3a23091304c934fb539d9f456fb19"
-  integrity sha512-zOaL2PwflERZkVWbzv8rGbDR493fUaD/KXIUz/vjuvyH6Cxwu4pitM6con3Jy4bWtcQJwNOvN4rHltFeTEwZQA==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.6"
-
-terser@^4.1.2:
+terser@^4.1.2, terser@^4.3.9:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -13384,10 +12595,10 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-testem@^2.14.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
-  integrity sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ==
+testem@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.2.0.tgz#9924481f6a3b23e350fa77bb251c64d801c4c9a7"
+  integrity sha512-FkFzNRCIzCxjbNSTxIQSC2tWn1Q2MTR/GTxusSw6uZA4byEQ7wc86TKutNnoCyZ5XIaD9wo4q+dmlK0GUEqFVA==
   dependencies:
     backbone "^1.1.2"
     bluebird "^3.4.6"
@@ -13419,12 +12630,12 @@ testem@^2.14.0:
     tmp "0.0.33"
     xmldom "^0.1.19"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-"textextensions@1 || 2":
+"textextensions@1 || 2", textextensions@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.6.0.tgz#d7e4ab13fe54e32e08873be40d51b74229b00fc4"
   integrity sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==
@@ -13472,6 +12683,14 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
   integrity sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==
 
+tiny-glob@0.2.6:
+  version "0.2.6"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.6.tgz#9e056e169d9788fe8a734dfa1ff02e9b92ed7eda"
+  integrity sha512-A7ewMqPu1B5PWwC3m7KVgAu96Ch5LA0w4SnEN/LbDREj/gAD0nPWboRbn8YoP9ISZXqeNAlMvKSKoEuhcfK3Pw==
+  dependencies:
+    globalyzer "^0.1.0"
+    globrex "^0.1.1"
+
 tiny-lr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
@@ -13505,6 +12724,13 @@ tmp@^0.1.0:
   dependencies:
     rimraf "^2.6.3"
 
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -13590,7 +12816,7 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tree-sync@^1.2.2, tree-sync@^1.4.0:
+tree-sync@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
   integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
@@ -13601,7 +12827,7 @@ tree-sync@^1.2.2, tree-sync@^1.4.0:
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
-tree-sync@^2.0.0:
+tree-sync@^2.0.0, tree-sync@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.1.0.tgz#31cbbd41f2936f5390b61e8c9d7cb27e75a212fe"
   integrity sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==
@@ -13629,7 +12855,7 @@ trim-right@^1.0.1:
   dependencies:
     glob "^7.1.2"
 
-tslib@^1.9.0:
+tslib@^1.10.0, tslib@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
@@ -13651,6 +12877,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -13658,7 +12891,17 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15, type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18:
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -13666,6 +12909,13 @@ type-is@~1.6.15, type-is@~1.6.16, type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -13694,16 +12944,16 @@ uglify-js@^2.6.2:
     uglify-to-browserify "~1.0.0"
 
 uglify-js@^3.1.4:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.1.tgz#dd14767eb7150de97f2573a5ff210db14fffe4ad"
-  integrity sha512-RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q==
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.1.tgz#32d274fea8aac333293044afd7f81409d5040d38"
+  integrity sha512-OApPSuJcxcnewwjSGGfWOjx3oix5XpmrK9Z2j0fTRlHGoZ49IU6kExfZTM0++fCArOOCet+vIfWwFHbvWqwp6g==
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
   integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
-underscore.string@^3.2.2, underscore.string@^3.3.5, underscore.string@~3.3.4:
+underscore.string@^3.2.2, underscore.string@~3.3.4:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
   integrity sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==
@@ -13763,18 +13013,23 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
   dependencies:
-    crypto-random-string "^1.0.0"
+    crypto-random-string "^2.0.0"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -13801,9 +13056,9 @@ upath@^1.1.1:
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
   dependencies:
     punycode "^2.1.0"
 
@@ -13847,14 +13102,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -13887,6 +13134,16 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+uuid@^8.1.0:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
+  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
+  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -13958,7 +13215,7 @@ walk-sync@^1.0.0, walk-sync@^1.1.3:
     ensure-posix-path "^1.1.0"
     matcher-collection "^1.1.1"
 
-walk-sync@^2.0.1:
+walk-sync@^2.0.0, walk-sync@^2.0.1, walk-sync@^2.0.2, walk-sync@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
   integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
@@ -13968,15 +13225,6 @@ walk-sync@^2.0.1:
     matcher-collection "^2.0.0"
     minimatch "^3.0.4"
 
-walk-sync@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.0.2.tgz#5ea8a28377c8be68c92d50f4007ea381725da14b"
-  integrity sha512-dCZkrxfHjPn7tIvdYrX3uMD/R0beVrHpA8lROQ5wWrl8psJgR6xwCkwqTFes0dNujbS2o/ITpvSYgIFsLsf13A==
-  dependencies:
-    "@types/minimatch" "^3.0.3"
-    ensure-posix-path "^1.1.0"
-    matcher-collection "^2.0.0"
-
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
@@ -14044,9 +13292,9 @@ webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
     source-map "~0.6.1"
 
 webpack@^4.44.1:
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.1.tgz#17e69fff9f321b8f117d1fda714edfc0b939cc21"
-  integrity sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==
+  version "4.44.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
+  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
   dependencies:
     "@webassemblyjs/ast" "1.9.0"
     "@webassemblyjs/helper-module-context" "1.9.0"
@@ -14123,10 +13371,10 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
-  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+whatwg-fetch@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3"
+  integrity sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ==
 
 whatwg-mimetype@^2.2.0:
   version "2.3.0"
@@ -14154,6 +13402,13 @@ which@1, which@^1.2.14, which@^1.2.9, which@^1.3.0:
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -14166,7 +13421,7 @@ window-size@0.1.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
   integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
-word-wrap@~1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -14181,7 +13436,7 @@ wordwrap@^0.0.3:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
+wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
@@ -14209,6 +13464,16 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
+workerpool@^5.0.1:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
+workerpool@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.2.tgz#e241b43d8d033f1beb52c7851069456039d1d438"
+  integrity sha512-DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q==
+
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -14218,19 +13483,29 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.0.0:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
-  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
-    graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
     signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
 
 write@1.0.3:
   version "1.0.3"
@@ -14239,13 +13514,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^6.1.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
@@ -14265,10 +13533,10 @@ ws@~6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -14295,10 +13563,15 @@ xtend@^4.0.0, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-xterm@^3.8.1:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.12.0.tgz#74cc54013140cf0fd38a05a0d5d49e013e8a53bd"
-  integrity sha512-U5w1NJdrqAtnNju4W05uOxLzNgMD1sk0AnIkZ//Wa7xRdQTi9Dl1qkPdAaxWJ1a7A8xzNM4ogrX/4oSVl15qOw==
+xterm-addon-fit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.4.0.tgz#06e0c5d0a6aaacfb009ef565efa1c81e93d90193"
+  integrity sha512-p4BESuV/g2L6pZzFHpeNLLnep9mp/DkF3qrPglMiucSFtD8iJxtMufEoEJbN8LZwB4i+8PFpFvVuFrGOSpW05w==
+
+xterm@^4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0.tgz#7a4c097a433d565339b5533b468bbc60c6c87969"
+  integrity sha512-wGfqufmioctKr8VkbRuZbVDfjlXWGZZ1PWHy1yqqpGT3Nm6yaJx8lxDbSEBANtgaiVPTcKSp97sxOy5IlpqYfw==
 
 y18n@^4.0.0:
   version "4.0.0"
@@ -14344,6 +13617,14 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -14360,6 +13641,23 @@ yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
+yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
@@ -14375,7 +13673,7 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
-zrender@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.4.tgz#910e60d888f00c9599073f23758dd23345fe48fd"
-  integrity sha512-03Vd/BDl/cPXp8E61f5+Xbgr/a4vDyFA+uUtUc1s+5KgcPbyY2m+78R/9LQwkR6QwFYHG8qk25Q8ESGs/qpkZw==
+zrender@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.3.2.tgz#ec7432f9415c82c73584b6b7b8c47e1b016209c6"
+  integrity sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==